diff --git a/.gitmodules b/.gitmodules
index 0aaa6a6..efbd3e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,8 +8,8 @@
 	path = fsfw_hal
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw_hal.git
 [submodule "generators/modgen"]
-	path = generators/modgen
-	url = https://git.ksat-stuttgart.de/source/modgen.git
+	path = generators/fsfw_generators
+	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw_generators.git
 [submodule "fsfw"]
 	path = fsfw
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
diff --git a/generators/fsfw_generators b/generators/fsfw_generators
new file mode 160000
index 0000000..fa507cc
--- /dev/null
+++ b/generators/fsfw_generators
@@ -0,0 +1 @@
+Subproject commit fa507cc4f7b947cd9e4de30e9be6167ff1c15ec7
diff --git a/generators/modgen b/generators/modgen
deleted file mode 160000
index 59535b1..0000000
--- a/generators/modgen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 59535b129ab30df80ef34984873bb381db3abc64