diff --git a/CHANGELOG.md b/CHANGELOG.md
index 913d378e..2128a01d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,11 +14,6 @@ list yields a list of all related PRs for each release.
 
 ## Added
 
-- Adds `HealthIF` to heaters. Heaters are own system object with queues now which allows to set them faulty.
-- SW will attempt to shut down heaters which are on but marked faulty
-  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/236
-- Some simplifications for `HeaterHandler`, use `std::vector` instead of `std::unordered_map` for primary container. Using the heater indexes 0 to 7 allows to use natural array indexing
-- Some additional input sanity checks in `executeAction`
 - `RwAssembly` added to system components. Assembly works in principle,
   issues making 4 consecutives RWs communicate at once..
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/224
@@ -32,6 +27,14 @@ list yields a list of all related PRs for each release.
   username appended at the end is created as a side-product now
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/248
 
+### Heater
+
+- Adds `HealthIF` to heaters. Heaters are own system object with queues now which allows to set them faulty.
+- SW will attempt to shut down heaters which are on but marked faulty
+- Some simplifications for `HeaterHandler`, use `std::vector` instead of `std::unordered_map` for primary container. Using the heater indexes 0 to 7 allows to use natural array indexing
+- Some additional input sanity checks in `executeAction`
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/236
+
 ## Changed
 
 - Build unittest as default side product of hosted builds
diff --git a/fsfw b/fsfw
index 02473a0c..ab45aa12 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 02473a0cd7a71e2eac0479959ef576fd4b81e981
+Subproject commit ab45aa1296a8b3fae0b6a99b9d8b822b7be1ae3c
diff --git a/tmtc b/tmtc
index 743670f6..bf641818 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 743670f6563d5713c883545186ef1c7a47784d1a
+Subproject commit bf64181826de2682ec7298c2b86f500d079c26be