diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index d2ab42161f8673ad117553147e6f65b32c802652..5aa884ac9f2a5a94635c7d58179b5248e4f62a84 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:latest
 RUN apt-get update && \
-	apt-get install tox curl python3-pip -y
+	apt-get install docker.io tox curl python3-pip -y
 RUN pip3 install docker-compose
 COPY wait-for-it.sh /wait-for-it.sh
 CMD /bin/bash
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aca54ba92cddf977aeb14f6c44b8adb067f02108..3aba89532196d6a509369c518ef2ffdc06a95be3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ variables:
    # When using dind, it's wise to use the overlayfs driver for
    # improved performance.
    DOCKER_DRIVER: overlay2
-   CAOSDB_TAG: latest
+   : latest
 
 services:
   - docker:dind
@@ -58,6 +58,9 @@ test:
   #  entrypoint: ["/bin/sh", "-c"]
   image: $CI_REGISTRY_IMAGE:latest
   script:
+      - if [[ "$CAOSDB_TAG" == "" ]]; then
+            CAOSDB_TAG=latest
+        fi
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
       - cd .docker
       - docker-compose  up -d