diff --git a/.gitmodules b/.gitmodules
index 7db64f5..7b2dd29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "qois-infrastructure"]
 	path = qois-infrastructure
 	url = git@gitlab.com:qo.is/infrastructure.git
-	branch = master
+	branch = 38-migrate-to-nix-flakes
 [submodule "defaults/threema"]
 	path = defaults/threema
-	url = git@git.threema.ch:fah/nixos-config.git
-	branch = 38-migrate-to-nix-flakes
+	url = git@github.com:fabianhauser/nixos-config-threema.git
+	branch = main
diff --git a/defaults/threema b/defaults/threema
index ed32144..730ebce 160000
--- a/defaults/threema
+++ b/defaults/threema
@@ -1 +1 @@
-Subproject commit ed32144ca2c2ec82fe88fadfebcc98732bc52364
+Subproject commit 730ebce63dea4fb3eed6432b9b5dcd610e5b1de5