Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r6a5bc5eee873a4317b720a8e5bf85cdce22eb85a -ra5b82c620e6a54f2b8559c54ffaa1a84e831d88e
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 6a5bc5eee873a4317b720a8e5bf85cdce22eb85a)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision a5b82c620e6a54f2b8559c54ffaa1a84e831d88e)
@@ -359,11 +359,11 @@
     D79_PMP_VALV                        = 24    # D79 pump mapped to spare valve 0
     D83_VALV                            = 25    # Valve De-scaler (D83)
     D91_VALV                            = 26    # Valve De-scaler (D91)
-    SPARE1_VALV                         = 27    # Spare Valve 1
-    SPARE2_VALV                         = 28    # Spare Valve 2
-    SPARE3_VALV                         = 29    # Spare Valve 3
+    SPARE3_VALV                         = 27    # Spare Valve 3
+    SPARE4_VALV                         = 28    # Spare Valve 4
+    SPARE5_VALV                         = 29    # Spare Valve 5
     D100_VALV                           = 30    # Valve De-scaler (D100)
-    SPARE4_VALV                         = 31    # Spare Valve 4
+    SPARE7_VALV                         = 31    # Spare Valve 7
     NUM_OF_DD_VALVES                    = 32    # Number of Valves for the DD
 
 @unique
Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r6a5bc5eee873a4317b720a8e5bf85cdce22eb85a -ra5b82c620e6a54f2b8559c54ffaa1a84e831d88e
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 6a5bc5eee873a4317b720a8e5bf85cdce22eb85a)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision a5b82c620e6a54f2b8559c54ffaa1a84e831d88e)
@@ -79,11 +79,6 @@
         self.d3_valv = {"id": DDValveNames.D3_VALV.value, "state": DEENERGIZED}
         self.d80_valv = {"id": DDValveNames.D80_VALV.value, "state": DEENERGIZED}
         self.d81_valv = {"id": DDValveNames.D81_VALV.value, "state": DEENERGIZED}
-        self.d83_valv = {"id": DDValveNames.D83_VALV.value, "state": DEENERGIZED}
-        self.d88_valv = {"id": DDValveNames.D88_VALV.value, "state": DEENERGIZED}
-        self.d91_valv = {"id": DDValveNames.D91_VALV.value, "state": DEENERGIZED}
-        self.d95_valv = {"id": DDValveNames.D95_VALV.value, "state": DEENERGIZED}
-        self.d100_valv = {"id": DDValveNames.D100_VALV.value, "state": DEENERGIZED}
         self.rsvrd1 = {"id": DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED}
 
         self.d23_valv = {"id": DDValveNames.D23_VALV.value, "state": DEENERGIZED}
@@ -96,10 +91,13 @@
         self.d22_valv = {"id": DDValveNames.D22_VALV.value, "state": DEENERGIZED}
 
         self.d79_pmp_valv = {"id": DDValveNames.D79_PMP_VALV.value, "state": DEENERGIZED}
-        self.spare1_valv = {"id": DDValveNames.SPARE1_VALV.value, "state": DEENERGIZED}
-        self.spare2_valv = {"id": DDValveNames.SPARE2_VALV.value, "state": DEENERGIZED}
+        self.d83_valv = {"id": DDValveNames.D83_VALV.value, "state": DEENERGIZED}
+        self.d91_valv = {"id": DDValveNames.D91_VALV.value, "state": DEENERGIZED}
         self.spare3_valv = {"id": DDValveNames.SPARE3_VALV.value, "state": DEENERGIZED}
         self.spare4_valv = {"id": DDValveNames.SPARE4_VALV.value, "state": DEENERGIZED}
+        self.spare5_valv = {"id": DDValveNames.SPARE5_VALV.value, "state": DEENERGIZED}
+        self.d100_valv = {"id": DDValveNames.D100_VALV.value, "state": DEENERGIZED}
+        self.spare7_valv = {"id": DDValveNames.SPARE7_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
         # class because each valve must have a unique ID.
@@ -144,11 +142,11 @@
             self.d79_pmp_valv.get("state", None),
             self.d83_valv.get("state", None),
             self.d91_valv.get("state", None),
-            self.spare1_valv.get("state", None),
-            self.spare2_valv.get("state", None),
             self.spare3_valv.get("state", None),
+            self.spare4_valv.get("state", None),
+            self.spare5_valv.get("state", None),
             self.d100_valv.get("state", None),
-            self.spare4_valv.get("state", None)
+            self.spare7_valv.get("state", None)
         ]
 
     @staticmethod
@@ -210,11 +208,11 @@
         "d79_pmp_valv",
         "D83_valv",
         "D91_valv",
-        "spare1_valv",
-        "spare2_valv",
         "spare3_valv",
-        "D100_valv",
         "spare4_valv",
+        "spare5_valv",
+        "D100_valv",
+        "spare7_valv",
         "valve_states_enum",
         "valves_sensed_states",
         "dd_valves_states_timestamp"
@@ -263,11 +261,11 @@
         self.d79_pmp_valv["state"] = self._binary_to_valve_state(spv[0] & 1)
         self.d83_valv["state"] = self._binary_to_valve_state(spv[0] & 2)
         self.d91_valv["state"] = self._binary_to_valve_state(spv[0] & 4)
-        self.spare1_valv["state"] = self._binary_to_valve_state(spv[0] & 8)
-        self.spare2_valv["state"] = self._binary_to_valve_state(spv[0] & 16)
-        self.spare3_valv["state"] = self._binary_to_valve_state(spv[0] & 32)
+        self.spare3_valv["state"] = self._binary_to_valve_state(spv[0] & 8)
+        self.spare4_valv["state"] = self._binary_to_valve_state(spv[0] & 16)
+        self.spare5_valv["state"] = self._binary_to_valve_state(spv[0] & 32)
         self.d100_valv["state"] = self._binary_to_valve_state(spv[0] & 64)
-        self.spare4_valv["state"] = self._binary_to_valve_state(spv[0] & 128)
+        self.spare7_valv["state"] = self._binary_to_valve_state(spv[0] & 128)
 
         start = self.END_POS_SPARE_VALVES_STATES
         end = start + 1