diff --git a/roles/xos-config/defaults/main.yml b/roles/xos-config/defaults/main.yml
index c610f28..0e91e57 100644
--- a/roles/xos-config/defaults/main.yml
+++ b/roles/xos-config/defaults/main.yml
@@ -4,3 +4,5 @@
 xos_admin_user: "xosadmin@opencord.org"
 
 xos_tosca_config_templates: []
+
+use_openstack: True
diff --git a/roles/xos-config/tasks/main.yml b/roles/xos-config/tasks/main.yml
index 14b3d45..39ecd35 100644
--- a/roles/xos-config/tasks/main.yml
+++ b/roles/xos-config/tasks/main.yml
@@ -9,6 +9,14 @@
   tags:
     - 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
+  tags:
+    - skip_ansible_lint # TOSCA loading should be idempotent
+
 - name: Configure XOS with profile specific TOSCA
   command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/{{ item }}"
   with_items: "{{ xos_tosca_config_templates }}"