diff --git a/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml b/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml
index 7f19f1ea9..6eb0874f7 100644
--- a/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml
+++ b/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml
@@ -56,7 +56,7 @@ spec:
                 - --allocate-node-cidrs=true
                 - --cluster-name={{ include "cluster.name" . }}
               cloudConfig:
-                enabled: {{ ne .Values.managementClusterName "" }}
+                enabled: true
                 global:
                   KubernetesClusterID: {{ .Values.managementClusterName }}
               # Removing the default `node-role.kubernetes.io/control-plane` node selector
diff --git a/templates/cluster/aws-hosted-cp/values.schema.json b/templates/cluster/aws-hosted-cp/values.schema.json
index 74a6a427e..e892d7d6e 100644
--- a/templates/cluster/aws-hosted-cp/values.schema.json
+++ b/templates/cluster/aws-hosted-cp/values.schema.json
@@ -10,7 +10,8 @@
     "iamInstanceProfile",
     "instanceType",
     "securityGroupIDs",
-    "clusterIdentity"
+    "clusterIdentity",
+    "managementClusterName"
   ],
   "properties": {
     "managementClusterName" : {