diff --git a/templates/cluster-template-calico.yaml b/templates/cluster-template-calico.yaml
index 0437b831..cedcedfa 100644
--- a/templates/cluster-template-calico.yaml
+++ b/templates/cluster-template-calico.yaml
@@ -441,5 +441,5 @@ spec:
     matchLabels:
       cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
   resources:
-    - kind: ConfigMap
-      name: calico
+    - name: calico
+      kind: ConfigMap
diff --git a/test/e2e/data/infrastructure-ionoscloud/cluster-template.yaml b/test/e2e/data/infrastructure-ionoscloud/cluster-template.yaml
index 1d981682..efb9a073 100644
--- a/test/e2e/data/infrastructure-ionoscloud/cluster-template.yaml
+++ b/test/e2e/data/infrastructure-ionoscloud/cluster-template.yaml
@@ -289,6 +289,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: "${CLUSTER_NAME}-workers"
+  labels:
+    cluster.x-k8s.io/cluster-name: "${CLUSTER_NAME}"
 spec:
   clusterName: "${CLUSTER_NAME}"
   replicas: ${WORKER_MACHINE_COUNT}
@@ -433,6 +435,8 @@ data: ${CNI_RESOURCES}
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet
 metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
   name:  "${CLUSTER_NAME}-crs-0"
 spec:
   strategy: ApplyOnce