diff --git a/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2
index 879d949ff..feb781a5b 100644
--- a/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2
@@ -32,7 +32,7 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2
index 9b75cc7e7..15cf7bec2 100644
--- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2
@@ -45,7 +45,7 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset2-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset2-values/values.yaml.j2
index 8e6c5b7bb..2d5bb5c8e 100644
--- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset2-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset2-values/values.yaml.j2
@@ -45,7 +45,7 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2
index b166ce872..6ed3fcda5 100644
--- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2
@@ -45,7 +45,7 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2
index a3bb0e28e..82f4a0cc0 100644
--- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2
@@ -45,7 +45,7 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2
index 5f608e64c..8b3e3d292 100644
--- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2
@@ -32,7 +32,7 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2
index 937e86f54..cb981df34 100644
--- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2
@@ -46,7 +46,7 @@ data:
     nodes:
 {% for instance in instance_names                                                      %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2
index ab1c12103..f66af1414 100644
--- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2
@@ -32,7 +32,7 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2
index 7204c800e..f71030591 100644
--- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2
@@ -32,7 +32,7 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}
diff --git a/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2
index e2d1aaed0..a0b2c6acd 100644
--- a/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2
@@ -32,7 +32,7 @@ data:
     nodes:
 {% for instance in instances_names                                                     %}
 {%   set node_name = 'edpm-' + instance                                               %}
-{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
+{%   set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
       {{ node_name }}:
 {{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
 {% endfor                                                                              %}