diff --git a/roles/ci_gen_kustomize_values/templates/common/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/common/edpm-nodeset-values/values.yaml.j2
index b0110b530..e4b83344d 100644
--- a/roles/ci_gen_kustomize_values/templates/common/edpm-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/common/edpm-nodeset-values/values.yaml.j2
@@ -46,6 +46,10 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
       edpm-{{ instance }}:
+{% if not (cifmw_edpm_deploy_pre_provisioned | default(true) | bool)                   %}
+        bmhLabelSelector:
+          nodeName: {{ instance }}
+{% endif                                                                               %}
         ansible:
           ansibleHost: {{ cifmw_networking_env_definition.instances[instance].networks.ctlplane[_ipv.ip_vX] }}
         hostName: {{ instance }}
diff --git a/roles/deploy_bmh/template/bmh.yml.j2 b/roles/deploy_bmh/template/bmh.yml.j2
index 38fc047fa..c0d7c4483 100644
--- a/roles/deploy_bmh/template/bmh.yml.j2
+++ b/roles/deploy_bmh/template/bmh.yml.j2
@@ -11,6 +11,7 @@ metadata:
   labels:
     app: {{ node_data['label'] | default("openstack") }}
     workload: {{ node_name.split('-')[0] }}
+    nodeName: {{ node_name }}
 {% if 'extra_labels' in node_data %}
 {% for label,key in node_data['extra_labels'].items() %}
     {{ label }}: {{ key }}