diff --git a/.gitignore b/.gitignore
index 0e17b62..4e2f1da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,9 @@ venv
 
 # Build folders
 /build*
+/cmake-build*
 
+# Makefile artifacts
 _dep
 _obj
 _bin
diff --git a/cmake/scripts/make-debug-cfg.sh b/cmake/scripts/stm32h7-make-debug.sh
similarity index 96%
rename from cmake/scripts/make-debug-cfg.sh
rename to cmake/scripts/stm32h7-make-debug.sh
index 7c7214e..cffb68f 100755
--- a/cmake/scripts/make-debug-cfg.sh
+++ b/cmake/scripts/stm32h7-make-debug.sh
@@ -17,7 +17,7 @@ fi
 
 build_generator=""
 os_fsfw="freertos"
-builddir="build-Debug"
+builddir="cmake-build-debug"
 if [ "${OS}" = "Windows_NT" ]; then
 	build_generator="MinGW Makefiles"
 	python="py"
diff --git a/example_common b/example_common
index 797801f..8203995 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit 797801ffde3defc48e5f3f69df31f36e5d3879c5
+Subproject commit 8203995deb087c0a51ce7ec7fdc0f0f4f21d06ce
diff --git a/fsfw b/fsfw
index 7c2e50b..5764144 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 7c2e50b665f515d6234f3d2f070609f8f37efde2
+Subproject commit 576414438c81b43d18ac0472c4baa8bc545f8d3f
diff --git a/generators/fsfwgen b/generators/fsfwgen
index e6f5ff1..6d423f7 160000
--- a/generators/fsfwgen
+++ b/generators/fsfwgen
@@ -1 +1 @@
-Subproject commit e6f5ff18129984b591a6a286968b1ace42c278b2
+Subproject commit 6d423f7106e49f93743fb69e9436e1e652f9e001
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index 4d71822..890f119 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit 4d71822fa1f1cfc16ccd4d0fb750eb2900a263b2
+Subproject commit 890f1193240dc422ade3c4380b8b05733971001f