diff --git a/config/devices.properties b/config/devices.properties
index c276f9c..1f8a76e 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,7 +1,7 @@
 diode=ch.psi.pshell.epics.ChannelDouble X10SA-ES-KBOX_K:READOUT Read 6
 $shutter=ch.psi.pshell.epics.ChannelInteger X10SA-ES-PH1:SET
-omega=ch.psi.pshell.epics.Motor X10SA-ES-DF1:OMEGA-VAL
-x=ch.psi.pshell.epics.Motor X10SA-ES-DF1:GMX
+omega=ch.psi.pshell.epics.Positionable X10SA-ES-DF1:OMEGA-VAL X10SA-ES-DF1:OMEGA-RBV
+x=ch.psi.pshell.epics.Positionable X10SA-ES-DF1:GMX-VAL X10SA-ES-DF1:GMX-RBV
 cy=ch.psi.pshell.epics.Motor X10SA-ES-DFS:TRY1
 cz=ch.psi.pshell.epics.Motor X10SA-ES-DFS:TRZ1
 apertureX=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRX1