diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f310c0..4394d0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+## Changed
+
+- Updated the subsystem IDs to avoid value clashes with regular device handle mode IDs.
+
 # [v2.11.0] 2023-02-06
 
 ## Fixed
diff --git a/eive_tmtc/tmtc/acs/subsystem.py b/eive_tmtc/tmtc/acs/subsystem.py
index 15d4c6d..f42d701 100644
--- a/eive_tmtc/tmtc/acs/subsystem.py
+++ b/eive_tmtc/tmtc/acs/subsystem.py
@@ -29,13 +29,13 @@ class OpCode(str, enum.Enum):
 
 class AcsMode(enum.IntEnum):
     OFF = 0
-    SAFE = 2
-    DETUMBLE = 3
-    IDLE = 4
-    PTG_TARGET_NADIR = 5
-    PTG_TARGET = 6
-    PTG_TARGET_GS = 7
-    PTG_TARGET_INERTIAL = 8
+    SAFE = 10
+    DETUMBLE = 11
+    IDLE = 12
+    PTG_TARGET_NADIR = 13
+    PTG_TARGET = 14
+    PTG_TARGET_GS = 15
+    PTG_TARGET_INERTIAL = 16
 
 
 class Info(str, enum.Enum):
diff --git a/eive_tmtc/tmtc/com/subsystem.py b/eive_tmtc/tmtc/com/subsystem.py
index f602532..a458bee 100644
--- a/eive_tmtc/tmtc/com/subsystem.py
+++ b/eive_tmtc/tmtc/com/subsystem.py
@@ -22,11 +22,11 @@ class ParameterId(enum.IntEnum):
 
 
 class Submode(enum.IntEnum):
-    RX_ONLY = 0
-    RX_AND_TX_DEF_DATARATE = 1
-    RX_AND_TX_LOW_DATARATE = 2
-    RX_AND_TX_HIGH_DATARATE = 3
-    RX_AND_TX_CARRIER_WAVE = 4
+    RX_ONLY = 10
+    RX_AND_TX_DEF_DATARATE = 11
+    RX_AND_TX_LOW_DATARATE = 12
+    RX_AND_TX_HIGH_DATARATE = 13
+    RX_AND_TX_CARRIER_WAVE = 14
 
 
 class OpCode:
diff --git a/eive_tmtc/tmtc/payload/subsystem.py b/eive_tmtc/tmtc/payload/subsystem.py
index 3b71f0f..695a762 100644
--- a/eive_tmtc/tmtc/payload/subsystem.py
+++ b/eive_tmtc/tmtc/payload/subsystem.py
@@ -12,6 +12,15 @@ from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservice
 
 
+class ModeId:
+    OFF = 0
+    SUPV_ONLY = 10
+    MPSOC_STREAM = 11
+    CAM_STREAM = 12
+    EARTH_OBSV = 13
+    SCEX = 14
+
+
 class OpCode(str, enum.Enum):
     OFF = "off"
     REPORT_ALL_MODES = "report_modes"