diff --git a/infrastructure-elemental/v0.0.0/cluster-template-rke2.yaml b/infrastructure-elemental/v0.0.0/cluster-template-rke2.yaml
index 6a240c50..5cc1022a 100644
--- a/infrastructure-elemental/v0.0.0/cluster-template-rke2.yaml
+++ b/infrastructure-elemental/v0.0.0/cluster-template-rke2.yaml
@@ -75,8 +75,7 @@ spec:
     kind: ElementalMachineTemplate
     name: ${CLUSTER_NAME}-control-plane
   nodeDrainTimeout: 2m
-  registrationMethod: "address"
-  registrationAddress: "${CONTROL_PLANE_ENDPOINT_HOST}"
+  registrationMethod: "control-plane-endpoint"
   rolloutStrategy:
     type: "RollingUpdate"
     rollingUpdate:
diff --git a/infrastructure-elemental/v0.0.0/clusterclass-rke2.yaml b/infrastructure-elemental/v0.0.0/clusterclass-rke2.yaml
index 55b5b35b..7ccef83d 100644
--- a/infrastructure-elemental/v0.0.0/clusterclass-rke2.yaml
+++ b/infrastructure-elemental/v0.0.0/clusterclass-rke2.yaml
@@ -75,10 +75,6 @@ spec:
             matchResources:
               controlPlane: true
           jsonPatches:
-            - op: add
-              path: "/spec/template/spec/registrationAddress"
-              valueFrom:
-                variable: controlPlaneEndpointHost
             - op: add
               path: "/spec/template/spec/kubeadmConfigSpec/files"
               valueFrom:
@@ -174,12 +170,16 @@ metadata:
 spec:
   template:
     spec:
+      infrastructureRef:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        kind: ElementalMachineTemplate
+        name: rke2-control-plane
       serverConfig:
         disableComponents:
           kubernetesComponents:
             - cloudController
       nodeDrainTimeout: 2m
-      registrationMethod: "address"
+      registrationMethod: "control-plane-endpoint"
       rolloutStrategy:
         type: "RollingUpdate"
         rollingUpdate: