diff --git a/csaxs_bec/device_configs/ddg_test.yaml b/csaxs_bec/device_configs/endstation.yaml
similarity index 70%
rename from csaxs_bec/device_configs/ddg_test.yaml
rename to csaxs_bec/device_configs/endstation.yaml
index a08fdbd..56a3d10 100644
--- a/csaxs_bec/device_configs/ddg_test.yaml
+++ b/csaxs_bec/device_configs/endstation.yaml
@@ -20,26 +20,6 @@ ddg2:
   readoutPriority: baseline
   softwareTrigger: false
 
-samx:
-  readoutPriority: baseline
-  deviceClass: ophyd_devices.SimPositioner
-  deviceConfig:
-    delay: 1
-    limits:
-      - -50
-      - 50
-    tolerance: 0.01
-    update_frequency: 400
-  enabled: true
-  readOnly: false
-
-bpm4i:
-  readoutPriority: monitored
-  deviceClass: ophyd_devices.SimMonitor
-  deviceConfig:
-  enabled: true
-  readOnly: false
-
 mcs:
   description: Mcs scalar card for transmission readout
   deviceClass: csaxs_bec.devices.epics.mcs_card.mcs_card_csaxs.MCSCardCSAXS
diff --git a/csaxs_bec/device_configs/first_light.yaml b/csaxs_bec/device_configs/first_light.yaml
index 9c5a283..e882957 100644
--- a/csaxs_bec/device_configs/first_light.yaml
+++ b/csaxs_bec/device_configs/first_light.yaml
@@ -2,4 +2,7 @@ optics:
   - !include ./optics_hutch.yaml
 
 frontend:
-  - !include ./frontend.yaml
\ No newline at end of file
+  - !include ./frontend.yaml
+
+endstation:
+  - !include ./endstation.yaml
\ No newline at end of file