diff --git a/roles/xos-config/tasks/main.yml b/roles/xos-config/tasks/main.yml
index 353e199..e75195f 100644
--- a/roles/xos-config/tasks/main.yml
+++ b/roles/xos-config/tasks/main.yml
@@ -17,8 +17,10 @@
 ---
 # xos-config/tasks/main.yml
 
+# TODO move this to the TOSCA container
+
 - name: Bootstrap XOS database - create site, deployment, admin user
-  command: "python /opt/xos/tosca/run.py none /opt/cord_profile/{{ item }}"
+  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/{{ item }}"
   with_items:
     - "fixtures.yaml"
     - "deployment.yaml"
@@ -26,7 +28,6 @@
     - skip_ansible_lint # TOSCA loading should be idempotent
 
 - name: Configure XOS with OpenStack config
-  when: use_openstack
   command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/{{ item }}"
   with_items:
     - openstack.yaml