diff --git a/roles/kubernetes/apps/tasks/main.yml b/roles/kubernetes/apps/tasks/main.yml
index 7323e39..cb3c635 100644
--- a/roles/kubernetes/apps/tasks/main.yml
+++ b/roles/kubernetes/apps/tasks/main.yml
@@ -13,7 +13,7 @@
     create_namespace: yes
     release_values: "{{ k8s_prometheus_helm__release_values }}"
   when: 
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - prometheus
 
@@ -26,6 +26,6 @@
     create_namespace: yes
     release_values: "{{ k8s_argocd_helm__release_values }}"
   when: 
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - argo-cd
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index a104ae7..16f0bc0 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -9,7 +9,7 @@
   loop:
     - python3-pip
   when:
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Install pip dependencies
   ansible.builtin.pip:
@@ -17,7 +17,7 @@
   loop:
     - kubernetes
   when:
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Install Helm plugins
   kubernetes.core.helm_plugin:
@@ -26,4 +26,4 @@
   loop:
     - https://github.com/databus23/helm-diff
   when:
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
diff --git a/roles/kubernetes/cert-manager/tasks/main.yml b/roles/kubernetes/cert-manager/tasks/main.yml
index f600eca..d122d6c 100644
--- a/roles/kubernetes/cert-manager/tasks/main.yml
+++ b/roles/kubernetes/cert-manager/tasks/main.yml
@@ -10,7 +10,7 @@
     create_namespace: yes
     release_values: "{{ k8s_certmanager_helm__release_values }}"
   when:
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Create secret for digitalocean-dns
   kubernetes.core.k8s:
@@ -24,7 +24,7 @@
       data:
         access-token: "{{ digitalocean_authentication_token | string | b64encode }}"
   when: 
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
 
 - name: Create ClusterIssuer_letsencrypt_prod 
   kubernetes.core.k8s:
@@ -50,4 +50,4 @@
               - 'smardigo.digital'
   loop: "{{ k8s_certmanager_helm__cluster_issuers | dict2items }}"
   when: 
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
diff --git a/roles/kubernetes/cloud-controller-manager/tasks/main.yml b/roles/kubernetes/cloud-controller-manager/tasks/main.yml
index 2ab115e..8184052 100644
--- a/roles/kubernetes/cloud-controller-manager/tasks/main.yml
+++ b/roles/kubernetes/cloud-controller-manager/tasks/main.yml
@@ -19,7 +19,7 @@
         network: "{{ stage | string | b64encode }}"
         token: "{{ hetzner_authentication_token | string | b64encode }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - ccm
 
@@ -28,6 +28,6 @@
     state: present
     definition: "{{ lookup('template', k8s_ccm__template) }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - ccm
diff --git a/roles/kubernetes/container-storage-interface/tasks/main.yml b/roles/kubernetes/container-storage-interface/tasks/main.yml
index d6ce68c..06b875c 100644
--- a/roles/kubernetes/container-storage-interface/tasks/main.yml
+++ b/roles/kubernetes/container-storage-interface/tasks/main.yml
@@ -18,7 +18,7 @@
       data:
         token: "{{ hetzner_hcloud_csi_token | string | b64encode }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - csi
 
@@ -27,6 +27,6 @@
     state: present
     definition: "{{ lookup('template', k8s_csi__template) }}"
   when:
-    - inventory_hostname == groups['kube-master'][0]
+    - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - csi
diff --git a/roles/kubernetes/ingress-controller/tasks/main.yml b/roles/kubernetes/ingress-controller/tasks/main.yml
index 411470b..8f5ad6b 100644
--- a/roles/kubernetes/ingress-controller/tasks/main.yml
+++ b/roles/kubernetes/ingress-controller/tasks/main.yml
@@ -14,7 +14,7 @@
     create_namespace: yes
     release_values: "{{ k8s_ingress_helm__release_values }}"
   when:
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - ingress-controller
 
@@ -25,7 +25,7 @@
     kind: Namespace
     state: "{{ k8s_echoserver_helm__enable_demoapp | default('absent') }}"
   when: 
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - ingress-echoserver
 
@@ -36,6 +36,6 @@
     namespace: "{{ k8s_echoserver_helm__release_namespace | default('testing') }}"
     wait: yes
   when: 
-  - inventory_hostname == groups['kube-master'][0]
+  - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - ingress-echoserver