diff --git a/roles/node_feature_discovery/defaults/main.yml b/roles/node_feature_discovery/defaults/main.yml
index 44276a6..06b9f57 100644
--- a/roles/node_feature_discovery/defaults/main.yml
+++ b/roles/node_feature_discovery/defaults/main.yml
@@ -16,5 +16,5 @@
 node_feature_discovery_helm_chart_path: "{{ role_path }}/../../charts/node-feature-discovery/"
 node_feature_discovery_helm_chart_ref: /usr/local/src/node-feature-discovery
 
-node_feature_discovery_helm_release_namespace: openstack
+node_feature_discovery_helm_release_namespace: monitoring
 node_feature_discovery_helm_values: {}
diff --git a/roles/node_feature_discovery/vars/main.yml b/roles/node_feature_discovery/vars/main.yml
index 2fc0a65..cfe6295 100644
--- a/roles/node_feature_discovery/vars/main.yml
+++ b/roles/node_feature_discovery/vars/main.yml
@@ -13,6 +13,8 @@
 # under the License.
 
 _node_feature_discovery_helm_values:
-  image: "{{ atmosphere_images['node_feature_discovery'] | vexxhost.atmosphere.docker_image('ref') }}"
-  nodeSelector:
-    openstack-control-plane: enabled
+  image:
+    repository: "{{ atmosphere_images['node_feature_discovery'] | vexxhost.atmosphere.docker_image('name') }}"
+  master:
+    nodeSelector:
+      openstack-control-plane: enabled