diff --git a/templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml b/templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml
index ca52791803..5a40b885a8 100644
--- a/templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml
+++ b/templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml
@@ -3,7 +3,7 @@ path: "/etc/NetworkManager/conf.d/99-kni.conf"
 contents:
   inline: |
     [main]
-    dhcp=dhclient
     rc-manager=unmanaged
     [connection]
     ipv6.dhcp-duid=ll
+    ipv6.dhcp-iaid=mac
diff --git a/templates/common/openstack/files/openstack-NetworkManager-conf.yaml b/templates/common/openstack/files/openstack-NetworkManager-conf.yaml
index 765505f0aa..064def6a12 100644
--- a/templates/common/openstack/files/openstack-NetworkManager-conf.yaml
+++ b/templates/common/openstack/files/openstack-NetworkManager-conf.yaml
@@ -3,7 +3,7 @@ path: "/etc/NetworkManager/conf.d/99-openstack.conf"
 contents:
   inline: |
     [main]
-    dhcp=dhclient
     rc-manager=unmanaged
     [connection]
     ipv6.dhcp-duid=ll
+    ipv6.dhcp-iaid=mac
diff --git a/templates/common/ovirt/files/ovirt-NetworkManager-kni-conf.yaml b/templates/common/ovirt/files/ovirt-NetworkManager-kni-conf.yaml
index c39dc9846d..5a40b885a8 100644
--- a/templates/common/ovirt/files/ovirt-NetworkManager-kni-conf.yaml
+++ b/templates/common/ovirt/files/ovirt-NetworkManager-kni-conf.yaml
@@ -3,4 +3,7 @@ path: "/etc/NetworkManager/conf.d/99-kni.conf"
 contents:
   inline: |
     [main]
-    dhcp=dhclient
+    rc-manager=unmanaged
+    [connection]
+    ipv6.dhcp-duid=ll
+    ipv6.dhcp-iaid=mac
diff --git a/templates/common/vsphere/files/vsphere-NetworkManager-kni-conf.yaml b/templates/common/vsphere/files/vsphere-NetworkManager-kni-conf.yaml
index 600b12772b..78dd1be349 100644
--- a/templates/common/vsphere/files/vsphere-NetworkManager-kni-conf.yaml
+++ b/templates/common/vsphere/files/vsphere-NetworkManager-kni-conf.yaml
@@ -8,10 +8,10 @@ contents:
     {{ if .Infra.Status.PlatformStatus.VSphere -}}
     {{ if .Infra.Status.PlatformStatus.VSphere.APIServerInternalIP -}}
     [main]
-    dhcp=dhclient
     rc-manager=unmanaged
     [connection]
     ipv6.dhcp-duid=ll
+    ipv6.dhcp-iaid=mac
     {{ end -}}
     {{ end -}}
     {{ end -}}
diff --git a/templates/master/00-master/baremetal/files/dhcp-dhclient-conf.yaml b/templates/master/00-master/baremetal/files/dhcp-dhclient-conf.yaml
deleted file mode 100644
index bdcc638b2b..0000000000
--- a/templates/master/00-master/baremetal/files/dhcp-dhclient-conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-mode: 0644
-path: "/etc/dhcp/dhclient.conf"
-contents:
-  inline: |
-    supersede domain-search "{{ .Infra.Status.EtcdDiscoveryDomain }}";
diff --git a/templates/master/00-master/openstack/files/dhcp-dhclient-conf.yaml b/templates/master/00-master/openstack/files/dhcp-dhclient-conf.yaml
deleted file mode 100644
index bdcc638b2b..0000000000
--- a/templates/master/00-master/openstack/files/dhcp-dhclient-conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-mode: 0644
-path: "/etc/dhcp/dhclient.conf"
-contents:
-  inline: |
-    supersede domain-search "{{ .Infra.Status.EtcdDiscoveryDomain }}";
diff --git a/templates/master/00-master/ovirt/files/dhcp-dhclient-conf.yaml b/templates/master/00-master/ovirt/files/dhcp-dhclient-conf.yaml
deleted file mode 100644
index bdcc638b2b..0000000000
--- a/templates/master/00-master/ovirt/files/dhcp-dhclient-conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-mode: 0644
-path: "/etc/dhcp/dhclient.conf"
-contents:
-  inline: |
-    supersede domain-search "{{ .Infra.Status.EtcdDiscoveryDomain }}";
diff --git a/templates/master/00-master/vsphere/files/dhcp-dhclient-conf.yaml b/templates/master/00-master/vsphere/files/dhcp-dhclient-conf.yaml
deleted file mode 100644
index 24a9c587b1..0000000000
--- a/templates/master/00-master/vsphere/files/dhcp-dhclient-conf.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-mode: 0644
-path: "/etc/dhcp/dhclient.conf"
-contents:
-  inline: |
-    {{ if .Infra -}}
-    {{ if .Infra.Status -}}
-    {{ if .Infra.Status.PlatformStatus -}}
-    {{ if .Infra.Status.PlatformStatus.VSphere -}}
-    {{ if .Infra.Status.PlatformStatus.VSphere.APIServerInternalIP -}}
-    supersede domain-search "{{ .Infra.Status.EtcdDiscoveryDomain }}";
-    prepend domain-name-servers {{ .Infra.Status.PlatformStatus.VSphere.NodeDNSIP }};
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
diff --git a/templates/worker/00-worker/baremetal/files/dhcp-dhclient-conf.yaml b/templates/worker/00-worker/baremetal/files/dhcp-dhclient-conf.yaml
deleted file mode 100644
index bdcc638b2b..0000000000
--- a/templates/worker/00-worker/baremetal/files/dhcp-dhclient-conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-mode: 0644
-path: "/etc/dhcp/dhclient.conf"
-contents:
-  inline: |
-    supersede domain-search "{{ .Infra.Status.EtcdDiscoveryDomain }}";
diff --git a/templates/worker/00-worker/openstack/files/dhcp-dhclient-conf.yaml b/templates/worker/00-worker/openstack/files/dhcp-dhclient-conf.yaml
deleted file mode 100644
index bdcc638b2b..0000000000
--- a/templates/worker/00-worker/openstack/files/dhcp-dhclient-conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-mode: 0644
-path: "/etc/dhcp/dhclient.conf"
-contents:
-  inline: |
-    supersede domain-search "{{ .Infra.Status.EtcdDiscoveryDomain }}";
diff --git a/templates/worker/00-worker/ovirt/files/dhcp-dhclient-conf.yaml b/templates/worker/00-worker/ovirt/files/dhcp-dhclient-conf.yaml
deleted file mode 100644
index bdcc638b2b..0000000000
--- a/templates/worker/00-worker/ovirt/files/dhcp-dhclient-conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-mode: 0644
-path: "/etc/dhcp/dhclient.conf"
-contents:
-  inline: |
-    supersede domain-search "{{ .Infra.Status.EtcdDiscoveryDomain }}";
diff --git a/templates/worker/00-worker/vsphere/files/dhcp-dhclient-conf.yaml b/templates/worker/00-worker/vsphere/files/dhcp-dhclient-conf.yaml
deleted file mode 100644
index 24a9c587b1..0000000000
--- a/templates/worker/00-worker/vsphere/files/dhcp-dhclient-conf.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-mode: 0644
-path: "/etc/dhcp/dhclient.conf"
-contents:
-  inline: |
-    {{ if .Infra -}}
-    {{ if .Infra.Status -}}
-    {{ if .Infra.Status.PlatformStatus -}}
-    {{ if .Infra.Status.PlatformStatus.VSphere -}}
-    {{ if .Infra.Status.PlatformStatus.VSphere.APIServerInternalIP -}}
-    supersede domain-search "{{ .Infra.Status.EtcdDiscoveryDomain }}";
-    prepend domain-name-servers {{ .Infra.Status.PlatformStatus.VSphere.NodeDNSIP }};
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}