diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37797c91639dd6741dc131b8aeb441e74e9e3ace..46eb0eca88db39d50337078cc70edb8ebedf2d5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,26 +7,29 @@ stages:
 
 test:
   stage: test
-  tags: ["docker"]
+  tags:
+    - docker_exec
   script:
     - pip install -e ".[testing]" -i https://iweb1.sips/eggs --trusted-host iweb1.sips
     - py.test -xv
 
 formatting:
-    stage: formatting
-    tags:
-        - docker
-    allow_failure: true
-    only:
-        - branches
-    except:
-        - master
-    script:
-        - pip install black
-        - black --diff --check edosl0util
+  stage: formatting
+  tags:
+    - docker_exec
+  allow_failure: true
+  only:
+      - branches
+  except:
+      - master
+  script:
+      - pip install black
+      - black --diff --check edosl0util
 
 sdist:
   stage: deploy
+  tags:
+    - docker_exec
   only:
     - /^\d+\.\d+\.\d+$/
   script: