diff --git a/templates/master/00-master/openstack/files/NetworkManager-resolv-prepender.yaml b/templates/common/openstack/files/NetworkManager-resolv-prepender.yaml
similarity index 100%
rename from templates/master/00-master/openstack/files/NetworkManager-resolv-prepender.yaml
rename to templates/common/openstack/files/NetworkManager-resolv-prepender.yaml
diff --git a/templates/master/00-master/vsphere/files/NetworkManager-resolv-prepender.yaml b/templates/common/vsphere/files/NetworkManager-resolv-prepender.yaml
similarity index 100%
rename from templates/master/00-master/vsphere/files/NetworkManager-resolv-prepender.yaml
rename to templates/common/vsphere/files/NetworkManager-resolv-prepender.yaml
diff --git a/templates/worker/00-worker/openstack/files/NetworkManager-resolv-prepender.yaml b/templates/worker/00-worker/openstack/files/NetworkManager-resolv-prepender.yaml
deleted file mode 100644
index 3306e31af1..0000000000
--- a/templates/worker/00-worker/openstack/files/NetworkManager-resolv-prepender.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-mode: 0755
-path: "/etc/NetworkManager/dispatcher.d/30-resolv-prepender"
-contents:
-  inline: |
-    #!/bin/bash
-    IFACE=$1
-    STATUS=$2
-    case "$STATUS" in
-        up|down|dhcp4-change|dhcp6-change)
-        logger -s "NM resolv-prepender triggered by ${1} ${2}."
-        NAMESERVER_IP=$(/usr/bin/podman run --rm \
-            --authfile /var/lib/kubelet/config.json \
-            --net=host \
-            {{ .Images.baremetalRuntimeCfgImage }} \
-            node-ip \
-            show \
-            "{{.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP}}" \
-            "{{.Infra.Status.PlatformStatus.OpenStack.IngressIP}}")
-        DOMAIN="{{.Infra.Status.EtcdDiscoveryDomain}}"
-        if [[ -n "$NAMESERVER_IP" ]]; then
-            logger -s "NM resolv-prepender: Prepending 'nameserver $NAMESERVER_IP' to /etc/resolv.conf (other nameservers from /var/run/NetworkManager/resolv.conf)"
-            sed -e "/^search/d" \
-                -e "/Generated by/c# Generated by OpenStack resolv prepender NM dispatcher script\nsearch $DOMAIN\nnameserver $NAMESERVER_IP" \
-                /var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
-        else
-            logger -s "Couldn't find a non-virtual IP, just updating resolv.conf"
-            cp /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
-        fi
-        # Only leave the first 3 nameservers in /etc/resolv.conf
-        sed -i ':a $!{N; ba}; s/\(^\|\n\)nameserver/\n# nameserver/4g' /etc/resolv.tmp
-        mv -f /etc/resolv.tmp /etc/resolv.conf
-        ;;
-        *)
-        ;;
-    esac
diff --git a/templates/worker/00-worker/vsphere/files/NetworkManager-resolv-prepender.yaml b/templates/worker/00-worker/vsphere/files/NetworkManager-resolv-prepender.yaml
deleted file mode 100644
index 3d677f499d..0000000000
--- a/templates/worker/00-worker/vsphere/files/NetworkManager-resolv-prepender.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-mode: 0755
-path: "/etc/NetworkManager/dispatcher.d/30-resolv-prepender"
-contents:
-  inline: |
-    {{ if .Infra -}}
-    {{ if .Infra.Status -}}
-    {{ if .Infra.Status.PlatformStatus -}}
-    {{ if .Infra.Status.PlatformStatus.VSphere -}}
-    {{ if .Infra.Status.PlatformStatus.VSphere.APIServerInternalIP -}}
-    #!/bin/bash
-    IFACE=$1
-    STATUS=$2
-    # If $DHCP6_FQDN_FQDN is not empty and is not localhost.localdomain
-    [[ -n "$DHCP6_FQDN_FQDN" && "$DHCP6_FQDN_FQDN" != "localhost.localdomain" && "$DHCP6_FQDN_FQDN" =~ "." ]] && hostnamectl set-hostname --static --transient $DHCP6_FQDN_FQDN
-    case "$STATUS" in
-        up|down|dhcp4-change|dhcp6-change)
-        logger -s "NM resolv-prepender triggered by ${1} ${2}."
-        NAMESERVER_IP=$(/usr/bin/podman run --rm \
-            --authfile /var/lib/kubelet/config.json \
-            --net=host \
-            {{ .Images.baremetalRuntimeCfgImage }} \
-            node-ip \
-            show \
-            "{{.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP}}" \
-            "{{.Infra.Status.PlatformStatus.VSphere.IngressIP}}")
-        DOMAIN="{{.Infra.Status.EtcdDiscoveryDomain}}"
-        if [[ -n "$NAMESERVER_IP" ]]; then
-            logger -s "NM resolv-prepender: Prepending 'nameserver $NAMESERVER_IP' to /etc/resolv.conf (other nameservers from /var/run/NetworkManager/resolv.conf)"
-            sed -e "/^search/d" \
-                -e "/Generated by/c# Generated by KNI resolv prepender NM dispatcher script\nsearch $DOMAIN\nnameserver $NAMESERVER_IP" \
-                /var/run/NetworkManager/resolv.conf > /etc/resolv.tmp
-        else
-            logger -s "Couldn't find a non-virtual IP, just updating resolv.conf"
-            cp /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
-        fi
-        mv -f /etc/resolv.tmp /etc/resolv.conf
-        ;;
-        *)
-        ;;
-    esac
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}