diff --git a/.gitmodules b/.gitmodules
index 36de46b..e116873 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,9 +91,9 @@
 [submodule "Mqtt-SWB-Dashboard"]
 	path = Mqtt-SWB-Dashboard
 	url = http://git.blubbfish.net/BlubbFish/Mqtt-SWB-Dashboard.git
-[submodule "mqtt-map"]
-	path = mqtt-map
-	url = http://git.blubbfish.net/Lora/Lora-Map.git
+[submodule "Lora-Map"]
+	path = Lora-Map
+	url = https://gitlab.fit.fraunhofer.de/monica/lora-map/lora-map.git
 [submodule "Mqtt-Dashboard"]
 	path = Mqtt-Dashboard
 	url = http://git.blubbfish.net/BlubbFish/Mqtt-Dashboard.git
@@ -111,10 +111,10 @@
 	url = http://git.blubbfish.net/BlubbFish/MailServer.git
 [submodule "Lora-Bot"]
 	path = Lora-Bot
-	url = http://git.blubbfish.net/Lora/Lora-Bot.git
+	url = https://gitlab.fit.fraunhofer.de/monica/lora-gateway/lora-bot.git
 [submodule "Lora"]
 	path = Lora
-	url = http://git.blubbfish.net/Lora/Lora.git
+	url = https://gitlab.fit.fraunhofer.de/monica/lora-gateway/lora.git
 [submodule "Librarys"]
 	path = Librarys
 	url = http://git.blubbfish.net/BlubbFish/Librarys.git
@@ -183,7 +183,7 @@
 	url = http://git.blubbfish.net/BlubbFish/flighthands.git
 [submodule "MonicaScral"]
 	path = MonicaScral
-	url = http://git.blubbfish.net/Lora/MonicaScral.git
+	url = https://gitlab.fit.fraunhofer.de/monica/scral-uploader/monicascral.git
 [submodule "Snips"]
 	path = Snips
 	url = http://git.blubbfish.net/BlubbFish/Snips.git
diff --git a/Lora-Map b/Lora-Map
new file mode 160000
index 0000000..3a3b361
--- /dev/null
+++ b/Lora-Map
@@ -0,0 +1 @@
+Subproject commit 3a3b3618bd123051fb31050f94066e86f329f192
diff --git a/mqtt-map b/mqtt-map
deleted file mode 160000
index 0bc3f6c..0000000
--- a/mqtt-map
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0bc3f6c1e7ae88607275d6a078199058ab63f3da