diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0eb15e7adb4be74c607006035a3dc4bdb656af65..7fda07cf2b227ebd70aa7983a387d716b10b644c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,6 @@
 ---
 include:
-  - 'https://gitlab.esss.lu.se/ics-infrastructure/gitlab-ci-yml/raw/master/PreCommit.gitlab-ci.yml'
-
-.runner_tags: &runner_tags
-  tags:
-    - docker
+  - remote: "https://gitlab.esss.lu.se/ics-infrastructure/gitlab-ci-yml/raw/master/PreCommit.gitlab-ci.yml"
 
 variables:
   CONTAINER_TEST_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
@@ -22,11 +18,14 @@ stages:
   - release
   - deploy
 
+default:
+  tags:
+    - docker
+
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
 build:
-  <<: *runner_tags
   stage: build
   image: docker:latest
   script:
@@ -35,7 +34,6 @@ build:
     - docker push "$CONTAINER_TEST_IMAGE"
 
 test:
-  <<: *runner_tags
   stage: test
   image: "$CONTAINER_TEST_IMAGE"
   services:
@@ -57,7 +55,6 @@ test:
     expire_in: 1 hour
 
 analyse:
-  <<: *runner_tags
   stage: analyse
   image: registry.esss.lu.se/ics-docker/sonar-scanner:3
   before_script: []
@@ -65,7 +62,6 @@ analyse:
     - sonar-scanner -Dsonar.login=$SONARQUBE_TOKEN -Dsonar.projectVersion=$CI_COMMIT_REF_NAME
 
 release-image:
-  <<: *runner_tags
   stage: release
   image: docker:latest
   dependencies: []
@@ -77,7 +73,6 @@ release-image:
     - tags
 
 deploy-staging:
-  <<: *runner_tags
   stage: deploy
   image: registry.esss.lu.se/ics-docker/tower-cli
   before_script: []
@@ -97,7 +92,6 @@ deploy-staging:
     - tags
 
 pages:
-  <<: *runner_tags
   stage: deploy
   image: "$CONTAINER_RELEASE_IMAGE"
   dependencies: []
@@ -115,7 +109,6 @@ pages:
     - tags
 
 deploy-production:
-  <<: *runner_tags
   stage: deploy
   image: registry.esss.lu.se/ics-docker/tower-cli
   before_script: []