diff --git a/.gitmodules b/.gitmodules
index 642305c..a032300 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,10 +38,6 @@
 	path = roles/amdgpu_firmware
 	url = https://github.com/DO1JLR/ansible_role_amdgpu_firmware.git
 	branch = main
-[submodule "roles/do1jlr.i3wm"]
-	path = roles/do1jlr.i3wm
-	url = https://github.com/roles-ansible/ansible_role_i3wm.git
-	branch = main
 [submodule "roles/do1jlr.htop"]
 	path = roles/do1jlr.htop
 	url = https://github.com/roles-ansible/ansible_role_htop.git
@@ -74,3 +70,6 @@
 [submodule "collections/ansible_collections/l3d/users"]
 	path = collections/ansible_collections/l3d/users
 	url = https://github.com/roles-ansible/ansible_collection_users.git
+[submodule "collections/ansible_collections/l3d/wm"]
+	path = collections/ansible_collections/l3d/wm
+	url = https://github.com/roles-ansible/ansible_collection_wm.git
diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general
index cac55be..1a8f172 160000
--- a/collections/ansible_collections/community/general
+++ b/collections/ansible_collections/community/general
@@ -1 +1 @@
-Subproject commit cac55beb4fe7e22f2d4d868fef3affbb854e558f
+Subproject commit 1a8f172186e82126d922686c2226f34c1a2a5db1
diff --git a/collections/ansible_collections/l3d/wm b/collections/ansible_collections/l3d/wm
new file mode 160000
index 0000000..ba7cb8f
--- /dev/null
+++ b/collections/ansible_collections/l3d/wm
@@ -0,0 +1 @@
+Subproject commit ba7cb8f13ff5dd0f3b9c16df25f88d6e1114c369
diff --git a/roles/do1jlr.i3wm b/roles/do1jlr.i3wm
deleted file mode 160000
index 31c8ca4..0000000
--- a/roles/do1jlr.i3wm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 31c8ca4dbf17c4cdd5777c5b32b31638239de687
diff --git a/roles/l3d.packages b/roles/l3d.packages
index 0348a3b..d35207a 160000
--- a/roles/l3d.packages
+++ b/roles/l3d.packages
@@ -1 +1 @@
-Subproject commit 0348a3bb5ef7a894ccc83fb620bd5264045ae82b
+Subproject commit d35207a72a336f41bfce5af1ced1085bce993ee5
diff --git a/site.yml b/site.yml
index 9ea5d40..73b1652 100644
--- a/site.yml
+++ b/site.yml
@@ -22,9 +22,9 @@
     - {role: l3d.etesync_dav, tags: [etebase, etesync, dav]}
     - {role: gantsign.bat, tags: bat}
     - {role: l3d.gopass, tags: gopass}
-    - {role: do1jlr.i3wm, tags: i3wm}
-    - {role: roles-ansible.sway, tags: sway}
-    - {role: amdgpu_firmware, tags: firmware}
+    - {role: l3d.wm.i3, tags: i3wm}
+    - {role: l3d.wm.sway, tags: sway}
+    # - {role: amdgpu_firmware, tags: firmware}
     - {role: do1jlr.htop, tags: htop}
 
 # - name: user specific setup