diff --git a/roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2 b/roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2
index 565d88b67..44fd67d9c 100644
--- a/roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2
+++ b/roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2
@@ -109,12 +109,12 @@ sudo ifup ifcfg-{{ network.device_name }}
 ## * Set the DNS server in the control plane network
 ## ::
 
-{% if overcloud_dns_servers|default([]) and release not in ['mitaka', 'newton'] %}
+{% if overcloud_dns_servers|default([]) %}
     CTLPLANE_SUBNET=$(openstack subnet show ctlplane-subnet -f value -c id)
-    neutron subnet-update $CTLPLANE_SUBNET \
+    openstack subnet set $CTLPLANE_SUBNET --no-dns-nameserver \
         {% for nameserver in overcloud_dns_servers %} --dns-nameserver "{{ nameserver }}" {% endfor %}
 {% else %}
-    neutron subnet-update $(neutron net-list | awk '/ctlplane/{print $(NF-2) }') $(awk 'match($0, /nameserver\s+(([0-9]{1,3}.?){4})/,address){printf " --dns-nameserver %s", address[1]}' /etc/resolv.conf)
+    openstack subnet set $(openstack subnet list | awk '/ctlplane/{print $(NF-7) }') $(awk 'match($0, /nameserver\s+(([0-9]{1,3}.?){4})/,address){printf " --dns-nameserver %s", address[1]}' /etc/resolv.conf)
 {% endif %}
 
 ### --stop_docs