diff --git a/pyproject.toml b/pyproject.toml
index 7cbd20ad..e4fa9460 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ dependencies = [
     "aarecommon>=0.5.1",
     "pydantic>=2.11",
     "numpy",
-    "jfjoch_client==1.0.0rc146",
+    "jfjoch_client>=1.0.0rc146",
     "pyJWT",
     "pyzmq",
     "opencv-python-headless",
diff --git a/src/aare/beamline_dispatch/x06da/beamline_dispatch.py b/src/aare/beamline_dispatch/x06da/beamline_dispatch.py
index 8bb334ff..11698ca8 100644
--- a/src/aare/beamline_dispatch/x06da/beamline_dispatch.py
+++ b/src/aare/beamline_dispatch/x06da/beamline_dispatch.py
@@ -51,6 +51,9 @@ class X06daBecMacros(BecMacros):
     @staticmethod
     def auto_exposure(): ...
 
+            # Add to Geo
+            # poni_rot1_rad=-0.001396263,
+            # poni_rot2_rad=-0.003839724,
 
 class X06daDispatch(DefaultDispatch):
     def __init__(self, beamline: MXBeamline) -> None:
diff --git a/src/aare/beamline_dispatch/x10sa/beamline_dispatch.py b/src/aare/beamline_dispatch/x10sa/beamline_dispatch.py
index cc9c1a9f..e60a5e5a 100644
--- a/src/aare/beamline_dispatch/x10sa/beamline_dispatch.py
+++ b/src/aare/beamline_dispatch/x10sa/beamline_dispatch.py
@@ -96,6 +96,9 @@ class X10saGeometry(DefaultGeometry):
     @property
     def beam_centre_model(self) -> BeamCenterModel:
         return self._model
+    @property
+    def deetector_tils(self) -> tuple[float, float]:
+        return 0,0
 
 
 class X10saDispatch(DefaultDispatch):
diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py
index 57dfd103..b23975d8 100644
--- a/src/aare/daq/daq.py
+++ b/src/aare/daq/daq.py
@@ -3154,6 +3154,7 @@ class AareDAQ:
         detector_serial_number = str(metadata.get("detector_serial_number", "unavailable"))
         energy = self._devs.energy_kev
         dtz = self._devs.dtz
+        poni_rot1_rad, poni_rot2_rad = self._dispatch.geo.detector_tilt
         return DiffractionGeometry(
             energy_keV=energy,
             dtz_mm=dtz,
@@ -3162,8 +3163,8 @@ class AareDAQ:
             beam_center_pxl=self._devs.detector_beam_centre_px,
             detector_description=detector_description,
             detector_serial_number=detector_serial_number,
-            poni_rot1_rad=-0.001396263,
-            poni_rot2_rad=-0.003839724,
+            poni_rot1_rad=poni_rot1_rad,
+            poni_rot2_rad=poni_rot2_rad,
         )
 
     @property