diff --git a/src/aare/common/config/x06da.yaml b/src/aare/common/config/x06da.yaml
index 8e65983a..c888e637 100644
--- a/src/aare/common/config/x06da.yaml
+++ b/src/aare/common/config/x06da.yaml
@@ -2,8 +2,8 @@ beamline_id: "X06DA"
 
 gui:
   cameras:
-    sample_camera_zmq_url: "tcp://x06da-pserv-01:9089"
-    prediction_zmq_url: "tcp://mx-ml:9091"
+    sample_camera_zmq_url: "tcp://sls-gpu-003:9093"
+    prediction_zmq_url: "tcp://sls-gpu-003:9093"
     beamline_camera_url: "x06da-axis-1.psi.ch"
     gonio_camera_url: "axis-accc8ed2972e.psi.ch"
     gonio_camera_id: "3"
@@ -18,7 +18,7 @@ shared:
 daq:
   hardware:
     smargon_url: "http://x06da-smargopolo.psi.ch:3000"
-    aerotech_url: "http://x06da-smargopolo.psi.ch:5234"  # Adjust if needed
+    aerotech_url: "http://mx-x06da-queue-01.psi.ch:5234"  # Adjust if needed
     tell_url: "http://x06da-tell.psi.ch:22222"
     bec_url: "x06da-bec-001.psi.ch"
     redis_url: "x06da-redis.psi.ch"
diff --git a/src/aare/common/config/x10sa.yaml b/src/aare/common/config/x10sa.yaml
index 54e115f9..5cef9156 100644
--- a/src/aare/common/config/x10sa.yaml
+++ b/src/aare/common/config/x10sa.yaml
@@ -2,8 +2,8 @@ beamline_id: "X10SA"
 
 gui:
   cameras:
-    sample_camera_zmq_url: "tcp://x10sa-spark-01:9091" #"http://sls-gpu-003:9089"
-    prediction_zmq_url: "tcp://x10sa-spark-01:9091" #"http://sls-gpu-003:9089"
+    sample_camera_zmq_url: "tcp://sls-gpu-003:9089" #"tcp://x10sa-spark-01:9091" #
+    prediction_zmq_url: "tcp://sls-gpu-003:9089" #"tcp://x10sa-spark-01:9091" #
     beamline_camera_url: "axis-accc8eb02488.psi.ch"
     gonio_camera_url: "axis-accc8ea5e463.psi.ch"
     gonio_camera_id: "1"