diff --git a/roles/compute-node-enable-maas/defaults/main.yml b/roles/compute-node-enable-maas/defaults/main.yml
index a08b076..fd776c2 100644
--- a/roles/compute-node-enable-maas/defaults/main.yml
+++ b/roles/compute-node-enable-maas/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,11 +17,7 @@
 
 head_cord_profile_dir: "/opt/cord_profile"
 
-credentials_dir: "{{ playbook_dir }}/credentials"
 xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
-
-
 maas_xos_admin_pass: "{{ lookup('file', '/opt/credentials/xosadmin@opencord.org') }}"
 
 xos_tosca_url: "http://xos-tosca/xos-tosca"
diff --git a/roles/compute-node-enable-maas/tasks/main.yml b/roles/compute-node-enable-maas/tasks/main.yml
index f84315b..8e14090 100644
--- a/roles/compute-node-enable-maas/tasks/main.yml
+++ b/roles/compute-node-enable-maas/tasks/main.yml
@@ -35,7 +35,7 @@
     method: POST
     headers:
       xos-username: "{{ xos_admin_user }}"
-      xos-password: "{{ xos_admin_pass }}"
+      xos-password: "{{ maas_xos_admin_pass }}"
     body: "{{ lookup('file', '/tmp/' + item ) }}"
     status_code: 200
   with_items:
@@ -52,7 +52,7 @@
     method: POST
     headers:
       xos-username: "{{ xos_admin_user }}"
-      xos-password: "{{ xos_admin_pass }}"
+      xos-password: "{{ maas_xos_admin_pass }}"
     body: "{{ lookup('file', '/tmp/' + item ) }}"
   with_items:
     - vtn-service.yaml