diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a68710f0a4419499f04606de025347fc2e03604d..b01297c30127300ca9f8bfa16b2c44c9c09d6ddd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   PIP_REQUIREMENTS_FILE: "tangostationcontrol/requirements.txt"
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
 cache:
   key: $CI_COMMIT_REF_SLUG
   paths:
@@ -61,7 +63,6 @@ wheel_packaging:
   services:
     - name: docker:dind
   variables:
-    DOCKER_TLS_CERTDIR: "/certs"
     TANGO_SKIP_BUILD: "true"
   before_script:
     - |
@@ -278,8 +279,6 @@ unit_test:
   services:
     - name: docker:dind
   variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
     JUMPPAD_HOME: $CI_PROJECT_DIR
   before_script:
     - |
diff --git a/.prepare.gitlab-ci.yml b/.prepare.gitlab-ci.yml
index 6e6f1685872ed810e5104bea6db2656d601ab08c..8f50a26095d8a0cb4572fe2e3b045d02e4e2c889 100644
--- a/.prepare.gitlab-ci.yml
+++ b/.prepare.gitlab-ci.yml
@@ -6,6 +6,9 @@ build_ci_runner_image:
   image: docker:stable
   services:
     - docker:dind
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: ""
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - |
diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh
index 621d69b2f3165172f36e7e23f713771dd08a426e..27527ed4fbdbc4c91a548d259396b2c164e42a7d 100755
--- a/sbin/run_integration_test.sh
+++ b/sbin/run_integration_test.sh
@@ -143,7 +143,7 @@ fi
 
 rm -rf "$JUMPPAD_HOME/.jumppad/"
 
-HOME="$JUMPPAD_HOME" jumppad up --var="host_volume=$tmp_volume" infra/dev/main.hcl || true
+HOME="$JUMPPAD_HOME" jumppad up --var="host_volume=$tmp_volume" infra/dev/main.hcl
 
 echo -n "Waiting for tango service to become available .."
 until [[ $(dig @127.0.0.1 -p 8600 tango.service.consul +short) ]]; do
diff --git a/tangostationcontrol/tangostationcontrol/device_server/__init__.py b/tangostationcontrol/tangostationcontrol/device_server/__init__.py
index 04330a21153edff105ad1f804fc13835e4011e26..9aa9b96ef7877617923dc5da23bf71ba065e441b 100644
--- a/tangostationcontrol/tangostationcontrol/device_server/__init__.py
+++ b/tangostationcontrol/tangostationcontrol/device_server/__init__.py
@@ -64,7 +64,7 @@ def main(**kwargs):
     configure_logger()
 
     if device_class_str == "ObservationControl":
-        classes = (device_class, devices.Observation)
+        classes = (device_class, devices.ObservationField)
     else:
         classes = (device_class,)