diff --git a/csaxs_bec/device_configs/user_setup.yaml b/csaxs_bec/device_configs/user_setup.yaml
index bff8be9..6129d05 100644
--- a/csaxs_bec/device_configs/user_setup.yaml
+++ b/csaxs_bec/device_configs/user_setup.yaml
@@ -15,7 +15,7 @@ eyex:
     user_offset_dir: 0
   deviceTags:
   - cSAXS
-  - owis_samx
+  - owis_eyex
   onFailure: buffer
   enabled: true
   readoutPriority: baseline
@@ -33,7 +33,7 @@ eyey:
     user_offset_dir: 0
   deviceTags:
   - cSAXS
-  - owis_samx
+  - owis_eyey
   onFailure: buffer
   enabled: true
   readoutPriority: baseline
@@ -42,11 +42,11 @@ samx:
   description: Owis motor stage samx
   deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
   deviceConfig:
-    prefix: X12SA-ES2-ES18
-    motor_resolution: 0.000125
-    base_velocity: 0.00625
-    velocity: 1
-    backlash_distance: 0.0125
+    prefix: X12SA-ES2-ES03
+    motor_resolution: 0.00125
+    base_velocity: 0.0625
+    velocity: 10
+    backlash_distance: 0.125
     acceleration: 0.2
     user_offset_dir: 0
   deviceTags:
@@ -60,20 +60,56 @@ samy:
   description: Owis motor stage samx
   deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
   deviceConfig:
-    prefix: X12SA-ES2-ES19
-    motor_resolution: 0.000125
-    base_velocity: 0.00625
-    velocity: 1
-    backlash_distance: 0.0125
+    prefix: X12SA-ES2-ES04
+    motor_resolution: 0.00125
+    base_velocity: 0.0625
+    velocity: 10
+    backlash_distance: 0.125
     acceleration: 0.2
     user_offset_dir: 0
   deviceTags:
   - cSAXS
-  - owis_samx
+  - owis_samy
   onFailure: buffer
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
+# samx:
+#   description: Owis motor stage samx
+#   deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+#   deviceConfig:
+#     prefix: X12SA-ES2-ES18
+#     motor_resolution: 0.000125
+#     base_velocity: 0.00625
+#     velocity: 1
+#     backlash_distance: 0.0125
+#     acceleration: 0.2
+#     user_offset_dir: 0
+#   deviceTags:
+#   - cSAXS
+#   - owis_samx
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: baseline
+#   softwareTrigger: false
+# samy:
+#   description: Owis motor stage samx
+#   deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+#   deviceConfig:
+#     prefix: X12SA-ES2-ES19
+#     motor_resolution: 0.000125
+#     base_velocity: 0.00625
+#     velocity: 1
+#     backlash_distance: 0.0125
+#     acceleration: 0.2
+#     user_offset_dir: 0
+#   deviceTags:
+#   - cSAXS
+#   - owis_samx
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: baseline
+#   softwareTrigger: false
 # eye_cam:
 #   description: Camera Microscope
 #   deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera