diff --git a/mission/acs/defs.h b/mission/acs/defs.h
index c02b692c..a1118ebc 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_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 15716c98..39d6ec73 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 15716c988b6d26ae7f00e44b919d5ae7505d81ad
+Subproject commit 39d6ec73c2e842530e810e854dc9a4cd1568de66