diff --git a/CHANGELOG.md b/CHANGELOG.md
index 210e8bc4..b5e570a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ eive-tmtc: v2.16.0
 
 - Usage of floats as iterators and using them to calculate a uint8_t index in `SusConverter`
 - Removed unused variables in the `AcsController`
+- Remove shadowing variables inside ACS assembly classes.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/issues/385
 
 ## Changed
 
diff --git a/mission/system/objects/AcsBoardAssembly.h b/mission/system/objects/AcsBoardAssembly.h
index 1fe3336d..0c25396f 100644
--- a/mission/system/objects/AcsBoardAssembly.h
+++ b/mission/system/objects/AcsBoardAssembly.h
@@ -108,8 +108,6 @@ class AcsBoardAssembly : public DualLaneAssemblyBase {
   static constexpr pcdu::Switches SWITCH_A = pcdu::Switches::PDU1_CH7_ACS_A_SIDE_3V3;
   static constexpr pcdu::Switches SWITCH_B = pcdu::Switches::PDU2_CH7_ACS_BOARD_SIDE_B_3V3;
 
-  bool tryingOtherSide = false;
-  bool dualModeErrorSwitch = true;
   AcsBoardHelper helper;
   GpioIF* gpioIF = nullptr;
 
diff --git a/mission/system/objects/SusAssembly.h b/mission/system/objects/SusAssembly.h
index 673e91f5..e95803df 100644
--- a/mission/system/objects/SusAssembly.h
+++ b/mission/system/objects/SusAssembly.h
@@ -50,8 +50,6 @@ class SusAssembly : public DualLaneAssemblyBase {
 
   SusAssHelper helper;
   PowerSwitchIF* pwrSwitcher = nullptr;
-  bool tryingOtherSide = false;
-  bool dualModeErrorSwitch = true;
   ReturnValue_t initialize() override;
 
   // AssemblyBase overrides