diff --git a/ansible/configs/rosa-consolidated/files/cloud_providers/ec2_cloud_template.j2 b/ansible/configs/rosa-consolidated/files/cloud_providers/ec2_cloud_template.j2
index 23ee0cda917..7b4c92d2326 100644
--- a/ansible/configs/rosa-consolidated/files/cloud_providers/ec2_cloud_template.j2
+++ b/ansible/configs/rosa-consolidated/files/cloud_providers/ec2_cloud_template.j2
@@ -183,7 +183,7 @@ Resources:
         ResourceRecords:
 {%     for c in range(1,(instance['count'] |int)+1) %}
           - "Fn::GetAtt":
-            - {{instance['name']}}{{c}}
+            - {{instance['name']}}{{c}}EIP
             - PublicIp
 {%     endfor %}
 {%   endif %}
@@ -317,7 +317,7 @@ Resources:
           TTL: {{ aws_dns_ttl_public }}
           ResourceRecords:
           - "Fn::GetAtt":
-            - {{instance['name']}}{{loop.index}}
+            - {{instance['name']}}{{loop.index}}EIP
             - PublicIp
 {%     endif %}
 {%   endfor %}
diff --git a/ansible/roles-infra/infra-ec2-template-generate/templates/cloud_template.j2 b/ansible/roles-infra/infra-ec2-template-generate/templates/cloud_template.j2
index f695e6ae625..c5961f0e1fa 100644
--- a/ansible/roles-infra/infra-ec2-template-generate/templates/cloud_template.j2
+++ b/ansible/roles-infra/infra-ec2-template-generate/templates/cloud_template.j2
@@ -187,7 +187,7 @@ Resources:
         ResourceRecords:
 {%     for c in range(1,(instance['count'] |int)+1) %}
           - "Fn::GetAtt":
-            - {{ instance.name | replace('-', '') }}{{c}}
+            - {{ instance.name | replace('-', '') }}{{c}}EIP
             - PublicIp
 {%     endfor %}
 {%   endif %}
@@ -283,7 +283,7 @@ Resources:
           Type: A
           TTL: {{ aws_dns_ttl_private }}
           ResourceRecords:
-            - "Fn::GetAtt":
+            - "Fn::GetAtt":          
               - {{ instance.name | replace('-', '') }}{{ loop.index }}
               - PrivateIp
 
@@ -322,9 +322,9 @@ Resources:
           Type: A
           TTL: {{ aws_dns_ttl_public }}
           ResourceRecords:
-          - "Fn::GetAtt":
-            - {{ instance.name | replace('-', '') }}{{loop.index}}
-            - PublicIp
+            - "Fn::GetAtt":
+              - {{ instance.name | replace('-', '') }}{{loop.index}}EIP
+              - PublicIp
 {%     endif %}
 {%   endfor %}
 {% endfor %}