diff --git a/ansible/group_vars/all/overcloud b/ansible/group_vars/all/overcloud
index 7383833b7219aaa2e393bb22edb054d2f6e49920..b5930a2153784b9da5921f7220c5c1dbc2a2f5de 100644
--- a/ansible/group_vars/all/overcloud
+++ b/ansible/group_vars/all/overcloud
@@ -22,13 +22,12 @@ disable_cloud_init: False
 ###############################################################################
 # Overcloud host image configuration.
 
-# The CentOS cloud images from 7.2 (1511) onwards have a bogus name server
-# entry in /etc/resolv.conf, 10.0.2.3. Cloud-init only appends name server
-# entries to this file, and will not remove this bogus entry. Typically this
-# leads to a delay of around 30 seconds when connecting via SSH, due to a
-# timeout in NSS. The workaround employed here is to remove this bogus entry
-# from the image using virt-customize, if it exists. See
-# https://bugs.centos.org/view.php?id=14369.
+# The CentOS cloud images have a bogus name server entry in /etc/resolv.conf,
+# 192.168.122.1. Cloud-init only appends name server entries to this file, and
+# will not remove this bogus entry. Typically this leads to a delay of around
+# 30 seconds when connecting via SSH, due to a timeout in NSS. The workaround
+# employed here is to remove this bogus entry from the image using
+# virt-customize, if it exists. See https://bugs.centos.org/view.php?id=14369.
 overcloud_host_image_workaround_resolv_enabled: True
 
 # Workaround a CentOS 7.5 bug: cloud-init 0.7.9-24 does not correctly set
diff --git a/ansible/overcloud-host-image-workaround-resolv.yml b/ansible/overcloud-host-image-workaround-resolv.yml
index 16018ae54209041a55aa8e9e0ab90a9e0283e9bd..baff4fc857baf8e6134edd3357fbb4f34529c37c 100644
--- a/ansible/overcloud-host-image-workaround-resolv.yml
+++ b/ansible/overcloud-host-image-workaround-resolv.yml
@@ -1,11 +1,10 @@
 ---
-# The CentOS cloud images from 7.2 (1511) onwards have a bogus name server
-# entry in /etc/resolv.conf, 10.0.2.3. Cloud-init only appends name server
-# entries to this file, and will not remove this bogus entry. Typically this
-# leads to a delay of around 30 seconds when connecting via SSH, due to a
-# timeout in NSS. The workaround employed here is to remove this bogus entry
-# from the image using virt-customize, if it exists. See
-# https://bugs.centos.org/view.php?id=14369.
+# The CentOS cloud images have a bogus name server entry in /etc/resolv.conf,
+# 192.168.122.1. Cloud-init only appends name server entries to this file, and
+# will not remove this bogus entry. Typically this leads to a delay of around
+# 30 seconds when connecting via SSH, due to a timeout in NSS. The workaround
+# employed here is to remove this bogus entry from the image using
+# virt-customize, if it exists. See https://bugs.centos.org/view.php?id=14369.
 
 - name: Ensure the overcloud host image has bogus name server entries removed
   hosts: seed
@@ -32,5 +31,5 @@
             --connection local
             --become
             -m command
-            -a "virt-customize -a /httpboot/deployment_image.qcow2 --edit \"/etc/resolv.conf:s/^nameserver 10\.0\.2\.3\$//\""'
+            -a "virt-customize -a /httpboot/deployment_image.qcow2 --edit \"/etc/resolv.conf:s/^nameserver .*\..*\..*\..*\$//\""'
       when: overcloud_host_image_workaround_resolv_enabled | bool
diff --git a/etc/kayobe/overcloud.yml b/etc/kayobe/overcloud.yml
index 0764600bb7cbfe80e5df3bf8eb1e3b7755279f8c..dbb68c5e950957ee39d13d8fc1975957ef07682d 100644
--- a/etc/kayobe/overcloud.yml
+++ b/etc/kayobe/overcloud.yml
@@ -19,13 +19,12 @@
 ###############################################################################
 # Overcloud host image configuration.
 
-# The CentOS cloud images from 7.2 (1511) onwards have a bogus name server
-# entry in /etc/resolv.conf, 10.0.2.3. Cloud-init only appends name server
-# entries to this file, and will not remove this bogus entry. Typically this
-# leads to a delay of around 30 seconds when connecting via SSH, due to a
-# timeout in NSS. The workaround employed here is to remove this bogus entry
-# from the image using virt-customize, if it exists. See
-# https://bugs.centos.org/view.php?id=14369.
+# The CentOS cloud images have a bogus name server entry in /etc/resolv.conf,
+# 192.168.122.1. Cloud-init only appends name server entries to this file, and
+# will not remove this bogus entry. Typically this leads to a delay of around
+# 30 seconds when connecting via SSH, due to a timeout in NSS. The workaround
+# employed here is to remove this bogus entry from the image using
+# virt-customize, if it exists. See https://bugs.centos.org/view.php?id=14369.
 #overcloud_host_image_workaround_resolv_enabled:
 
 # Workaround a CentOS 7.5 bug: cloud-init 0.7.9-24 does not correctly set