diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index e94f4cf..c773663 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -66,8 +66,6 @@
 
 xos_tosca_config_templates: []
 
-xos_new_tosca_config_templates: []
-
 xos_other_templates: []
 
 # XOS Config (xos_config.yaml)
@@ -102,6 +100,7 @@
 # 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') }}"
+head_xos_admin_pass: "{{ lookup('file', head_credentials_dir ~ '/' ~ xos_admin_user) }}"
 xos_admin_first: XOS
 xos_admin_last: Admin
 
diff --git a/roles/cord-profile/templates/xos.yaml.j2 b/roles/cord-profile/templates/xos.yaml.j2
index 25728f2..2613830 100644
--- a/roles/cord-profile/templates/xos.yaml.j2
+++ b/roles/cord-profile/templates/xos.yaml.j2
@@ -28,4 +28,3 @@
 
     xos:
       type: tosca.nodes.XOS
-