diff --git a/.gitmodules b/.gitmodules
index f14aa1380c64e8c39fdcde586a9c02ae96c6d0eb..ccc1200fc219463f90212b8e828116d02fbeccfc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "gluon"]
 	path = gluon
-	url = https://github.com/freifunk-stuttgart/gluon.git
+	url = https://gitlab.freifunk-stuttgart.de/firmware/gluon.git
diff --git a/modules b/modules
index 0986f0477728118705e794130a6dbe19053778de..c7bc3552a958addbe30dfdb8a621c82ce302053f 100644
--- a/modules
+++ b/modules
@@ -1,8 +1,8 @@
 GLUON_SITE_FEEDS='ffs ssidchanger'
 
-PACKAGES_FFS_REPO=https://github.com/freifunk-stuttgart/Gluon-Packages
+PACKAGES_FFS_REPO=https://gitlab.freifunk-stuttgart.de/firmware/gluon-packages.git
 PACKAGES_FFS_COMMIT=27195d8d56108a499a238a2ec696c9102b67d5b2
 
-PACKAGES_SSIDCHANGER_REPO=https://github.com/freifunk-nord/gluon-ssid-changer.git
+PACKAGES_SSIDCHANGER_REPO=https://gitlab.freifunk-stuttgart.de/firmware/gluon-ssid-changer.git
 PACKAGES_SSIDCHANGER_COMMIT=3c6750ce8fc9cedabfa8a6f479fb12d343c6ecc2
 PACKAGES_SSIDCHANGER_BRANCH=2018.1.x