diff --git a/templates/cluster-template-external-cloud-provider.yaml b/templates/cluster-template-external-cloud-provider.yaml
index 90deb94aaa..62ec1c8ede 100644
--- a/templates/cluster-template-external-cloud-provider.yaml
+++ b/templates/cluster-template-external-cloud-provider.yaml
@@ -23,8 +23,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   cloudName: ${OPENSTACK_CLOUD}
-  cloudsSecret:
-    name: ${CLUSTER_NAME}-cloud-config
+  cloudsSecret: ${CLUSTER_NAME}-cloud-config
   managedAPIServerLoadBalancer: true
   managedSecurityGroups: true
   nodeCidr: 10.6.0.0/24
@@ -74,8 +73,7 @@ spec:
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
 ---
 apiVersion: cluster.x-k8s.io/v1alpha4
 kind: MachineDeployment
@@ -109,8 +107,7 @@ spec:
   template:
     spec:
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
       flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
diff --git a/templates/cluster-template-without-lb.yaml b/templates/cluster-template-without-lb.yaml
index dc0ef7573d..261e44b145 100644
--- a/templates/cluster-template-without-lb.yaml
+++ b/templates/cluster-template-without-lb.yaml
@@ -23,8 +23,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   cloudName: ${OPENSTACK_CLOUD}
-  cloudsSecret:
-    name: ${CLUSTER_NAME}-cloud-config
+  cloudsSecret: ${CLUSTER_NAME}-cloud-config
   managedSecurityGroups: true
   nodeCidr: 10.6.0.0/24
   dnsNameservers:
@@ -102,8 +101,7 @@ spec:
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
 ---
 apiVersion: cluster.x-k8s.io/v1alpha4
 kind: MachineDeployment
@@ -137,8 +135,7 @@ spec:
   template:
     spec:
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
       flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
index 9707098e3a..65a3c33d52 100644
--- a/templates/cluster-template.yaml
+++ b/templates/cluster-template.yaml
@@ -23,8 +23,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   cloudName: ${OPENSTACK_CLOUD}
-  cloudsSecret:
-    name: ${CLUSTER_NAME}-cloud-config
+  cloudsSecret: ${CLUSTER_NAME}-cloud-config
   managedAPIServerLoadBalancer: true
   managedSecurityGroups: true
   nodeCidr: 10.6.0.0/24
@@ -103,8 +102,7 @@ spec:
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
 ---
 apiVersion: cluster.x-k8s.io/v1alpha4
 kind: MachineDeployment
@@ -138,8 +136,7 @@ spec:
   template:
     spec:
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
       flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
diff --git a/test/e2e/data/infrastructure-openstack/cluster-template-external-cloud-provider.yaml b/test/e2e/data/infrastructure-openstack/cluster-template-external-cloud-provider.yaml
index b61c72ccad..a72fdae7d5 100644
--- a/test/e2e/data/infrastructure-openstack/cluster-template-external-cloud-provider.yaml
+++ b/test/e2e/data/infrastructure-openstack/cluster-template-external-cloud-provider.yaml
@@ -26,8 +26,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   cloudName: ${OPENSTACK_CLOUD}
-  cloudsSecret:
-    name: ${CLUSTER_NAME}-cloud-config
+  cloudsSecret: ${CLUSTER_NAME}-cloud-config
   managedAPIServerLoadBalancer: true
   managedSecurityGroups: true
   nodeCidr: 10.6.0.0/24
@@ -94,8 +93,7 @@ spec:
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
 ---
 apiVersion: cluster.x-k8s.io/v1alpha4
 kind: MachineDeployment
@@ -129,8 +127,7 @@ spec:
   template:
     spec:
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
       flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
diff --git a/test/e2e/data/infrastructure-openstack/cluster-template-without-lb.yaml b/test/e2e/data/infrastructure-openstack/cluster-template-without-lb.yaml
index c4fd5de23e..7b215de931 100644
--- a/test/e2e/data/infrastructure-openstack/cluster-template-without-lb.yaml
+++ b/test/e2e/data/infrastructure-openstack/cluster-template-without-lb.yaml
@@ -25,8 +25,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   cloudName: ${OPENSTACK_CLOUD}
-  cloudsSecret:
-    name: ${CLUSTER_NAME}-cloud-config
+  cloudsSecret: ${CLUSTER_NAME}-cloud-config
   managedSecurityGroups: true
   nodeCidr: 10.6.0.0/24
   dnsNameservers:
@@ -110,8 +109,7 @@ spec:
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
 ---
 apiVersion: cluster.x-k8s.io/v1alpha4
 kind: MachineDeployment
@@ -145,8 +143,7 @@ spec:
   template:
     spec:
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
       flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
diff --git a/test/e2e/data/infrastructure-openstack/cluster-template.yaml b/test/e2e/data/infrastructure-openstack/cluster-template.yaml
index 508a20c917..526c99555f 100644
--- a/test/e2e/data/infrastructure-openstack/cluster-template.yaml
+++ b/test/e2e/data/infrastructure-openstack/cluster-template.yaml
@@ -25,8 +25,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   cloudName: ${OPENSTACK_CLOUD}
-  cloudsSecret:
-    name: ${CLUSTER_NAME}-cloud-config
+  cloudsSecret: ${CLUSTER_NAME}-cloud-config
   managedAPIServerLoadBalancer: true
   managedSecurityGroups: true
   nodeCidr: 10.6.0.0/24
@@ -111,8 +110,7 @@ spec:
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
 ---
 apiVersion: cluster.x-k8s.io/v1alpha4
 kind: MachineDeployment
@@ -146,8 +144,7 @@ spec:
   template:
     spec:
       cloudName: ${OPENSTACK_CLOUD}
-      cloudsSecret:
-        name: ${CLUSTER_NAME}-cloud-config
+      cloudsSecret: ${CLUSTER_NAME}-cloud-config
       flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
       image: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}