diff --git a/roles/compute-node/vars/main.yml b/roles/compute-node/defaults/main.yml
similarity index 96%
rename from roles/compute-node/vars/main.yml
rename to roles/compute-node/defaults/main.yml
index 5accf44..8bb3905 100644
--- a/roles/compute-node/vars/main.yml
+++ b/roles/compute-node/defaults/main.yml
@@ -1,7 +1,9 @@
+---
+
 pub_ssh_key: "{{ lookup('file', '/etc/maas/.ssh/cord_rsa.pub') }}"
 
 compute_node:
-    password: "{{password_compute_node | default(lookup('password', 'passwords/compute_node.txt'))}}"
+    password: "{{password_compute_node | default(lookup('password', 'passwords/compute_node.txt chars=ascii_letters,digits'))}}"
     fabric:
         include:
             names: "{{ fabric_include_names | default(omit) }}"
diff --git a/roles/fabric-switch/vars/main.yml b/roles/fabric-switch/defaults/main.yml
similarity index 100%
rename from roles/fabric-switch/vars/main.yml
rename to roles/fabric-switch/defaults/main.yml
diff --git a/roles/head-node/vars/main.yml b/roles/head-node/defaults/main.yml
similarity index 100%
rename from roles/head-node/vars/main.yml
rename to roles/head-node/defaults/main.yml
diff --git a/roles/maas/vars/main.yml b/roles/maas/defaults/main.yml
similarity index 95%
rename from roles/maas/vars/main.yml
rename to roles/maas/defaults/main.yml
index 34d3765..de2a8cb 100644
--- a/roles/maas/vars/main.yml
+++ b/roles/maas/defaults/main.yml
@@ -1,3 +1,5 @@
+---
+
 accton_as5712_54x: 'https://www.dropbox.com/s/pl3cvr9olnaufw5/ONL-2.0.0_ONL-OS_2017-01-04.0024-8d23df5_AMD64_INSTALLED_INSTALLER'
 accton_as6712_32x: 'https://www.dropbox.com/s/pl3cvr9olnaufw5/ONL-2.0.0_ONL-OS_2017-01-04.0024-8d23df5_AMD64_INSTALLED_INSTALLER'
 
@@ -12,9 +14,9 @@
 
 maas:
     admin_email: "{{ admin_email | default('admin@cord.lab') }}"
-    admin_password: "{{ password_maas_admin | default(lookup('password', 'passwords/maas_admin.txt')) }}"
+    admin_password: "{{ password_maas_admin | default(lookup('password', 'passwords/maas_admin.txt chars=ascii_letters,digits')) }}"
     user: "{{ maas_user | default('cord') }}"
-    user_password: "{{ password_maas_user | default(lookup('password', 'passwords/maas_user.txt')) }}"
+    user_password: "{{ password_maas_user | default(lookup('password', 'passwords/maas_user.txt chars=ascii_letters,digits')) }}"
     user_email: "{{ maas_email | default('cord@cord.lab') }}"
     user_sshkey: "{{ lookup('file', '/etc/maas/.ssh/cord_rsa.pub') }}"
 
diff --git a/roles/onos-fabric/vars/main.yml b/roles/onos-fabric/defaults/main.yml
similarity index 100%
rename from roles/onos-fabric/vars/main.yml
rename to roles/onos-fabric/defaults/main.yml