diff --git a/ansible/group_vars/all/creds.yml b/ansible/group_vars/all/creds.yml
new file mode 100644
index 00000000000..2b4d1c8ea09
--- /dev/null
+++ b/ansible/group_vars/all/creds.yml
@@ -0,0 +1,11 @@
+eos_default_login: "admin"
+eos_default_password: ""
+eos_login: admin
+eos_password: 123456
+eos_root_password: 123456
+
+sonic_login: "admin"
+sonic_default_passwords:
+ - "YourPaSsWoRd"
+ - "password"
+sonic_password: "password"
diff --git a/ansible/group_vars/eos/creds.yml b/ansible/group_vars/eos/creds.yml
deleted file mode 100644
index 3cd1daa7d2c..00000000000
--- a/ansible/group_vars/eos/creds.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-ansible_user: use_own_value
-ansible_password: use_own_value
-
diff --git a/ansible/roles/eos/tasks/main.yml b/ansible/roles/eos/tasks/main.yml
index 09cb3a56542..c5ade3bdced 100644
--- a/ansible/roles/eos/tasks/main.yml
+++ b/ansible/roles/eos/tasks/main.yml
@@ -1,3 +1,6 @@
+- name: Set ansible login user name and password
+  set_fact: ansible_user="root" ansible_password={{ eos_root_password }}
+
 - name: Load topo variables
   include_vars: "vars/topo_{{ topo }}.yml"
 
diff --git a/ansible/roles/vm_set/tasks/start_sonic_vm.yml b/ansible/roles/vm_set/tasks/start_sonic_vm.yml
index b176b563b58..35ad1703231 100644
--- a/ansible/roles/vm_set/tasks/start_sonic_vm.yml
+++ b/ansible/roles/vm_set/tasks/start_sonic_vm.yml
@@ -39,11 +39,11 @@
 - name: Wait until vm {{ dut_name }} is loaded
   sonic_kickstart: telnet_port={{ serial_port }}
              login={{ sonic_login }}
-             passwords={{ sonic_passwords }}
+             passwords={{ sonic_default_passwords }}
              hostname={{ dut_name }}
              mgmt_ip="{{ mgmt_ip_address }}/{{ mgmt_prefixlen }}"
              mgmt_gw={{ vm_mgmt_gw | default(mgmt_gw) }}
-             new_password={{ sonic_new_password }}
+             new_password={{ sonic_password }}
   register: kickstart_output
 
 - name: Fail if kickstart gives error for {{ dut_name }}
diff --git a/ansible/roles/vm_set/tasks/start_vm.yml b/ansible/roles/vm_set/tasks/start_vm.yml
index 2e317f0c5f5..f5cb2a7702a 100644
--- a/ansible/roles/vm_set/tasks/start_vm.yml
+++ b/ansible/roles/vm_set/tasks/start_vm.yml
@@ -50,14 +50,14 @@
 
 - name: Wait until vm {{ vm_name }} is loaded
   kickstart: telnet_port={{ serial_port }}
-             login={{ login }}
-             password={{ password }}
+             login={{ eos_default_login }}
+             password={{ eos_default_password }}
              hostname={{ hostname }}
              mgmt_ip="{{ mgmt_ip_address }}/{{ mgmt_prefixlen }}"
              mgmt_gw={{ vm_mgmt_gw | default(mgmt_gw) }}
-             new_login={{ new_login }}
-             new_password={{ new_password }}
-             new_root_password={{ new_root_password }}
+             new_login={{ eos_login }}
+             new_password={{ eos_password }}
+             new_root_password={{ eos_root_password }}
   register: kickstart_output
   when: vm_name not in vm_list_running.list_vms or vm_name in respin_vms
 
@@ -77,14 +77,14 @@
 
 - name: Wait until vm {{ vm_name }} is loaded
   kickstart: telnet_port={{ serial_port }}
-             login={{ login }}
-             password={{ password }}
+             login={{ eos_default_login }}
+             password={{ eos_default_password }}
              hostname={{ hostname }}
              mgmt_ip="{{ mgmt_ip_address }}/{{ mgmt_prefixlen }}"
              mgmt_gw={{ vm_mgmt_gw | default(mgmt_gw) }}
-             new_login={{ new_login }}
-             new_password={{ new_password }}
-             new_root_password={{ new_root_password }}
+             new_login={{ eos_login }}
+             new_password={{ eos_password }}
+             new_root_password={{ eos_root_password }}
   register: kickstart_output_final
   when: vm_name not in vm_list_running.list_vms and kickstart_output.kickstart_code != 0
 
diff --git a/ansible/roles/vm_set/vars/main.yml b/ansible/roles/vm_set/vars/main.yml
index 344784ecec7..70e2ee8bcd3 100644
--- a/ansible/roles/vm_set/vars/main.yml
+++ b/ansible/roles/vm_set/vars/main.yml
@@ -1,15 +1,3 @@
-login: "admin"
-password: ""
-new_login: admin
-new_password: 123456
-new_root_password: 123456
-
-sonic_login: "admin"
-sonic_passwords:
- - "YourPaSsWoRd"
- - "password"
-sonic_new_password: "password"
-
 tor_memory: 1572864
 spine_memory: 2097152