diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff992f2049358a2409a327b4f74c108a7213990f..b850b5026c2c78fddc921aa27defd246951c0480 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,27 +44,29 @@ variables:
    DOCKER_DRIVER: overlay2
 
 services:
-   - docker:dind
+  - docker:dind
 
 stages: 
-    - setup
-    - test
+  - setup
+  - test
 
 test:
+  tags: [docker]
   image: docker:latest
   script:
       - docker-compose -f .docker/docker-compose.yml up
 
 build-testenv:
-    image: docker:latest
-    stage: setup
-    script: 
-        - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-          # use here general latest or specific branch latest...
-        - docker pull $CI_REGISTRY_IMAGE:latest || true
-        - docker build 
-          --pull
-          --file .dockerfile
-          --cache-from $CI_REGISTRY_IMAGE:latest 
-          -t $CI_REGISTRY_IMAGE:latest .
-        - docker push $CI_REGISTRY_IMAGE:latest
+  tags: [docker]
+  image: docker:latest
+  stage: setup
+  script: 
+      - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+        # use here general latest or specific branch latest...
+      - docker pull $CI_REGISTRY_IMAGE:latest || true
+      - docker build 
+        --pull
+        --file .dockerfile
+        --cache-from $CI_REGISTRY_IMAGE:latest 
+        -t $CI_REGISTRY_IMAGE:latest .
+      - docker push $CI_REGISTRY_IMAGE:latest