diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 690954bfba4c89915f26005f17a9e46a952f6573..b1cc154519e7644b398832c3ca19ccd9b7f27c7a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ default:
       alias: docker
 
 stages:
+  - buildenv
   - quality
   - test
   - build
@@ -88,7 +89,11 @@ build:
     - master
 
 build_stack:
-  stage: build
+  stage: buildenv
+  variables:
+    DOCKER_TLS_CERTDIR: ''
+    DOCKER_HOST: tcp://docker:2375/
+    DOCKER_DRIVER: overlay2
   before_script:
     - docker login ${CI_DEPENDENCY_PROXY_SERVER} -u ${CI_DEPENDENCY_PROXY_USER} -p ${CI_DEPENDENCY_PROXY_PASSWORD}
   script:
@@ -97,6 +102,7 @@ build_stack:
     - docker push $CI_REGISTRY_IMAGE/cozy-env:latest
   only:
     - master
+    - dev
   when: manual
 
 publish: