diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae115d476553771a81624690bd75a9706b719e0e..870fbe38435b74cb693c322da43b63fbe44c69ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,32 +23,6 @@
 #
 #
 
-variables:
-   # When using dind service we need to instruct docker, to talk with the
-   # daemon started inside of the service. The daemon is available with
-   # a network connection instead of the default /var/run/docker.sock socket.
-   #
-   # The 'docker' hostname is the alias of the service container as described at
-   # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services
-   #
-   # Note that if you're using the Kubernetes executor, the variable should be set to
-   # tcp://localhost:2375/ because of how the Kubernetes executor connects services
-   # to the job container
-   # DOCKER_HOST: tcp://localhost:2375/
-   #
-   # For non-Kubernetes executors, we use tcp://docker:2375/
-   DOCKER_HOST: tcp://docker:2375/
-   # When using dind, it's wise to use the overlayfs driver for
-   # improved performance.
-   DOCKER_DRIVER: overlay2
-   # Set versions here if you want to have non standard commits/branches
-   #MYSQLBACKEND: master
-   #SERVER: f574fd3b7
-   #WEBUI: 22c60d75d5
-   #PYLIB: f-feature
-services:
-   - docker:dind
-
 stages:
     - deploy
     - test
@@ -60,9 +34,10 @@ code_style:
 
 deploy-to-swarm:
   stage: deploy
+  tags: thin_dind
+  image: docker:latest
   variables:
     SERVICE_NAME: caosdb_stack
-  image: docker:latest
   script:
     - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker ps