diff --git a/src/dodal/beamlines/i10_shared.py b/src/dodal/beamlines/i10_shared.py
index 6367c135c95..c4885cf3bc3 100644
--- a/src/dodal/beamlines/i10_shared.py
+++ b/src/dodal/beamlines/i10_shared.py
@@ -111,7 +111,7 @@ def idd_phase() -> UndulatorPhaseAxes:
 def idd_jaw_phase() -> UndulatorJawPhase:
     return UndulatorJawPhase(
         prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
-        move_pv="RPQ1",
+        move_pv="JAW",
     )
 
 
@@ -191,7 +191,7 @@ def idu_phase() -> UndulatorPhaseAxes:
 def idu_jaw_phase() -> UndulatorJawPhase:
     return UndulatorJawPhase(
         prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
-        move_pv="RPQ1",
+        move_pv="JAW",
     )
 
 
diff --git a/src/dodal/devices/beamlines/i10/diagnostics.py b/src/dodal/devices/beamlines/i10/diagnostics.py
index 5d6e70ca2b2..41833a3933c 100644
--- a/src/dodal/devices/beamlines/i10/diagnostics.py
+++ b/src/dodal/devices/beamlines/i10/diagnostics.py
@@ -4,7 +4,6 @@
     StrictEnum,
 )
 from ophyd_async.core import StandardReadableFormat as Format
-from ophyd_async.core._device import DeviceConnector
 from ophyd_async.epics.adaravis import (
     AravisDriverIO,
 )
@@ -196,27 +195,33 @@ def __init__(self, prefix, name: str = "") -> None:
 class I10Diagnostic5ADet(Device):
     """Diagnostic 5a detection with drain current and photo diode."""
 
-    def __init__(
-        self, prefix: str, name: str = "", connector: DeviceConnector | None = None
-    ) -> None:
+    def __init__(self, prefix: str, name: str = "") -> None:
+        self.drain_current_amp = FemtoDDPCA(
+            prefix=prefix + "IAMP-06:",
+            suffix="GAIN",
+            gain_table=Femto3xxGainTable,
+            gain_to_current_table=Femto3xxGainToCurrentTable,
+            raise_timetable=Femto3xxRaiseTime,
+        )
+        self.drain_counter = StruckScaler(
+            prefix=prefix + "SCLR-02:SCALER2", suffix=".S17"
+        )
         self.drain_current = CurrentAmpDet(
-            current_amp=FemtoDDPCA(
-                prefix=prefix + "IAMP-06:",
-                suffix="GAIN",
-                gain_table=Femto3xxGainTable,
-                gain_to_current_table=Femto3xxGainToCurrentTable,
-                raise_timetable=Femto3xxRaiseTime,
-            ),
-            counter=StruckScaler(prefix=prefix + "SCLR-02:SCALER2", suffix=".S17"),
+            current_amp=self.drain_current_amp,
+            counter=self.drain_counter,
+        )
+        self.diode_current_amp = FemtoDDPCA(
+            prefix=prefix + "IAMP-05:",
+            suffix="GAIN",
+            gain_table=Femto3xxGainTable,
+            gain_to_current_table=Femto3xxGainToCurrentTable,
+            raise_timetable=Femto3xxRaiseTime,
+        )
+        self.diode_current = StruckScaler(
+            prefix=prefix + "SCLR-02:SCALER2", suffix=".S18"
         )
         self.diode = CurrentAmpDet(
-            FemtoDDPCA(
-                prefix=prefix + "IAMP-05:",
-                suffix="GAIN",
-                gain_table=Femto3xxGainTable,
-                gain_to_current_table=Femto3xxGainToCurrentTable,
-                raise_timetable=Femto3xxRaiseTime,
-            ),
-            counter=StruckScaler(prefix=prefix + "SCLR-02:SCALER2", suffix=".S18"),
+            current_amp=self.diode_current_amp,
+            counter=self.diode_current,
         )
-        super().__init__(name, connector)
+        super().__init__(name=name)