diff --git a/upi/aws/cloudformation/02_cluster_infra.yaml b/upi/aws/cloudformation/02_cluster_infra.yaml
index 39dd275244d..5ce9dd6d635 100644
--- a/upi/aws/cloudformation/02_cluster_infra.yaml
+++ b/upi/aws/cloudformation/02_cluster_infra.yaml
@@ -3,17 +3,17 @@ Description: Template for Openshift Cluster UPI Network Elements (Route53 & LBs)
 
 Parameters:
   ClusterName:
-    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
-    MaxLength: 32
+    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
+    MaxLength: 27
     MinLength: 1
-    ConstraintDescription: Cluster name must be alphanumeric, start with a letter and a maximum of 32 characters
+    ConstraintDescription: Cluster name must be alphanumeric, start with a letter and a maximum of 27 characters
     Description: A short, representative cluster name to use for hostnames, etc.
     Type: String
   InfrastructureName:
-    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
-    MaxLength: 32
+    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
+    MaxLength: 27
     MinLength: 1
-    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
+    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
     Description: A short, unique cluster ID used to tag cloud resources and identify items owned/used by the cluster.
     Type: String
   HostedZoneId:
@@ -72,7 +72,7 @@ Resources:
   ExtApiElb:
     Type: AWS::ElasticLoadBalancingV2::LoadBalancer
     Properties:
-      Name: !Join ["-", ["api-ext", !Ref ClusterName, !Ref "AWS::Region"]]
+      Name: !Join ["-", [!Ref InfrastructureName, "ext"]]
       IpAddressType: ipv4
       Subnets: !Ref PublicSubnets
       Type: network
@@ -80,7 +80,7 @@ Resources:
   IntApiElb:
     Type: AWS::ElasticLoadBalancingV2::LoadBalancer
     Properties:
-      Name: !Join ["-", ["api-int", !Ref ClusterName, !Ref "AWS::Region"]]
+      Name: !Join ["-", [!Ref InfrastructureName, "int"]]
       Scheme: internal
       IpAddressType: ipv4
       Subnets: !Ref PrivateSubnets
diff --git a/upi/aws/cloudformation/03_cluster_security.yaml b/upi/aws/cloudformation/03_cluster_security.yaml
index e05a143723e..8de0bc211fe 100644
--- a/upi/aws/cloudformation/03_cluster_security.yaml
+++ b/upi/aws/cloudformation/03_cluster_security.yaml
@@ -3,10 +3,10 @@ Description: Template for Openshift Cluster UPI Security Elements (Security Grou
 
 Parameters:
   InfrastructureName:
-    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
-    MaxLength: 32
+    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
+    MaxLength: 27
     MinLength: 1
-    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
+    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
     Description: A short, unique cluster ID used to tag cloud resources and identify items owned/used by the cluster.
     Type: String
   VpcCidr:
diff --git a/upi/aws/cloudformation/04_cluster_bootstrap.yaml b/upi/aws/cloudformation/04_cluster_bootstrap.yaml
index 5374bc084d3..d5f289738fe 100644
--- a/upi/aws/cloudformation/04_cluster_bootstrap.yaml
+++ b/upi/aws/cloudformation/04_cluster_bootstrap.yaml
@@ -3,10 +3,10 @@ Description: Template for Openshift Cluster UPI Bootstrap (EC2 Instance, Securit
 
 Parameters:
   InfrastructureName:
-    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
-    MaxLength: 32
+    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
+    MaxLength: 27
     MinLength: 1
-    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
+    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
     Description: A short, unique cluster ID used to tag cloud resources and identify items owned/used by the cluster.
     Type: String
   RhcosAmi:
diff --git a/upi/aws/cloudformation/05_cluster_master_nodes.yaml b/upi/aws/cloudformation/05_cluster_master_nodes.yaml
index 76264d5234c..3fc638f63bf 100644
--- a/upi/aws/cloudformation/05_cluster_master_nodes.yaml
+++ b/upi/aws/cloudformation/05_cluster_master_nodes.yaml
@@ -3,10 +3,10 @@ Description: Template for Openshift Cluster UPI Node Launch (EC2 master instance
 
 Parameters:
   InfrastructureName:
-    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
-    MaxLength: 32
+    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
+    MaxLength: 27
     MinLength: 1
-    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
+    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
     Description: A short, unique cluster ID used to tag nodes for the kubelet cloud provider.
     Type: String
   RhcosAmi:
diff --git a/upi/aws/cloudformation/06_cluster_worker_node.yaml b/upi/aws/cloudformation/06_cluster_worker_node.yaml
index 2a418d2012a..131e255b81d 100644
--- a/upi/aws/cloudformation/06_cluster_worker_node.yaml
+++ b/upi/aws/cloudformation/06_cluster_worker_node.yaml
@@ -3,10 +3,10 @@ Description: Template for Openshift Cluster UPI Node Launch (EC2 worker instance
 
 Parameters:
   InfrastructureName:
-    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
-    MaxLength: 32
+    AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
+    MaxLength: 27
     MinLength: 1
-    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
+    ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
     Description: A short, unique cluster ID used to tag nodes for the kubelet cloud provider.
     Type: String
   RhcosAmi: