diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index 82d517f..0f71033 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -91,17 +91,20 @@
 gui_branding_bg: "/static/bg.jpg"
 gui_service_view_class: False
 
+# used in admin-openrc.sh.j2
+keystone_admin_password: "{{ lookup('password', credentials_dir ~ '/cord_keystone_admin chars=ascii_letters,digits') }}"
+
 # used in deployment.yaml.j2
 xos_admin_user: "xosadmin@opencord.org"
 xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
 xos_admin_first: XOS
 xos_admin_last: Admin
 
-site_name: sitename
-site_humanname: "Site HumanName"
-site_suffix: sitename.test
+site_name: placeholder-sitename
+site_humanname: "Placeholder Site HumanName"
+site_suffix: "{{ site_name }}.test"
 
-deployment_type: deploymenttype
+deployment_type: placeholder-deploymenttype
 
 deployment_flavors:
   - m1.small
diff --git a/roles/create-lxd/templates/ansible_hosts.j2 b/roles/create-lxd/templates/ansible_hosts.j2
index 21f5c8a..d2caf33 100644
--- a/roles/create-lxd/templates/ansible_hosts.j2
+++ b/roles/create-lxd/templates/ansible_hosts.j2
@@ -1,14 +1,6 @@
 [localhost]
 127.0.0.1 hostname={{ ansible_fqdn }}
 
-# VMs will go away shortly in favor of containers
-[vms]
-{% if head_vm_list is defined -%}
-{% for vm in head_vm_list -%}
-{{ vm.name }}
-{% endfor -%}
-{% endif -%}
-
 [containers]
 {% if head_lxd_list is defined -%}
 {% for lxd in head_lxd_list -%}
@@ -17,13 +9,5 @@
 {% endif -%}
 
 [services:children]
-vms
 containers
 
-[docker]
-{% if head_vm_list is defined -%}
-{% for vm in head_vm_list | selectattr('docker_path', 'defined') -%}
-{{ vm.name }}
-{% endfor -%}
-{% endif -%}
-
diff --git a/roles/juju-setup/defaults/main.yml b/roles/juju-setup/defaults/main.yml
index 3024e0e..a9c7e81 100644
--- a/roles/juju-setup/defaults/main.yml
+++ b/roles/juju-setup/defaults/main.yml
@@ -8,3 +8,8 @@
 charm_versions: {}
 
 pki_dir: "{{ playbook_dir }}/pki"
+
+site_name: placeholder-sitename
+site_suffix: "{{ site_name }}.test"
+
+keystone_admin_password: "{{ lookup('password', credentials_dir ~ '/cord_keystone_admin chars=ascii_letters,digits') }}"
diff --git a/roles/lxd-finish/defaults/main.yml b/roles/lxd-finish/defaults/main.yml
index 17836e2..0f65371 100644
--- a/roles/lxd-finish/defaults/main.yml
+++ b/roles/lxd-finish/defaults/main.yml
@@ -3,3 +3,5 @@
 
 apt_cacher_name: apt-cache
 
+run_dist_upgrade: False
+
diff --git a/roles/pki-intermediate-ca/defaults/main.yml b/roles/pki-intermediate-ca/defaults/main.yml
index 3a5b545..5bdf5a3 100644
--- a/roles/pki-intermediate-ca/defaults/main.yml
+++ b/roles/pki-intermediate-ca/defaults/main.yml
@@ -5,9 +5,9 @@
 credentials_dir: "{{ playbook_dir }}/credentials"
 
 # used to name the intermediate CA
-site_name: sitename
-site_humanname: "Site HumanName"
-site_suffix: sitename.test
+site_name: placeholder-sitename
+site_humanname: "Placeholder Site HumanName"
+site_suffix: "{{ site_name }}.test"
 
 # crypto parameters
 ca_digest: "sha256"
diff --git a/roles/test-exampleservice/defaults/main.yml b/roles/test-exampleservice/defaults/main.yml
index 82900ab..8ec28f6 100644
--- a/roles/test-exampleservice/defaults/main.yml
+++ b/roles/test-exampleservice/defaults/main.yml
@@ -2,5 +2,9 @@
 # test-exampleservice/defaults/main.yml
 
 head_cord_profile_dir: "/opt/cord_profile"
+
 xos_ui_port: 9000
 
+xos_admin_user: "xosadmin@opencord.org"
+xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
+
diff --git a/roles/test-subscriber-enable/defaults/main.yml b/roles/test-subscriber-enable/defaults/main.yml
new file mode 100644
index 0000000..a7720ec
--- /dev/null
+++ b/roles/test-subscriber-enable/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+# test-subscriber-enable/defaults/main.yml
+
+xos_admin_user: "xosadmin@opencord.org"
+
diff --git a/roles/vtn-refresh/defaults/main.yml b/roles/vtn-refresh/defaults/main.yml
index 07ee055..9925958 100644
--- a/roles/vtn-refresh/defaults/main.yml
+++ b/roles/vtn-refresh/defaults/main.yml
@@ -3,7 +3,7 @@
 
 credentials_dir: "{{ playbook_dir }}/credentials"
 
-xos_admin_user: xosadmin@opencord.org
+xos_admin_user: "xosadmin@opencord.org"
 xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
 
 keystone_admin_password: "{{ lookup('password', credentials_dir ~ '/cord_keystone_admin chars=ascii_letters,digits') }}"
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 }}"