diff --git a/.gitmodules b/.gitmodules
index bc47a6ed..f415b122 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "dotfiles/config/taffybar/taffybar"]
 	path = dotfiles/config/taffybar/taffybar
 	url = git@github.com:IvanMalison/taffybar.git
+[submodule "dotfiles/xmonad/xmonad"]
+	path = dotfiles/xmonad/xmonad
+	url = git@github.com:IvanMalison/xmonad.git
+[submodule "dotfiles/xmonad/xmonad-contrib"]
+	path = dotfiles/xmonad/xmonad-contrib
+	url = git@github.com:IvanMalison/xmonad-contrib.git
diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/xmonad/stack.yaml
index d1e8a34f..dd32da64 100644
--- a/dotfiles/xmonad/stack.yaml
+++ b/dotfiles/xmonad/stack.yaml
@@ -2,17 +2,11 @@ flags: {}
 extra-package-dbs: []
 packages:
 - '.'
-- location:
-    git: git@github.com:IvanMalison/xmonad.git
-    commit: 2e6312776bd277c775c32e35f9c763d3858e32a4
+- location: "./xmonad"
   extra-dep: true
-- location:
-    git: git@github.com:IvanMalison/xmonad-contrib.git
-    commit: ad9c8001f6e2af7a87228c5feaf41aa230a639d5
+- location: "./xmonad-contrib"
   extra-dep: true
-- location:
-    git: git@github.com:IvanMalison/taffybar.git
-    commit: 3570bdbd87a5464d7280d8750c5c153cf3dcc637
+- location: "./taffybar"
   extra-dep: true
 extra-deps:
 - X11-xft-0.3.1
diff --git a/dotfiles/xmonad/xmonad b/dotfiles/xmonad/xmonad
new file mode 160000
index 00000000..2e631277
--- /dev/null
+++ b/dotfiles/xmonad/xmonad
@@ -0,0 +1 @@
+Subproject commit 2e6312776bd277c775c32e35f9c763d3858e32a4
diff --git a/dotfiles/xmonad/xmonad-contrib b/dotfiles/xmonad/xmonad-contrib
new file mode 160000
index 00000000..8bfb15b7
--- /dev/null
+++ b/dotfiles/xmonad/xmonad-contrib
@@ -0,0 +1 @@
+Subproject commit 8bfb15b709b8add0062aac6933414fb816526cd9