diff --git a/src/dodal/devices/beamlines/b21/vici_valves.py b/src/dodal/devices/beamlines/b21/vici_valves.py
index 64c387f6cf..75f33734c8 100644
--- a/src/dodal/devices/beamlines/b21/vici_valves.py
+++ b/src/dodal/devices/beamlines/b21/vici_valves.py
@@ -3,21 +3,21 @@
 
 
 class Valve1Positions(StrictEnum):
-    POS_1 = "Pos 1"
-    POS_2 = "Pos 2"
-    POS_3 = "Pos 3"
-    POS_4 = "Pos 4"
-    POS_5 = "Pos 5"
-    POS_6 = "Pos 6"
+    SEP_300 = "Sep300"
+    KW_402_5 = "KW402.5"
+    S_200 = "S200"
+    SUP_6 = "Sup6"
+    GUEST_1 = "Guest1"
+    BYPASS_1 = "Bypass1"
 
 
 class Valve2Positions(StrictEnum):
-    POS_1 = "Pos 1"
-    POS_2 = "Pos 2"
-    POS_3 = "Pos 3"
-    POS_4 = "Pos 4"
-    POS_5 = "Pos 5"
-    POS_6 = "Pos 6"
+    KW_403 = "KW403"
+    KW_402_5 = "KW402.5"
+    S_200 = "S200"
+    SEP_500 = "Sep500"
+    GUEST_2 = "Guest2"
+    BYPASS_2 = "Bypass2"
 
 
 class ViciValves(StandardReadable):
diff --git a/tests/devices/beamlines/b21/test_vici_valves.py b/tests/devices/beamlines/b21/test_vici_valves.py
index b08612190c..21e761f3e1 100644
--- a/tests/devices/beamlines/b21/test_vici_valves.py
+++ b/tests/devices/beamlines/b21/test_vici_valves.py
@@ -19,13 +19,13 @@ async def vici_valves() -> ViciValves:
 async def test_vici_valves_read(
     vici_valves: ViciValves,
 ):
-    set_mock_value(vici_valves.valve_1, Valve1Positions.POS_1)
-    set_mock_value(vici_valves.valve_2, Valve2Positions.POS_2)
+    set_mock_value(vici_valves.valve_1, Valve1Positions.SEP_300)
+    set_mock_value(vici_valves.valve_2, Valve2Positions.KW_402_5)
 
     await assert_reading(
         vici_valves,
         {
-            f"{vici_valves.name}-valve_1": partial_reading(Valve1Positions.POS_1),
-            f"{vici_valves.name}-valve_2": partial_reading(Valve2Positions.POS_2),
+            f"{vici_valves.name}-valve_1": partial_reading(Valve1Positions.SEP_300),
+            f"{vici_valves.name}-valve_2": partial_reading(Valve2Positions.KW_402_5),
         },
     )