diff --git a/fsfw b/fsfw
index fec5f83f..16f2fa93 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit fec5f83f4f2459facee25939e0292115f89a6d73
+Subproject commit 16f2fa9327393ba8848817cc5a22497201c41d13
diff --git a/generators/fsfwgen b/generators/fsfwgen
index 5dbe33ce..8829f3fa 160000
--- a/generators/fsfwgen
+++ b/generators/fsfwgen
@@ -1 +1 @@
-Subproject commit 5dbe33ceb85b15f27e6722bb907df3ed324b701b
+Subproject commit 8829f3face7e90dc855e36593c0a79d3678c3e0f