diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e577c85..e4770ddb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,28 +26,7 @@ pytest:
     - pip install pytest
     - pip install -e ./scan_server
     - cd scan_server/tests;pytest -v
-# build device server:
-#   stage: Build
-#   image: docker:20.10.16
-#   script:
-#     - apk update; apk upgrade; apk add git
-#     - git clone https://oauth2:$CI_OPHYD_DEVICES_KEY@git.psi.ch/bec_testbench/ophyd_devices.git
-#     - docker build -t $REGISTRY_HOST/device_server:test -f ./device_server/Dockerfile .
-#     - docker image push $REGISTRY_HOST/device_server:test
-# build scan server:
-#   stage: Build
-#   image: docker:20.10.16
-#   script:
-#     - docker build -t $REGISTRY_HOST/scan_server:test -f ./scan_server/Dockerfile .
-#     - docker image push $REGISTRY_HOST/scan_server:test
-# build scan bundler:
-#   stage: Build
-#   image: docker:18.09
-#   artifacts:
-#     paths:
-#       - scan_bundler.tar
-#   script:
-#     - docker build -t scan_bundler:test -f ./scan_bundler/Dockerfile .
+
 integration test setup:
   stage: Integration-Test-Setup
   image: docker:20.10.16
@@ -61,6 +40,8 @@ integration test setup:
     - docker run --network=host --name init_scibec init_scibec:test
     - docker build -t scan_bundler:test -f ./scan_bundler/Dockerfile .
     - docker build -t scan_server:test -f ./scan_server/Dockerfile .
+    - docker build -t device_server:test -f ./device_server/Dockerfile .
+    - docker run --network=host -d --name device_server device_server:test 
     - docker run --network=host -d --name scan_server scan_server:test  
     - docker run --network=host -d --name scan_bundler scan_bundler:test 
     - timeout 120 /bin/sh -c -- 'while true; do res=$(curl -X "GET" --max-time 3 "http://docker:3030/sessions"); if [ ! -z "$res" ]; then exit 0; fi; sleep 1; done;'