diff --git a/CHANGELOG.md b/CHANGELOG.md
index 868d01fe..738ec6a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,10 @@ will consitute of a breaking change warranting a new major release:
   the previous addresses were invalid and not properly covered by the Linux memory protection.
   The OBSW will use the old addresses for older FW versions.
 
+## Added
+
+- Always add PLOC MPSoC and PLOC SUPV components for the EM as well.
+
 # [v7.2.0] 2023-10-27
 
 - `eive-tmtc` v5.10.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78be7ec5..a6b5f6e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,13 +126,13 @@ set(OBSW_ADD_HEATERS
     1
     CACHE STRING "Add TCS heaters")
 set(OBSW_ADD_PLOC_SUPERVISOR
-    ${INIT_VAL}
+    1
     CACHE STRING "Add PLOC supervisor handler")
 set(OBSW_ADD_SA_DEPL
     ${INIT_VAL}
     CACHE STRING "Add SA deployment handler")
 set(OBSW_ADD_PLOC_MPSOC
-    ${INIT_VAL}
+    1
     CACHE STRING "Add MPSoC handler")
 set(OBSW_ADD_ACS_CTRL
     ${INIT_VAL}