diff --git a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2 b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2
index 4a1468667..ca64ede87 100644
--- a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2
+++ b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2
@@ -15,7 +15,7 @@ network_config:
 - type: ovs_bridge
   name: {{ neutron_physical_bridge_name }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   members:
   - type: ovs_bond
     name: bond1
diff --git a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2 b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2
index d6e7f8adf..e7f94f423 100644
--- a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2
+++ b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2
@@ -15,7 +15,7 @@ network_config:
 - type: ovs_bridge
   name: br-bond
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   members:
   - type: ovs_bond
     name: bond1
diff --git a/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2 b/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2
index 81340ac4f..867ccfda1 100644
--- a/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2
+++ b/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2
@@ -15,7 +15,7 @@ network_config:
 - type: ovs_bridge
   name: {{ neutron_physical_bridge_name }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   members:
   - type: ovs_bond
     name: bond1
diff --git a/config/samples/nic-config-samples/multiple_nics/multiple_nics.j2 b/config/samples/nic-config-samples/multiple_nics/multiple_nics.j2
index 430369e2d..599a1e4d0 100644
--- a/config/samples/nic-config-samples/multiple_nics/multiple_nics.j2
+++ b/config/samples/nic-config-samples/multiple_nics/multiple_nics.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:
diff --git a/config/samples/nic-config-samples/multiple_nics/multiple_nics_dpdk.j2 b/config/samples/nic-config-samples/multiple_nics/multiple_nics_dpdk.j2
index 3bdfcf8c2..d368f1923 100644
--- a/config/samples/nic-config-samples/multiple_nics/multiple_nics_dpdk.j2
+++ b/config/samples/nic-config-samples/multiple_nics/multiple_nics_dpdk.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:
diff --git a/config/samples/nic-config-samples/multiple_nics/multiple_nics_dvr.j2 b/config/samples/nic-config-samples/multiple_nics/multiple_nics_dvr.j2
index 808a7b5c2..975e7bddb 100644
--- a/config/samples/nic-config-samples/multiple_nics/multiple_nics_dvr.j2
+++ b/config/samples/nic-config-samples/multiple_nics/multiple_nics_dvr.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:
diff --git a/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans.j2 b/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans.j2
index 55efa8490..98189d790 100644
--- a/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans.j2
+++ b/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:
diff --git a/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2 b/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2
index a199e6eda..48e8f4aba 100644
--- a/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2
+++ b/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:
diff --git a/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dvr.j2 b/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dvr.j2
index 006b7e427..f4e27c406 100644
--- a/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dvr.j2
+++ b/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dvr.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:
diff --git a/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2 b/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2
index f595a3acc..51639be76 100644
--- a/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2
+++ b/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2
@@ -10,7 +10,7 @@ network_config:
   mtu: {{ min_viable_mtu }}
   use_dhcp: false
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
   routes: {{ ctlplane_host_routes }}
diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2
index 2eb8dfd52..9fb986c1e 100644
--- a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2
+++ b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2
@@ -10,7 +10,7 @@ network_config:
   mtu: {{ min_viable_mtu }}
   use_dhcp: false
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
   routes: {{ ctlplane_host_routes }}
diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2
index 7f4890832..c9b7738e2 100644
--- a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2
+++ b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2
@@ -9,7 +9,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:
diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2
index c7ad3b2a1..3bff994c5 100644
--- a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2
+++ b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2
@@ -10,7 +10,7 @@ network_config:
   mtu: {{ min_viable_mtu }}
   use_dhcp: false
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
   routes: {{ ctlplane_host_routes }}