diff --git a/csaxs_bec/device_configs/bl_endstation.yaml b/csaxs_bec/device_configs/bl_endstation.yaml
index 066c86d..f038221 100644
--- a/csaxs_bec/device_configs/bl_endstation.yaml
+++ b/csaxs_bec/device_configs/bl_endstation.yaml
@@ -72,7 +72,7 @@ xbpm3x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -95,7 +95,7 @@ xbpm3y:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -118,7 +118,7 @@ sl3trxi:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -141,7 +141,7 @@ sl3trxo:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -164,7 +164,7 @@ sl3trxb:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -187,7 +187,7 @@ sl3trxt:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -210,7 +210,7 @@ fast_shutter_n1_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -234,7 +234,7 @@ fast_shutter_o1_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -257,7 +257,7 @@ fast_shutter_o2_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -280,7 +280,7 @@ filter_array_1_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -303,7 +303,7 @@ filter_array_2_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -326,7 +326,7 @@ filter_array_3_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -349,7 +349,7 @@ filter_array_4_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -372,7 +372,7 @@ sl4trxi:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -395,7 +395,7 @@ sl4trxo:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -418,7 +418,7 @@ sl4trxb:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -441,7 +441,7 @@ sl4trxt:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -466,7 +466,7 @@ sl5trxi:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -489,7 +489,7 @@ sl5trxo:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -512,7 +512,7 @@ sl5trxb:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -535,7 +535,7 @@ sl5trxt:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -558,7 +558,7 @@ xbimtrx:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -581,7 +581,7 @@ xbimtry:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -603,7 +603,7 @@ aptrx:
     prefix: X12SA-ES1-PIN1:TRX1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -615,7 +615,7 @@ aptry:
     prefix: X12SA-ES1-PIN1:TRY1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -627,7 +627,7 @@ ebtrx:
     prefix: X12SA-ES1-EB:TRX1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -639,7 +639,7 @@ ebtry:
     prefix: X12SA-ES1-EB:TRY1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -651,7 +651,7 @@ ebtrz:
     prefix: X12SA-ES1-EB:TRZ1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -663,7 +663,7 @@ ebsupport:
     prefix: X12SA-EH1-EB:TRY1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -675,7 +675,7 @@ fttrx1:
     prefix: X12SA-ES1-FTS1:TRX1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -687,7 +687,7 @@ fttry1:
     prefix: X12SA-ES1-FTS1:TRY1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -699,7 +699,7 @@ fttrx2:
     prefix: X12SA-ES1-FTS2:TRX1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -711,7 +711,7 @@ fttry2:
     prefix: X12SA-ES1-FTS2:TRY1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -723,7 +723,7 @@ fttrz:
     prefix: X12SA-ES1-FTS1:TRZ1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -735,7 +735,7 @@ bs1x:
     prefix: X12SA-ES1-BS1:TRX1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -747,7 +747,7 @@ bs1y:
     prefix: X12SA-ES1-BS1:TRY1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -759,7 +759,7 @@ bs2x:
     prefix: X12SA-ES1-BS2:TRX1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -771,7 +771,7 @@ bs2y:
     prefix: X12SA-ES1-BS2:TRY1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -783,7 +783,7 @@ dttrx:
     prefix: X12SA-ES1-DETT:TRX1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -795,7 +795,7 @@ dttry:
     prefix: X12SA-ES1-DETT:TRY1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -807,7 +807,7 @@ dttrz:
     prefix: X12SA-ES1-DETT:TRZ1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
@@ -819,7 +819,7 @@ dettrx:
     prefix: X12SA-ES1-DET1:TRX1
   deviceTags:
     - cSAXS_ES
-  onFailure: buffer
+  onFailure: retry
   enabled: true
   readoutPriority: baseline
   softwareTrigger: false
\ No newline at end of file
diff --git a/csaxs_bec/device_configs/ptycho_flomni.yaml b/csaxs_bec/device_configs/ptycho_flomni.yaml
index 060a93a..b905ad7 100644
--- a/csaxs_bec/device_configs/ptycho_flomni.yaml
+++ b/csaxs_bec/device_configs/ptycho_flomni.yaml
@@ -395,7 +395,7 @@ rtz:
   readoutPriority: on_request
   connectionTimeout: 20
 
-rt_flyer:
+omny_positions:
   deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniFlyer
   deviceConfig:
     host: mpc2844.psi.ch
@@ -522,6 +522,18 @@ omny_panda:
       FMC_IN.VAL2.Min: cap_voltage_fzp_x_min
       FMC_IN.VAL2.Max: cap_voltage_fzp_x_max
       FMC_IN.VAL2.Mean: cap_voltage_fzp_x_mean
+      INENC1_VAL_Max: interf_st_fzp_y_max
+      INENC1_VAL_Mean: interf_st_fzp_y_mean
+      INENC1_VAL_Min: interf_st_fzp_y_min
+      INENC2_VAL_Max: interf_st_fzp_x_max
+      INENC2_VAL_Mean: interf_st_fzp_x_mean
+      INENC2_VAL_Min: interf_st_fzp_x_min
+      INENC3_VAL_Max: interf_st_rotz_max
+      INENC3_VAL_Mean: interf_st_rotz_mean
+      INENC3_VAL_Min: interf_st_rotz_min
+      INENC4_VAL_Max: interf_st_rotx_max
+      INENC4_VAL_Mean: interf_st_rotx_mean
+      INENC4_VAL_Min: interf_st_rotx_min
   deviceTags:
     - detector
   enabled: true