diff --git a/csaxs_bec/device_configs/bl_optics_hutch.yaml b/csaxs_bec/device_configs/bl_optics_hutch.yaml
index e4916ee..189fb05 100644
--- a/csaxs_bec/device_configs/bl_optics_hutch.yaml
+++ b/csaxs_bec/device_configs/bl_optics_hutch.yaml
@@ -555,6 +555,76 @@ kbvbendd:
     - cSAXS
     - optics  
 
+kbvtrx:
+  description: "KB Vertical Focusing Mirror, translation X"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-VFM:TRX"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics
+
+kbvtry:
+  description: "KB Vertical Focusing Mirror, translation Y"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-VFM:TRY"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics
+
+kbvyaw:
+  description: "KB Vertical Focusing Mirror, yaw"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-VFM:YAW"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics
+
+kbvroll:
+  description: "KB Vertical Focusing Mirror, roll"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-VFM:ROLL"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics
+
+kbvpitch:
+  description: "KB Vertical Focusing Mirror, pitch"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-VFM:PITCH"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics
+
 kbhbendu:
   description: "KB Horizontal Focusing Mirror, bender upstream"
   deviceClass: ophyd_devices.EpicsMotorEC
@@ -583,5 +653,72 @@ kbhbendd:
     - cSAXS
     - optics  
 
+kbhtrx:
+  description: "KB Horizontal Focusing Mirror, translation X"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-HFM:TRX"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics
 
+kbhtry:
+  description: "KB Horizontal Focusing Mirror, translation Y"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-HFM:TRY"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics
 
+kbhyaw:
+  description: "KB Horizontal Focusing Mirror, yaw"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-HFM:YAW"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics
+
+kbhroll:
+  description: "KB Horizontal Focusing Mirror, roll"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-HFM:ROLL"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics
+
+kbhpitch:
+  description: "KB Horizontal Focusing Mirror, pitch"
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig:
+    prefix: "X12SA-OP-HFM:PITCH"
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - cSAXS
+    - optics