diff --git a/cord-head-playbook.yml b/cord-head-playbook.yml
index 7e8c221..a39ff7a 100644
--- a/cord-head-playbook.yml
+++ b/cord-head-playbook.yml
@@ -68,6 +68,7 @@
   hosts: head
   roles:
     - docker-compose
+    - xos-config
     - xos-head-start
 
 - name: Set up Automated Compute Node Provisioning
diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index 8162d0a..f141a66 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -44,14 +44,6 @@
 #  command: ansible xos-1 -u ubuntu -m copy \
 #    -a "src=~/admin-openrc.sh dest={{ service_profile_repo_dest }}/{{ xos_configuration }}"
 
-- name: Copy admin-openrc.sh to service-profile
-  command: cp ~/admin-openrc.sh {{ service_profile_repo_dest }}/{{ xos_configuration }}
-  tags:
-    - skip_ansible_lint
-#  copy:
-#      src=~/admin-openrc.sh
-#      dest={{ service_profile_repo_dest }}/{{ xos_configuration }}
-
 - name: Wait for test client to complete installation
   when: test_client_install is defined and test_client_install
   async_status: jid={{ test_client_playbook.ansible_job_id }}
diff --git a/roles/xos-config/tasks/main.yml b/roles/xos-config/tasks/main.yml
new file mode 100644
index 0000000..9898d3e
--- /dev/null
+++ b/roles/xos-config/tasks/main.yml
@@ -0,0 +1,15 @@
+---
+# xos-head-start/tasks/main.yml
+
+# Performs any configuration of XOS that should be done right before starting
+# XOS. This includes copying the admin-openrc.sh, since we had to wait for juju
+# to finish before admin-openrc.sh was present.
+
+- name: Copy admin-openrc.sh to service-profile
+#  command: cp ~/admin-openrc.sh {{ service_profile_repo_dest }}/{{ xos_configuration }}
+  copy:
+      remote_src=True
+      src=~/admin-openrc.sh
+      dest={{ service_profile_repo_dest }}/{{ xos_configuration }}
+
+