diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a4ca39929275cdc6d6624fcfdca9b56502c571e..4ef6f7f43d6ef023e19dadd3355c43ab62b0daf1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,3 @@
-image: docker:git
-
-services:
-  - docker:dind
-
 stages:
   - test
   - sonar-analysis
@@ -10,7 +5,7 @@ stages:
   - deploy
 
 build:
-  image: docker:18.09
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
   services:
     - docker:18.09-dind
   only:
@@ -41,7 +36,7 @@ deploy_dev:
 
 test:
   stage: test
-  image: node:14.15.4
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:14.15.4
   before_script:
     - export GHOST_HOST_AND_PORT=http://localhost:2368
     - export GHOST_ADMIN_API_KEY=60142bc9e33940000156bccc:6217742e2671e322612e89cac9bab61fcd01822709fe5d8f5e6a5b3e54d5e6bb
@@ -60,32 +55,32 @@ test:
     - dev
     - merge_requests
 
-code_analysis:
-  image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
-  services:
-    - docker:18.09-dind
-  stage: sonar-analysis
-  only:
-    - dev
-    - merge_requests
-  before_script:
-    - export NODE_PATH=$NODE_PATH:`npm root -g`
-    - npm install -g typescript
-  script:
-    - >
-      sonar-scanner
-      -Dsonar.projectName=${SONAR_PROJECT_KEY}
-      -Dsonar.projectVersion=1.0
-      -Dsonar.sourceEncoding=UTF-8
-      -Dsonar.projectBaseDir=.
-      -Dsonar.host.url=${SONAR_URL}
-      -Dsonar.projectKey=${SONAR_PROJECT_KEY}
-      -Dsonar.exclusions=scripts/**,**/*mock.*.ts,**/*spec.ts
-      -Dsonar.login=${SONAR_TOKEN}
-      -Dsonar.qualitygate.wait=true
+# code_analysis:
+#   image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
+#   services:
+#     - docker:18.09-dind
+#   stage: sonar-analysis
+#   only:
+#     - dev
+#     - merge_requests
+#   before_script:
+#     - export NODE_PATH=$NODE_PATH:`npm root -g`
+#     - npm install -g typescript
+#   script:
+#     - >
+#       sonar-scanner
+#       -Dsonar.projectName=${SONAR_PROJECT_KEY}
+#       -Dsonar.projectVersion=1.0
+#       -Dsonar.sourceEncoding=UTF-8
+#       -Dsonar.projectBaseDir=.
+#       -Dsonar.host.url=${SONAR_URL}
+#       -Dsonar.projectKey=${SONAR_PROJECT_KEY}
+#       -Dsonar.exclusions=scripts/**,**/*mock.*.ts,**/*spec.ts
+#       -Dsonar.login=${SONAR_TOKEN}
+#       -Dsonar.qualitygate.wait=true
 
 mr:
-  image: docker:18.09
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
   services:
     - docker:18.09-dind
   stage: build