diff --git a/roles/headlamp/defaults/main.yml b/roles/headlamp/defaults/main.yml
index 12d0de3..8511325 100644
--- a/roles/headlamp/defaults/main.yml
+++ b/roles/headlamp/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-headlamp_chart_ref: /charts/headlamp
-headlamp_release_name: headlamp
-headlamp_release_namespace: tools
-headlamp_values: {}
+headlamp_helm_chart_ref: /charts/headlamp
+headlamp_helm_release_name: headlamp
+headlamp_helm_release_namespace: headlamp
+headlamp_helm_values: {}
diff --git a/roles/headlamp/tasks/main.yml b/roles/headlamp/tasks/main.yml
index e4c9cd2..f2af1dc 100644
--- a/roles/headlamp/tasks/main.yml
+++ b/roles/headlamp/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: Deploy helm chart
   kubernetes.core.helm:
-    release_name: "{{ headlamp_release_name }}"
-    chart_ref: "{{ headlamp_chart_ref }}"
-    release_namespace: "{{ headlamp_release_namespace }}"
+    release_name: "{{ headlamp_helm_release_name }}"
+    chart_ref: "{{ headlamp_helm_chart_ref }}"
+    release_namespace: "{{ headlamp_helm_release_namespace }}"
     create_namespace: true
     kubeconfig: /share/kubeconfig
     wait: true
diff --git a/roles/node_feature_discovery/defaults/main.yml b/roles/node_feature_discovery/defaults/main.yml
index d0d828b..6976c1a 100644
--- a/roles/node_feature_discovery/defaults/main.yml
+++ b/roles/node_feature_discovery/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-node_feature_discovery_chart_ref: /charts/node_feature_discovery
-node_feature_discovery_release_name: node-feature-discovery
-node_feature_discovery_release_namespace: monitoring
-node_feature_discovery_values: {}
+node_feature_discovery_helm_chart_ref: /charts/node-feature-discovery
+node_feature_discovery_helm_release_name: node-feature-discovery
+node_feature_discovery_helm_release_namespace: node-feature-discovery
+node_feature_discovery_helm_values: {}
diff --git a/roles/node_feature_discovery/tasks/main.yml b/roles/node_feature_discovery/tasks/main.yml
index 5c9e1d6..7675d9f 100644
--- a/roles/node_feature_discovery/tasks/main.yml
+++ b/roles/node_feature_discovery/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: Deploy helm chart
   kubernetes.core.helm:
-    release_name: "{{ node_feature_discovery_release_name }}"
-    chart_ref: "{{ node_feature_discovery_chart_ref }}"
-    release_namespace: "{{ node_feature_discovery_release_namespace }}"
+    release_name: "{{ node_feature_discovery_helm_release_name }}"
+    chart_ref: "{{ node_feature_discovery_helm_chart_ref }}"
+    release_namespace: "{{ node_feature_discovery_helm_release_namespace }}"
     create_namespace: true
     kubeconfig: /share/kubeconfig
     wait: true