diff --git a/roles/overcloud-deploy/templates/deployed_server_prepare.sh.j2 b/roles/overcloud-deploy/templates/deployed_server_prepare.sh.j2
index b37a0605a..f69ca61f6 100644
--- a/roles/overcloud-deploy/templates/deployed_server_prepare.sh.j2
+++ b/roles/overcloud-deploy/templates/deployed_server_prepare.sh.j2
@@ -2,13 +2,23 @@
 
 source ${HOME}/stackrc
 
+# We did not have OVERCLOUD_ROLES var in the newton version of the
+# get-occ-config script. Instead we need to use CONTROLLER_HOSTS var.
+{% if release != "newton" %}
 export OVERCLOUD_ROLES=""
 {% for role in deployed_server_overcloud_roles %}
 OVERCLOUD_ROLES="$OVERCLOUD_ROLES {{ role.name }}"
 export {{ role.name }}_hosts={{ role.hosts }}
 {% endfor %}
 export OVERCLOUD_HOSTS="{{ deployed_server_overcloud_roles|map(attribute='hosts')|join(' ') }}"
+{% else %}
+export CONTROLLER_HOSTS="{{deployed_server_overcloud_roles|map(attribute='hosts')|join(' ') }}"
+{% endif %}
+
 
 /usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/get-occ-config.sh 2>&1 | sudo dd of=/var/log/deployed-server-os-collect-config.log
 
+# We also do not have the deployed-server-enable-ssh-admin script on newton.
+{% if release != "newton" %}
 /usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/enable-ssh-admin.sh 2>&1 | sudo dd of=/var/log/deployed-server-enable-ssh-admin.log
+{% endif %}