diff --git a/roles/overcloud-deploy/tasks/deployed-server.yml b/roles/overcloud-deploy/tasks/deployed-server.yml
index a72c2d851..39ea2bb5f 100644
--- a/roles/overcloud-deploy/tasks/deployed-server.yml
+++ b/roles/overcloud-deploy/tasks/deployed-server.yml
@@ -18,6 +18,7 @@
     http_proxy: "{{ lookup('env', 'http_proxy') }}"
     no_proxy: "{{ lookup('env', 'no_proxy') }}"
     TRIPLEO_ROOT: "{{ lookup('env','TRIPLEO_ROOT') }}"
+    OVERCLOUD_HOSTS: "{{ lookup('env','OVERCLOUD_HOSTS') }}"
     CONTROLLER_HOSTS: "{{ lookup('env','CONTROLLER_HOSTS') }}"
     COMPUTE_HOSTS: "{{ lookup('env', 'COMPUTE_HOSTS') }}"
     BLOCKSTORAGE_HOSTS: "{{ lookup('env', 'BLOCKSTORAGE_HOSTS') }}"
diff --git a/roles/overcloud-deploy/templates/deployed_server_prepare.sh.j2 b/roles/overcloud-deploy/templates/deployed_server_prepare.sh.j2
index c6ba50633..9ba5d20f1 100644
--- a/roles/overcloud-deploy/templates/deployed_server_prepare.sh.j2
+++ b/roles/overcloud-deploy/templates/deployed_server_prepare.sh.j2
@@ -3,3 +3,5 @@
 source ${HOME}/stackrc
 
 /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
+
+/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