Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r98579cec744881b6fc6d368c0fb1b43932393447
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 144020fa422bc5d0db1bd62647c29022a887206e)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 98579cec744881b6fc6d368c0fb1b43932393447)
@@ -316,10 +316,10 @@
     D23_VALV                            = 16    # Balancing chamber Valve 1 (D23)
     D19_VALV                            = 17    # Balancing chamber Valve 2 (D19)
     D25_VALV                            = 18    # Balancing chamber Valve 3 (D25)
-    D26_VALV                            = 19    # Balancing chamber Valve 7 (D26)
+    D21_VALV                            = 19    # Balancing chamber Valve 7 (D26)
     D24_VALV                            = 20    # Balancing chamber Valve 5 (D24)
     D20_VALV                            = 21    # Balancing chamber Valve 6 (D20)
-    D21_VALV                            = 22    # Balancing chamber Valve 4 (D21)
+    D26_VALV                            = 22    # Balancing chamber Valve 4 (D21)
     D22_VALV                            = 23    # Balancing chamber Valve 8 (D22)
     NUM_OF_DD_VALVES                    = 24    # Number of Valves for the DD
 
Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -r98579cec744881b6fc6d368c0fb1b43932393447
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 00412d78bda4176d5c45a3778cb90ad907928965)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 98579cec744881b6fc6d368c0fb1b43932393447)
@@ -83,10 +83,10 @@
         self.d23_valv = {"id": DDValveNames.D23_VALV.value, "state": DEENERGIZED}
         self.d19_valv = {"id": DDValveNames.D19_VALV.value, "state": DEENERGIZED}
         self.d25_valv = {"id": DDValveNames.D25_VALV.value, "state": DEENERGIZED}
-        self.d26_valv = {"id": DDValveNames.D26_VALV.value, "state": DEENERGIZED}
+        self.d21_valv = {"id": DDValveNames.D26_VALV.value, "state": DEENERGIZED}
         self.d24_valv = {"id": DDValveNames.D24_VALV.value, "state": DEENERGIZED}
         self.d20_valv = {"id": DDValveNames.D20_VALV.value, "state": DEENERGIZED}
-        self.d21_valv = {"id": DDValveNames.D21_VALV.value, "state": DEENERGIZED}
+        self.d26_valv = {"id": DDValveNames.D21_VALV.value, "state": DEENERGIZED}
         self.d22_valv = {"id": DDValveNames.D22_VALV.value, "state": DEENERGIZED}
 
         # NOTE: The len function counts the enums with the same number only once. This is not the case in the DD valves
@@ -123,10 +123,10 @@
             self.d23_valv.get("state", None),
             self.d19_valv.get("state", None),
             self.d25_valv.get("state", None),
-            self.d26_valv.get("state", None),
+            self.d21_valv.get("state", None),
             self.d24_valv.get("state", None),
             self.d20_valv.get("state", None),
-            self.d21_valv.get("state", None),
+            self.d26_valv.get("state", None),
             self.d22_valv.get("state", None)
         ]
 
@@ -181,10 +181,10 @@
         "d23_valv",
         "d19_valv",
         "d25_valv",
-        "d26_valv",
+        "d21_valv",
         "d24_valv",
         "d20_valv",
-        "d21_valv",
+        "d26_valv",
         "d22_valv",
         "valve_states_enum",
         "dd_valves_states_timestamp"
@@ -223,10 +223,10 @@
         self.d23_valv["state"] = self._binary_to_valve_state(bcv[0] & 1)
         self.d19_valv["state"] = self._binary_to_valve_state(bcv[0] & 2)
         self.d25_valv["state"] = self._binary_to_valve_state(bcv[0] & 4)
-        self.d26_valv["state"] = self._binary_to_valve_state(bcv[0] & 8)
+        self.d21_valv["state"] = self._binary_to_valve_state(bcv[0] & 8)
         self.d24_valv["state"] = self._binary_to_valve_state(bcv[0] & 16)
         self.d20_valv["state"] = self._binary_to_valve_state(bcv[0] & 32)
-        self.d21_valv["state"] = self._binary_to_valve_state(bcv[0] & 64)
+        self.d26_valv["state"] = self._binary_to_valve_state(bcv[0] & 64)
         self.d22_valv["state"] = self._binary_to_valve_state(bcv[0] & 128)
 
         start = self.END_POS_BCV_VALVES_STATES