diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
deleted file mode 100644
index 5999030..0000000
--- a/group_vars/all/vars.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# use chvoc store for gopass passwords
-win_base_init__pass_prefix: 'chvoc/ansible/windows'
diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml
index 38ac87b..1ca70b3 100644
--- a/group_vars/obs/vars.yml
+++ b/group_vars/obs/vars.yml
@@ -4,7 +4,9 @@ ansible_winrm_server_cert_validation: ignore
 ansible_password: "{{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/' + inventory_hostname + '/login/' + ansible_user) }}"
 
 # credetials
-win_obs_init__password: "{{ lookup('community.general.passwordstore', win_base_init__pass_prefix + '/' + inventory_hostname + '/login/obs create=true length=16 nosymbols=true') }}"
+gopass_password_prefix: 'chvoc/ansible/windows/'
+win_base_init__created_user_password: "{{ lookup('community.general.passwordstore', gopass_password_prefix + inventory_hostname + '/login/ansible create=true length=64 nosymbols=true') }}"
+win_obs_init__password: "{{ lookup('community.general.passwordstore', gopass_password_prefix + inventory_hostname + '/login/obs create=true length=16 nosymbols=true') }}"
 
 # manage autologon
 win_obs_init__autologon: true
diff --git a/roles/do1jlr.win_base_setup b/roles/do1jlr.win_base_setup
index 2492e0e..ce8466e 160000
--- a/roles/do1jlr.win_base_setup
+++ b/roles/do1jlr.win_base_setup
@@ -1 +1 @@
-Subproject commit 2492e0ef5a88869c89f3d82b6bebcc53619648f6
+Subproject commit ce8466eb48fdc03fe3d37e6cb62af85996a537da