diff --git a/.gitmodules b/.gitmodules
index 2711ded..791090e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "roles/win_activating"]
 	path = roles/win_activating
 	url = https://git.l3d.ch/voc/win_ansible_role_activating.git
-[submodule "collections/ansible_collections/ansible/windows"]
-	path = collections/ansible_collections/ansible/windows
-	url = https://github.com/ansible-collections/community.windows
 [submodule "collections/ansible_collections/chocolatey"]
 	path = collections/ansible_collections/chocolatey
 	url = https://github.com/chocolatey/chocolatey-ansible.git
@@ -22,3 +19,6 @@
 [submodule "roles/l3d.wireguard"]
 	path = roles/l3d.wireguard
 	url = https://git.l3d.ch/win_ansible/ansible_role_win_wireguard.git
+[submodule "roles/l3d.choco"]
+	path = roles/l3d.choco
+	url = https://git.l3d.ch/win_ansible/ansible_role_win_chocolatey.git
diff --git a/collections/ansible_collections/ansible/windows b/collections/ansible_collections/ansible/windows
deleted file mode 160000
index 588af79..0000000
--- a/collections/ansible_collections/ansible/windows
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 588af79d4fb2255c0d1139fd1179c72efa20770b
diff --git a/group_vars/all.yml b/group_vars/all.yml
index e4e89af..4e13887 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -2,6 +2,8 @@
 ## connect to windows
 ansible_connection: 'ssh'
 ansible_shell_type: 'powershell'
+ansible_pipelining: true
+ansible_password: "{{ lookup('community.general.passwordstore', 'ansible/windows/' + inventory_hostname + '/login/' + ansible_user) }}"
 
 # win_activating
 windows_product_key: "{{ lookup('community.general.passwordstore', 'ansible/windows/productkey') }}"
diff --git a/roles/l3d.choco b/roles/l3d.choco
new file mode 160000
index 0000000..5322f83
--- /dev/null
+++ b/roles/l3d.choco
@@ -0,0 +1 @@
+Subproject commit 5322f83dfb4385e2fe9d9db1a47220daf3e99cd5
diff --git a/site.yml b/site.yml
index 568a074..403ca46 100644
--- a/site.yml
+++ b/site.yml
@@ -8,6 +8,7 @@
 - name: Deploy windows users and basic config
   hosts: desktop
   roles:
+    - {role: l3d.choco, tags: choco}
     - {role: win_activating, tags: zeroconf}
     - {role: win_zeroconf, tags: zeroconf}
     - {role: win_gopass, tags: gopass}