diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1310cbbd959be708e694a3c9f25d0a2782aa910..b00688cb97eb60a558e0b4d220c09984b1ae4e34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ services:
 
 variables:
     CI_REGISTRY_IMAGE: "registry-gitlab.pasteur.fr/aperrin/pipeline_annotation"
+    DOCKER_HOST: tcp://localhost:2375
 
 before_script:
   - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" registry-gitlab.pasteur.fr
@@ -12,59 +13,77 @@ before_script:
 build-test-image:
   only:
     - docker
-  stage: build
+  stage: compile
+  image: $CI_DSI_REGISTRY_IMAGE:centos7-maven
   script:
     - apk update ; apk add git
     - git checkout master -- requirements.txt
     - docker build --pull -t "$CI_REGISTRY_IMAGE/testing-ubuntu" for_tests
     - docker push "$CI_REGISTRY_IMAGE/testing-ubuntu"
+  tags:
+    - k8s
 
 build-install-barrnap:
   only:
     - docker
-  stage: build
+  stage: compile
+  image: $CI_DSI_REGISTRY_IMAGE:centos7-maven
   script:
     - apk update ; apk add git
     - git checkout master -- requirements.txt
     - docker build --pull -t "$CI_REGISTRY_IMAGE/install-ubuntu-barrnaponly" for_build/barrnap_only
     - docker push "$CI_REGISTRY_IMAGE/install-ubuntu-barrnaponly"
+  tags:
+    - k8s
 
 build-install-annote-and-quicktree:
   only:
     - docker
-  stage: build
+  stage: compile
+  image: $CI_DSI_REGISTRY_IMAGE:centos7-maven
   script:
     - apk update ; apk add git
     - git checkout master -- requirements.txt
     - docker build --pull -t "$CI_REGISTRY_IMAGE/install-ubuntu-annote-quicktree" for_build/annote_and_1tree
     - docker push "$CI_REGISTRY_IMAGE/install-ubuntu-annote-quicktree"
+  tags:
+    - k8s
 
 build-ubuntu:
   only:
     - docker
-  stage: build
+  stage: complete
+  image: $CI_DSI_REGISTRY_IMAGE:centos7-maven
   script:
     - apk update ; apk add git
     - git checkout master -- requirements.txt
     - docker build --pull -t "$CI_REGISTRY_IMAGE/install-ubuntu" for_build/ubuntu
     - docker push "$CI_REGISTRY_IMAGE/install-ubuntu"
+  tags:
+    - k8s
 
 build-mafft:
   only:
     - docker
-  stage: build
+  stage: complete
+  image: $CI_DSI_REGISTRY_IMAGE:centos7-maven
   script:
     - apk update ; apk add git
     - git checkout master -- requirements.txt
     - docker build --pull -t "$CI_REGISTRY_IMAGE/install-mafft" for_build/mafft
     - docker push "$CI_REGISTRY_IMAGE/install-mafft"
+  tags:
+    - k8s
 
 build-mmseqs_and_fastme:
   only:
     - docker
-  stage: build
+  stage: complete
+  image: $CI_DSI_REGISTRY_IMAGE:centos7-maven
   script:
     - apk update ; apk add git
     - git checkout master -- requirements.txt
     - docker build --pull -t "$CI_REGISTRY_IMAGE/install-mmseqs-fastme" for_build/mmseqs_and_fastme
     - docker push "$CI_REGISTRY_IMAGE/install-mmseqs-fastme"
+  tags:
+    - k8s