diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01c11d6c29fb58883d98723dd084ced21c850b60..83e579622fe1c987262c56211a75783f98b764d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,11 +35,14 @@ test:
   script:
     - mvn test $MAVEN_CLI_OPTS
 
-test-helm:
-  stage: test
+.helm:
   before_script:
-    - apk add --no-cache helm
+    - apk add --no-cache helm git
     - helm plugin install https://github.com/helm-unittest/helm-unittest.git
+
+test-helm:
+  stage: test
+  extends: .helm
   script:
     - helm template  ./src/main/helm/ -f src/test/helm-linter-values.yaml
     - helm lint -f src/test/helm-linter-values.yaml ./src/main/helm/
@@ -80,9 +83,9 @@ push-merge-request-image-nexus:
 
 push-merge-request-helm-nexus:
   stage: publish
-  extends: .get-version
-  before_script:
-    - apk add --no-cache helm
+  extends:
+    - .get-version
+    - .helm
   script:
     - cd src/main/helm && helm package --version=MR-${CI_MERGE_REQUEST_IID}-${PROJECT_VERSION}
   rules: