diff --git a/curl/.gitlab-ci.yml b/curl/.gitlab-ci.yml
index b70fd7ee2..56a707abb 100644
--- a/curl/.gitlab-ci.yml
+++ b/curl/.gitlab-ci.yml
@@ -15,6 +15,7 @@ Build curl:
 
 Test curl:
   needs:
+    - Lint curl
     - Build curl
   stage: "Test"
   image: "${CI_REGISTRY_IMAGE}/curl:${CI_COMMIT_SHA}"
@@ -25,6 +26,8 @@ Test curl:
 Publish curl to Github Registry:
   extends: .base_publish_to_github_stage
   needs:
+    - Lint curl
     - Build curl
+    - Test curl
   variables:
     IMAGE_NAME: socialgouv/docker/curl
diff --git a/curl/Dockerfile b/curl/Dockerfile
index e179ef063..cd0ff30a6 100644
--- a/curl/Dockerfile
+++ b/curl/Dockerfile
@@ -1,3 +1,3 @@
 FROM alpine:3.10
 
-RUN apk --no-cache --update add curl=7.66.0-r0
+RUN apk --no-cache --update add curl=~7
diff --git a/git-deploy/.gitlab-ci.yml b/git-deploy/.gitlab-ci.yml
index 4b3369cfc..448d2ed20 100644
--- a/git-deploy/.gitlab-ci.yml
+++ b/git-deploy/.gitlab-ci.yml
@@ -16,6 +16,7 @@ Build git-deploy:
 Test git-deploy:
   stage: "Test"
   needs:
+    - Lint git-deploy
     - Build git-deploy
   image: "${CI_REGISTRY_IMAGE}/git-deploy:${CI_COMMIT_SHA}"
   script:
@@ -31,6 +32,8 @@ Test git-deploy:
 Publish git-deploy to Github Registry:
   extends: .base_publish_to_github_stage
   needs:
+    - Lint git-deploy
+    - Test git-deploy
     - Build git-deploy
   variables:
     IMAGE_NAME: socialgouv/docker/git-deploy
diff --git a/git-deploy/Dockerfile b/git-deploy/Dockerfile
index 8eb3aa010..eac01a658 100644
--- a/git-deploy/Dockerfile
+++ b/git-deploy/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.8.0b1-alpine3.10
 
 ## Install envsubst and curl
 RUN apk update
-RUN apk add --no-cache gettext-dev=0.19.8.1-r4 curl=7.66.0-r0
+RUN apk add --no-cache gettext-dev=~0 curl=~7
 
 ## Copy git deployment scripts
 COPY ./bin /bin
diff --git a/git-tag-release/Dockerfile b/git-tag-release/Dockerfile
index ce18a62b9..0343ca88d 100644
--- a/git-tag-release/Dockerfile
+++ b/git-tag-release/Dockerfile
@@ -2,5 +2,5 @@ FROM alpine:3.10
 
 ## Install git & openssh-client
 RUN apk update
-RUN apk add --no-cache git=2.22.0-r0 openssh-client=8.1_p1-r0
+RUN apk add --no-cache git=~2 openssh-client=~8
 
diff --git a/helm/.gitlab-ci.yml b/helm/.gitlab-ci.yml
index a4178f1d8..fe01a1d03 100644
--- a/helm/.gitlab-ci.yml
+++ b/helm/.gitlab-ci.yml
@@ -16,6 +16,7 @@ Build helm:
 Test helm:
   stage: "Test"
   needs:
+    - Lint helm
     - Build helm
   image: "${CI_REGISTRY_IMAGE}/helm:${CI_COMMIT_SHA}"
   environment: feature-dev
@@ -28,6 +29,8 @@ Test helm:
 Publish helm to Github Registry:
   extends: .base_publish_to_github_stage
   needs:
+    - Lint helm
+    - Test helm
     - Build helm
   variables:
     IMAGE_NAME: socialgouv/docker/helm
diff --git a/helm/Dockerfile b/helm/Dockerfile
index 968c932eb..8a8240c1f 100644
--- a/helm/Dockerfile
+++ b/helm/Dockerfile
@@ -4,12 +4,12 @@ FROM alpine/helm:2.14.3
 
 ## Install envsubst & coreutils
 RUN apk add --update --no-cache \
-  bash=5.0.11-r1 \
-  coreutils=8.31-r0 \
-  curl=7.67.0-r0 \
-  gettext-dev=0.20.1-r1 \
-  git=2.24.0-r0 \
-  sudo=1.8.29-r0
+  bash=~5 \
+  coreutil~s \
+  curl=~7 \
+  gettext-dev=~0 \
+  git=~2 \
+  sudo=~1
 
 ENV HOME=/config
 
diff --git a/infra-ansible-ci/.gitlab-ci.yml b/infra-ansible-ci/.gitlab-ci.yml
index 8ff2b75c0..cf162875b 100644
--- a/infra-ansible-ci/.gitlab-ci.yml
+++ b/infra-ansible-ci/.gitlab-ci.yml
@@ -6,6 +6,8 @@ Lint infra-ansible-ci:
 
 Build infra-ansible-ci:
   stage: "Build"
+  needs:
+    - Lint infra-ansible-ci
   extends: .base_register_to_gitlab_stage
   variables:
     CONTEXT: infra-ansible-ci
@@ -14,6 +16,7 @@ Build infra-ansible-ci:
 Test infra-ansible-ci:
   stage: "Test"
   needs:
+    - Lint infra-ansible-ci
     - Build infra-ansible-ci
   image: "${CI_REGISTRY_IMAGE}/infra-ansible-ci:${CI_COMMIT_SHA}"
   environment: feature-dev
@@ -25,6 +28,8 @@ Test infra-ansible-ci:
 Publish infra-ansible-ci to Github Registry:
   extends: .base_publish_to_github_stage
   needs:
+    - Lint infra-ansible-ci
     - Build infra-ansible-ci
+    - Test infra-ansible-ci
   variables:
     IMAGE_NAME: socialgouv/docker/infra-ansible-ci
diff --git a/infra-ansible-ci/Dockerfile b/infra-ansible-ci/Dockerfile
index 8d9b2bca8..d1af6d683 100644
--- a/infra-ansible-ci/Dockerfile
+++ b/infra-ansible-ci/Dockerfile
@@ -2,10 +2,16 @@ FROM python:2.7
 
 # install dependencies (gettext-base to install envsubst)
 RUN apt-get update \
-    && apt-get -y install gettext-base=0.19.8.1-9 jq=1.5+dfsg-2+b1 curl=7.64.0-4 apt-transport-https=1.8.2 \
-      lsb-release=10.2019051400 gnupg=2.2.12-1+deb10u1 --no-install-recommends \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+  && apt-get -y install \
+    --no-install-recommends \
+    apt-transport-https=~1 \
+    curl=~7 \
+    gettext-base=~0 \
+    gnupg=~2 \
+    jq=~1 \
+    lsb-release=~10 \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 # install terraform
 RUN curl https://releases.hashicorp.com/terraform/0.11.14/terraform_0.11.14_linux_386.zip -o terraform.zip \
diff --git a/k8s-ns-killer/.gitlab-ci.yml b/k8s-ns-killer/.gitlab-ci.yml
index dd02326c7..f62e1a75b 100644
--- a/k8s-ns-killer/.gitlab-ci.yml
+++ b/k8s-ns-killer/.gitlab-ci.yml
@@ -16,6 +16,7 @@ Build k8s-ns-killer:
 Test k8s-ns-killer:
   stage: "Test"
   needs:
+    - Lint k8s-ns-killer
     - Build k8s-ns-killer
   # NOTE(douglasduteil): allow 2 retries (3 runs)
   # The script my actually attend to remove namespaces on parallel runs
@@ -46,6 +47,8 @@ Test k8s-ns-killer:
 Publish k8s-ns-killer to Github Registry:
   extends: .base_publish_to_github_stage
   needs:
+    - Lint k8s-ns-killer
     - Build k8s-ns-killer
+    - Test k8s-ns-killer
   variables:
     IMAGE_NAME: socialgouv/docker/k8s-ns-killer
diff --git a/k8s-ns-killer/Dockerfile b/k8s-ns-killer/Dockerfile
index 11d30c572..0ccc0bd38 100644
--- a/k8s-ns-killer/Dockerfile
+++ b/k8s-ns-killer/Dockerfile
@@ -2,7 +2,10 @@ FROM registry.gitlab.factory.social.gouv.fr/socialgouv/docker/helm:0.13.0
 
 USER root
 
-RUN apk add --update --no-cache git=2.24.0-r0 less=551-r0 openssh=8.1_p1-r0
+RUN apk add --update --no-cache \
+  git=~2 \
+  less=~551 \
+  openssh=~8
 
 USER kubectl
 
diff --git a/kubectl/.gitlab-ci.yml b/kubectl/.gitlab-ci.yml
index aef19fc55..d9c669d91 100644
--- a/kubectl/.gitlab-ci.yml
+++ b/kubectl/.gitlab-ci.yml
@@ -7,6 +7,8 @@ Lint kubectl:
 
 Build kubectl:
   stage: "Build"
+  needs:
+    - Lint kubectl
   extends: .base_register_to_gitlab_stage
   variables:
     CONTEXT: kubectl
@@ -15,6 +17,7 @@ Build kubectl:
 Test kubectl 1 2:
   stage: "Test"
   needs:
+    - Lint kubectl
     - Build kubectl
   image: "${CI_REGISTRY_IMAGE}/kubectl:${CI_COMMIT_SHA}"
   environment: feature-dev
@@ -25,6 +28,7 @@ Test kubectl 1 2:
 Test kubectl 2 2:
   stage: "Test"
   needs:
+    - Lint kubectl
     - Build kubectl
   image: docker:18
   services:
@@ -49,6 +53,7 @@ Test kubectl 2 2:
 Publish kubectl to Github Registry:
   extends: .base_publish_to_github_stage
   needs:
+    - Lint kubectl
     - Build kubectl
   variables:
     IMAGE_NAME: socialgouv/docker/kubectl
diff --git a/kubectl/Dockerfile b/kubectl/Dockerfile
index 181fcedc3..6e5a768af 100644
--- a/kubectl/Dockerfile
+++ b/kubectl/Dockerfile
@@ -2,12 +2,12 @@ FROM alpine:3.10
 
 ## Install envsubst & coreutils
 RUN apk add --update --no-cache \
-  bash=5.0.0-r0 \
-  coreutils=8.31-r0 \
-  curl=7.66.0-r0 \
-  gettext-dev=0.19.8.1-r4  \
-  sudo=1.8.27-r0 \
-  ca-certificates=20190108-r0
+  bash=~5 \
+  coreutils=~8 \
+  curl=~7 \
+  gettext-dev=~0 \
+  sudo=~1 \
+  ca-certificates=~20190108
 
 
 ENV K8S_LATEST_VERSION="v1.16.2"
diff --git a/nginx4spa/.gitlab-ci.yml b/nginx4spa/.gitlab-ci.yml
index 1d240a447..38580b0b1 100644
--- a/nginx4spa/.gitlab-ci.yml
+++ b/nginx4spa/.gitlab-ci.yml
@@ -16,6 +16,7 @@ Build nginx4spa:
 Test nginx4spa:
   stage: "Test"
   needs:
+    - Lint nginx4spa
     - Build nginx4spa
   image: docker:18
   services:
@@ -45,6 +46,8 @@ Test nginx4spa:
 Publish nginx4spa to Github Registry:
   extends: .base_publish_to_github_stage
   needs:
+    - Lint nginx4spa
     - Build nginx4spa
+    - Test nginx4spa
   variables:
     IMAGE_NAME: socialgouv/docker/nginx4spa