diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62b446d7..01c4e65b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ will consitute of a breaking change warranting a new major release:
 
 # [v6.2.0] 2023-07-26
 
-- `eive-tmtc`: v5.3.0
+- `eive-tmtc`: v5.3.1
 
 ## Changed
 
diff --git a/mission/acs/defs.h b/mission/acs/defs.h
index c02b692c..677ce37a 100644
--- a/mission/acs/defs.h
+++ b/mission/acs/defs.h
@@ -26,12 +26,18 @@ enum SafeModeStrategy : uint8_t {
   SAFECTRL_OFF = 0,
   SAFECTRL_NO_MAG_FIELD_FOR_CONTROL = 1,
   SAFECTRL_NO_SENSORS_FOR_CONTROL = 2,
-  SAFECTRL_MEKF = 10,
-  SAFECTRL_GYR = 11,
-  SAFECTRL_SUSMGM = 12,
-  SAFECTRL_ECLIPSE_DAMPING_GYR = 13,
-  SAFECTRL_ECLIPSE_DAMPING_SUSMGM = 14,
-  SAFECTRL_ECLIPSE_IDELING = 15,
+  // OBSW version <= v6.1.0
+  LEGACY_SAFECTRL_ACTIVE_MEKF = 10,
+  LEGACY_SAFECTRL_WITHOUT_MEKF = 11,
+  LEGACY_SAFECTRL_ECLIPSE_DAMPING = 12,
+  LEGACY_SAFECTRL_ECLIPSE_IDELING = 13,
+  // Added in v6.2.0
+  SAFECTRL_MEKF = 14,
+  SAFECTRL_GYR = 15,
+  SAFECTRL_SUSMGM = 16,
+  SAFECTRL_ECLIPSE_DAMPING_GYR = 17,
+  SAFECTRL_ECLIPSE_DAMPING_SUSMGM = 18,
+  SAFECTRL_ECLIPSE_IDELING = 19,
   SAFECTRL_DETUMBLE_FULL = 20,
   SAFECTRL_DETUMBLE_DETERIORATED = 21,
 };
diff --git a/tmtc b/tmtc
index 39d6ec73..cbcc06ed 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 39d6ec73c2e842530e810e854dc9a4cd1568de66
+Subproject commit cbcc06ede704d36e1558aae922092470fee5ff66