diff --git a/roles/juju-setup/tasks/main.yml b/roles/juju-setup/tasks/main.yml
index abb8d91..691a827 100644
--- a/roles/juju-setup/tasks/main.yml
+++ b/roles/juju-setup/tasks/main.yml
@@ -141,15 +141,15 @@
   command: juju scp {{ juju_services['nova-cloud-controller']['units'].keys()[0] }}:/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt {{ ansible_user_dir }}
     creates={{ ansible_user_dir }}/keystone_juju_ca_cert.crt
 
-- name: Move cert to system location
+- name: Copy cert to system location
   become: yes
-  command: mv {{ ansible_user_dir }}/keystone_juju_ca_cert.crt /usr/local/share/ca-certificates
+  command: cp {{ ansible_user_dir }}/keystone_juju_ca_cert.crt /usr/local/share/ca-certificates
     creates=/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt
   notify: update-ca-certificates
 
 - name: Move cert to xos vm
-  command: ansible "{{ 'xos.'~site_suffix }}" -b -u ubuntu -m copy -a "src={{ ansible_user_dir }}/keystone_juju_ca_cert.crt dest=/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt owner=root group=root mode=0644"
+  command: ansible xos-1 -b -u ubuntu -m copy -a "src={{ ansible_user_dir }}/keystone_juju_ca_cert.crt dest=/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt owner=root group=root mode=0644"
 
 - name: update-ca-certificates on xos vm
-  command: ansible "{{ 'xos.'~site_suffix }}" -b -u ubuntu -m command -a "update-ca-certificates"
+  command: ansible xos-1 -b -u ubuntu -m command -a "update-ca-certificates"