diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 156bb5533d79aa9559e809bfafaa90bb028dead7..6e13455b697a8390a82a907c7ccd484e17c178c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -213,13 +213,13 @@ config:ci-gpu-nvidia-user:
   extends:
     - .hysop-configure-venv
     - .hysop-gpu
- needs:
+  needs:
      - job: ubuntu:gpu-nvidia-user:docker-build # wait for docker image if docker build is on ...
        optional: true
 
 build:ci-gpu-nvidia-user:
   variables:
-      IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia_user
+    IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia_user
   needs: ["config:ci-gpu-nvidia-user"]
   extends:
     - .hysop-build-venv
@@ -227,7 +227,7 @@ build:ci-gpu-nvidia-user:
 
 install:ci-gpu-nvidia-user:
   variables:
-      IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia_user
+    IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia_user
   needs: ["build:ci-gpu-nvidia-user"]
   extends:
     - .hysop-install-venv
@@ -235,7 +235,7 @@ install:ci-gpu-nvidia-user:
 
 test:ci-gpu-nvidia-user:
   variables:
-      IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia_user
+    IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia_user
   needs: ["install:ci-gpu-nvidia-user"]
   extends:
     - .hysop-test-venv
@@ -268,7 +268,7 @@ config:ci-gpu-nvidia:
 
 build:ci-gpu-nvidia:
   variables:
-      IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia:latest
+    IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia:latest
   needs: ["config:ci-gpu-nvidia"]
   extends:
     - .hysop-build
@@ -276,7 +276,7 @@ build:ci-gpu-nvidia:
 
 install:ci-gpu-nvidia:
   variables:
-      IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia:latest
+    IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia:latest
   needs: ["build:ci-gpu-nvidia"]
   extends:
     - .hysop-install
@@ -284,7 +284,7 @@ install:ci-gpu-nvidia:
 
 test:ci-gpu-nvidia:
   variables:
-      IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia:latest
+    IMAGE_NAME: $HYSOP_REGISTRY/ci_gpu_nvidia:latest
   needs: ["install:ci-gpu-nvidia"]
   extends:
     - .hysop-test
diff --git a/ci/ci-templates.yml b/ci/ci-templates.yml
index 29025385146e25e8e8f6923e60b687b40d137ac7..081ffc08edfbba1f3e2ffe8d4feb693c1c610998 100644
--- a/ci/ci-templates.yml
+++ b/ci/ci-templates.yml
@@ -114,7 +114,7 @@ stages:
 # - will be tagged <IMAGE_NAME>:latest.
 #
 # Doc: https://docs.gitlab.com/ee/ci/docker/using_kaniko.html
-.docker-create-image:
+.docker-build:
   stage: docker-build
   image:
     name: gcr.io/kaniko-project/executor:debug
@@ -130,14 +130,9 @@ stages:
       --destination $RESULT_NAME:latest
       --single-snapshot
 
-.docker-build:
-  extends:
-    - .docker-create-image
-    - .docker-rules
-
 .docker-manual:
   extends:
-    - .docker-create-image
+    - .docker-build
     - .docker-manual-rules
 
 workflow: