diff --git a/.gitmodules b/.gitmodules
index 4e83113..0aaa6a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "framework"]
-	path = fsfw
-	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
 [submodule "cmake/rtems-cmake"]
 	path = cmake/rtems-cmake
 	url = https://github.com/rmspacefish/rtems-cmake.git
@@ -13,3 +10,6 @@
 [submodule "generators/modgen"]
 	path = generators/modgen
 	url = https://git.ksat-stuttgart.de/source/modgen.git
+[submodule "fsfw"]
+	path = fsfw
+	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
diff --git a/cmake/rtems-cmake b/cmake/rtems-cmake
new file mode 160000
index 0000000..365c84c
--- /dev/null
+++ b/cmake/rtems-cmake
@@ -0,0 +1 @@
+Subproject commit 365c84c4f2be44cb14cb990c9d04769b1e69fbc2
diff --git a/fsfw b/fsfw
new file mode 160000
index 0000000..2f51152
--- /dev/null
+++ b/fsfw
@@ -0,0 +1 @@
+Subproject commit 2f511523cb71e00b4669db002b171d626a63fddf
diff --git a/fsfw_hal b/fsfw_hal
new file mode 160000
index 0000000..a85c014
--- /dev/null
+++ b/fsfw_hal
@@ -0,0 +1 @@
+Subproject commit a85c01465bc8687773676f05c5e7eb8af54b25ff
diff --git a/generators/modgen b/generators/modgen
new file mode 160000
index 0000000..2dd83db
--- /dev/null
+++ b/generators/modgen
@@ -0,0 +1 @@
+Subproject commit 2dd83dbb458e19beec71877b969f287b03387af1
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
new file mode 160000
index 0000000..0d2450d
--- /dev/null
+++ b/tmtc/tmtccmd
@@ -0,0 +1 @@
+Subproject commit 0d2450dfd2f34fdd5eb0b0ff55d1fbc0684f852d