diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04fb5fe0..e6c6bbd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,9 @@ will consitute of a breaking change warranting a new major release:
 ## Fixed
 
 - Fixed wrong order in quaternion multiplication for computation of the error quaternion.
+- Re-worked some FDIR logic in the FSFW. The former logic prevented events with a severity
+  higher than INFO if the device was in EXTERNAL CONTROL. The new logic will allow to trigger
+  events but still inhibit FDIR reactions if the device is in EXTERNAL CONTROL.
 
 # [v7.7.4] 2024-03-21
 
diff --git a/fsfw b/fsfw
index a229748a..8b21dd27 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit a229748aa4c1ff8e2b9f7e268259b857fb8f9051
+Subproject commit 8b21dd276de72b46b41bc7080d6646180bfa0662
diff --git a/tmtc b/tmtc
index 5a0edbef..96636d59 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 5a0edbefa8449f4796d7d0976822c8fda139c598
+Subproject commit 96636d59e9b0e3f35947f2d0e73d2a8ab1a58c5c