diff --git a/.gitmodules b/.gitmodules
index bbc323a..3419572 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "roles/workstation_packages"]
 	path = roles/workstation_packages
 	url = https://github.com/chaos-bodensee/role_install_workstaton_packages.git
-[submodule "roles/do1jlr.i3wm"]
-	path = roles/do1jlr.i3wm
-	url = https://github.com/roles-ansible/ansible_role_i3wm.git
 [submodule "roles/dotfiles"]
 	path = roles/dotfiles
 	url = https://github.com/chaos-bodensee/role_dotfiles.git
@@ -67,3 +64,6 @@
 [submodule "roles/do1jlr.avahi_client"]
 	path = roles/do1jlr.avahi_client
 	url = https://github.com/roles-ansible/ansible_role_avahi_client.git
+[submodule "roles/do1jlr.i3wm"]
+	path = roles/do1jlr.i3wm
+	url = https://github.com/roles-ansible/ansible_role_i3wm.git
diff --git a/roles/do1jlr.i3wm b/roles/do1jlr.i3wm
new file mode 160000
index 0000000..6fbf3f2
--- /dev/null
+++ b/roles/do1jlr.i3wm
@@ -0,0 +1 @@
+Subproject commit 6fbf3f2efc331abb3a81c08d81e5973d43f9b706
diff --git a/setup_desk_minni.yml b/setup_desk_minni.yml
index 1eee182..3288f19 100644
--- a/setup_desk_minni.yml
+++ b/setup_desk_minni.yml
@@ -28,7 +28,7 @@
     - {role: bat, tags: bat, when: ansible_os_family == 'Debian'}
     - {role: install-firefox, tags: firefox}
     - {role: copy_files}
-    - {role: i3wm, tags: i3wm}
+    - {role: do1jlr.i3wm, tags: i3wm}
     - {role: ntp, tags: ntp}
     - {role: xrandr, tags: xrandr}
     - {role: arch-fonts, tags: fonts}
diff --git a/setup_l14.yml b/setup_l14.yml
index 6d61ff7..e87c712 100644
--- a/setup_l14.yml
+++ b/setup_l14.yml
@@ -29,7 +29,7 @@
     - {role: bat, tags: bat, when: ansible_os_family == 'Debian'}
     - {role: install-firefox, tags: firefox}
     - {role: copy_files}
-    - {role: i3wm, tags: i3wm}
+    - {role: do1jlr.i3wm, tags: i3wm}
     - {role: ntp, tags: ntp}
     - {role: xrandr, tags: xrandr}
     - {role: arch-fonts, tags: fonts}
diff --git a/setup_t460p.yml b/setup_t460p.yml
index d41a82c..6bf5acf 100644
--- a/setup_t460p.yml
+++ b/setup_t460p.yml
@@ -28,7 +28,7 @@
     - {role: bat, tags: bat, when: ansible_os_family == 'Debian'}
     - {role: install-firefox, tags: firefox}
     - {role: copy_files}
-    - {role: i3wm, tags: i3wm}
+    - {role: do1jlr.i3wm, tags: i3wm}
     - {role: ntp, tags: ntp}
     - {role: xrandr, tags: xrandr}
     - {role: arch-fonts, tags: fonts}
diff --git a/setup_workstation.yml b/setup_workstation.yml
index 0d81507..825dbdd 100644
--- a/setup_workstation.yml
+++ b/setup_workstation.yml
@@ -28,7 +28,7 @@
     - {role: bat, tags: bat, when: ansible_os_family == 'Debian'}
     - {role: install-firefox, tags: firefox}
     - {role: copy_files}
-    - {role: i3wm, tags: i3wm}
+    - {role: do1jlr.i3wm, tags: i3wm}
     - {role: ntp, tags: ntp}
     - {role: xrandr, tags: xrandr}
     - {role: arch-fonts, tags: fonts}
diff --git a/site.yml b/site.yml
index 9c755c4..6cc0d3f 100644
--- a/site.yml
+++ b/site.yml
@@ -23,7 +23,7 @@
     - {role: pulseaudio, tags: pulseaudio}
     - {role: networkmanager, tags: [nm, networkmanager]}
     - {role: copy_files}
-    - {role: i3wm, tags: i3wm}
+    - {role: do1jlr.i3wm, tags: i3wm}
     - {role: xrandr, tags: xrandr}
     - {role: install-firefox, tags: firefox}
     - {role: nextcloud, tags: nextcloud}