diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 238b867e986b9b6443d2341e0f1e15b97e1d8538..7e1ba026bb9681ac0c2db794b22ef9c89931c091 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ variables:
    DOCKER_DRIVER: overlay2
 
 services:
-  - docker:dind
+  - docker:18.09.7-dind
 
 stages: 
   - setup
@@ -66,7 +66,7 @@ stages:
   - test
 
 test:
-  tags: [docker]
+  tags: [notls]
   stage: test
   image: 
     name: docker/compose:1.24.1
@@ -87,8 +87,8 @@ test:
       - exit $rc
 
 build-testenv:
-  tags: [docker]
-  image: docker:latest
+  tags: [notls]
+  image: docker:18.09
   stage: setup
   script: 
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -102,7 +102,7 @@ build-testenv:
       - docker push $CI_REGISTRY_IMAGE:latest
 
 style:
-  tags: [docker]
+  tags: [notls]
   stage: style
   image: $CI_REGISTRY_IMAGE:latest
   script: