diff --git a/.gitmodules b/.gitmodules
index 2259dd6..1b9e1a1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,18 @@
 [submodule "packages/archiso/zfs-archiso-linux"]
 	path = packages/archiso/zfs-archiso-linux
-	url = ssh+git://aur@aur.archlinux.org/zfs-archiso-linux.git
+	url = git@github.com:archzfs/zfs-archiso-linux.git
 [submodule "packages/linux-hardened/zfs-linux-hardened"]
 	path = packages/linux-hardened/zfs-linux-hardened
-	url = ssh+git://aur@aur.archlinux.org/zfs-linux-hardened.git
+	url = git@github.com:archzfs/zfs-linux-hardened.git
 [submodule "packages/linux/zfs-linux-git"]
 	path = packages/linux/zfs-linux-git
 	url = git@github.com:archzfs/zfs-linux-git.git
 [submodule "packages/linux/zfs-linux"]
 	path = packages/linux/zfs-linux
-	url = ssh+git://aur@aur.archlinux.org/zfs-linux.git
+	url = git@github.com:archzfs/zfs-linux.git
 [submodule "packages/linux-lts/zfs-linux-lts"]
 	path = packages/linux-lts/zfs-linux-lts
-	url = ssh+git://aur@aur.archlinux.org/zfs-linux-lts.git
+	url = git@github.com:archzfs/zfs-linux-lts.git
 [submodule "packages/linux-lts/zfs-linux-lts-git"]
 	path = packages/linux-lts/zfs-linux-lts-git
 	url = git@github.com:archzfs/zfs-linux-lts-git.git
@@ -24,7 +24,7 @@
 	url = git@github.com:archzfs/zfs-linux-zen-git.git
 [submodule "packages/linux-zen/zfs-linux-zen"]
 	path = packages/linux-zen/zfs-linux-zen
-	url = ssh+git://aur@aur.archlinux.org/zfs-linux-zen.git
+	url = git@github.com:archzfs/zfs-linux-zen.git
 [submodule "packages/linux-vfio/zfs-linux-vfio"]
 	path = packages/linux-vfio/zfs-linux-vfio
 	url = ssh://aur@aur.archlinux.org/zfs-linux-vfio.git
@@ -45,13 +45,13 @@
 	url = git@github.com:archzfs/zfs-dkms-git.git
 [submodule "packages/_utils/zfs-utils-rc"]
 	path = packages/_utils/zfs-utils-rc
-	url = ssh+git://aur@aur.archlinux.org/zfs-utils-rc.git
+	url = git@github.com:archzfs/zfs-utils-rc.git
 [submodule "packages/dkms/zfs-dkms-rc"]
 	path = packages/dkms/zfs-dkms-rc
-	url = ssh+git://aur@aur.archlinux.org/zfs-dkms-rc.git
+	url = git@github.com:archzfs/zfs-dkms-rc.git
 [submodule "packages/linux/zfs-linux-rc"]
 	path = packages/linux/zfs-linux-rc
-	url = ssh://aur@aur.archlinux.org/zfs-linux-rc.git
+	url = git@github.com:archzfs/zfs-linux-rc.git
 [submodule "packages/linux-lts/zfs-linux-lts-rc"]
 	path = packages/linux-lts/zfs-linux-lts-rc
-	url = ssh://aur@aur.archlinux.org/zfs-linux-lts-rc.git
+	url = git@github.com:archzfs/zfs-linux-lts-rc.git
diff --git a/packages/_utils/zfs-utils-rc b/packages/_utils/zfs-utils-rc
index 2775f1b..c131925 160000
--- a/packages/_utils/zfs-utils-rc
+++ b/packages/_utils/zfs-utils-rc
@@ -1 +1 @@
-Subproject commit 2775f1b1be3324065801809cd5d693d37cb02aba
+Subproject commit c13192582a80c642e1dc14b1a31fd45a311fde66
diff --git a/packages/archiso/zfs-archiso-linux b/packages/archiso/zfs-archiso-linux
index 0ec39a5..00d235d 160000
--- a/packages/archiso/zfs-archiso-linux
+++ b/packages/archiso/zfs-archiso-linux
@@ -1 +1 @@
-Subproject commit 0ec39a5674b6c7cf5ec1d4d9f652869c0bae0b73
+Subproject commit 00d235df7174fa55fdf61d023d7f3277404e0eeb
diff --git a/packages/dkms/zfs-dkms-rc b/packages/dkms/zfs-dkms-rc
index fe89d6c..95a6d7c 160000
--- a/packages/dkms/zfs-dkms-rc
+++ b/packages/dkms/zfs-dkms-rc
@@ -1 +1 @@
-Subproject commit fe89d6cc4adc123ab36abae41dbc7a535eb850d3
+Subproject commit 95a6d7cdc83fcb5d7c3554bd5e43de6204fc9ce6
diff --git a/packages/linux-hardened/zfs-linux-hardened b/packages/linux-hardened/zfs-linux-hardened
index 6df0cc2..d970fc5 160000
--- a/packages/linux-hardened/zfs-linux-hardened
+++ b/packages/linux-hardened/zfs-linux-hardened
@@ -1 +1 @@
-Subproject commit 6df0cc2fc114c923fe23855bc7eacd507f26cc14
+Subproject commit d970fc5d0fbfa075418bff00e98bb133c5c27437
diff --git a/packages/linux-lts/zfs-linux-lts b/packages/linux-lts/zfs-linux-lts
index e65ba77..a2cce3f 160000
--- a/packages/linux-lts/zfs-linux-lts
+++ b/packages/linux-lts/zfs-linux-lts
@@ -1 +1 @@
-Subproject commit e65ba77db85e9d259efa6c3428c304123c0329bf
+Subproject commit a2cce3f52a096d124b28d24370636a73728271bf
diff --git a/packages/linux-lts/zfs-linux-lts-git b/packages/linux-lts/zfs-linux-lts-git
index 0b72a70..83f17d3 160000
--- a/packages/linux-lts/zfs-linux-lts-git
+++ b/packages/linux-lts/zfs-linux-lts-git
@@ -1 +1 @@
-Subproject commit 0b72a7088d88d22f3890f32800c84dbc69d6fbb0
+Subproject commit 83f17d3e427d4e1a92602eea151af7dfa62753e0
diff --git a/packages/linux-lts/zfs-linux-lts-rc b/packages/linux-lts/zfs-linux-lts-rc
index 486a878..d9c6fea 160000
--- a/packages/linux-lts/zfs-linux-lts-rc
+++ b/packages/linux-lts/zfs-linux-lts-rc
@@ -1 +1 @@
-Subproject commit 486a8789588f55c028c4bbd48871cd30c5f37cbb
+Subproject commit d9c6fea3d2ce28a843bb636ee904a9da392c1622
diff --git a/packages/linux-zen/zfs-linux-zen b/packages/linux-zen/zfs-linux-zen
index 0def2c7..d780732 160000
--- a/packages/linux-zen/zfs-linux-zen
+++ b/packages/linux-zen/zfs-linux-zen
@@ -1 +1 @@
-Subproject commit 0def2c763b101354448c6c9739a0b9cf53db8c1c
+Subproject commit d780732e12f578e2cf8a917ba22621a0c6110442
diff --git a/packages/linux/zfs-linux b/packages/linux/zfs-linux
index 39fecc2..9445eec 160000
--- a/packages/linux/zfs-linux
+++ b/packages/linux/zfs-linux
@@ -1 +1 @@
-Subproject commit 39fecc2a218b4d71ed4db4518d129b1939a22c8c
+Subproject commit 9445eec301fa7f92fb1f13f8f7ecbe5ea3668d7e
diff --git a/packages/linux/zfs-linux-rc b/packages/linux/zfs-linux-rc
index 36ee17d..165ef46 160000
--- a/packages/linux/zfs-linux-rc
+++ b/packages/linux/zfs-linux-rc
@@ -1 +1 @@
-Subproject commit 36ee17dd1bb9032e078b1c548858ce642676c7f7
+Subproject commit 165ef46dec20efd71591ac4e4900812041099aaa