diff --git a/group_vars/k8s-cluster/plain.yml b/group_vars/k8s-cluster/plain.yml
index 1aa4f7f..79d80c5 100644
--- a/group_vars/k8s-cluster/plain.yml
+++ b/group_vars/k8s-cluster/plain.yml
@@ -8,9 +8,12 @@ filebeat_enabled: false
 
 ### parameters used by kubespray ###
 
-helm_enabled: true
 cloud_provider: external
 kube_network_plugin: calico
 kube_proxy_metrics_bind_address: 0.0.0.0:10249
 kubelet_preferred_address_types: InternalIP,ExternalIP,Hostname
 docker_log_opts: "--log-opt max-size=100m --log-opt max-file=5 --log-opt compress=true"
+
+helm_enabled: true
+cert_manager_enabled: true
+ingress_nginx_enabled: true
\ No newline at end of file
diff --git a/group_vars/kube-master/plain.yml b/group_vars/kube_control_plane/plain.yml
similarity index 54%
rename from group_vars/kube-master/plain.yml
rename to group_vars/kube_control_plane/plain.yml
index cdc3148..5e5fdc4 100644
--- a/group_vars/kube-master/plain.yml
+++ b/group_vars/kube_control_plane/plain.yml
@@ -1,4 +1,4 @@
 ---
 
 hetzner_server_type: "{{ hetzner_server_type_kube_master | default('cpx21') }}"
-hetzner_server_labels: "stage={{ stage }} service=kube-master"
+hetzner_server_labels: "stage={{ stage }} service=kube_control_plane"
diff --git a/group_vars/kube-node/plain.yml b/group_vars/kube_node/plain.yml
similarity index 57%
rename from group_vars/kube-node/plain.yml
rename to group_vars/kube_node/plain.yml
index 3093919..32d0c54 100644
--- a/group_vars/kube-node/plain.yml
+++ b/group_vars/kube_node/plain.yml
@@ -1,4 +1,4 @@
 ---
 
 hetzner_server_type: "{{ hetzner_server_type_kube_node | default('cpx21') }}"
-hetzner_server_labels: "stage={{ stage }} service=kube-node"
+hetzner_server_labels: "stage={{ stage }} service=kube_node"
diff --git a/inventory_plugins/netgo-hcloud.py b/inventory_plugins/netgo-hcloud.py
index 7d540cf..d47665d 100644
--- a/inventory_plugins/netgo-hcloud.py
+++ b/inventory_plugins/netgo-hcloud.py
@@ -180,9 +180,9 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
             self.inventory.add_host(serverName, group="stage_" + serverStage)
 
             # should be configurable and not hard coded
-            if serverService == "kube-master":
+            if serverService == "kube_control_plane":
                 self.inventory.add_host(serverName, group="etcd")
-            if serverService == "kube-master" or serverService == "kube-node":
+            if serverService == "kube_control_plane" or serverService == "kube_node":
                 self.inventory.add_host(serverName, group="k8s-cluster")
 
             self.inventory.set_variable(serverName, 'stage_server_ip', serverPublicIp)
diff --git a/stage-dev b/stage-dev
index 365d23b..c10dc30 100644
--- a/stage-dev
+++ b/stage-dev
@@ -49,7 +49,7 @@ dev-prometheus-01
 [webdav]
 dev-webdav-01
 
-[kube-master]
+[kube_control_plane]
 dev-kube-master-01
 dev-kube-master-02
 dev-kube-master-03
@@ -59,14 +59,14 @@ dev-kube-master-01
 dev-kube-master-02
 dev-kube-master-03
 
-[kube-node]
+[kube_node]
 dev-kube-node-01
 dev-kube-node-02
 dev-kube-node-03
 
 [k8s-cluster:children]
-kube-node
-kube-master
+kube_control_plane
+kube_node
 
 [stage_dev:children]
 awx