diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f57a9bb453c600ba276c9d9d329477e862d44747..75486c2aad2e7f102fea15dd48dbef023d323818 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,9 +41,10 @@ test:
 
 test-helm:
   stage: test
-  extends: .helm
-  script:
+  before_script:
+    - !reference [ .helm, before_script ]
     - helm plugin install https://github.com/helm-unittest/helm-unittest.git
+  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/
     - cd src/main/helm && helm unittest  -f '../../test/helm/**/*test.yaml' .
@@ -96,7 +97,9 @@ push-merge-request-helm-nexus:
 # Snapshot jobs
 push-snapshot-image-gitlab:
   stage: publish
-  extends: .get-version
+  before_script:
+    - !reference [.get-version, before_script]
+    - !reference [.helm, before_script]
   script:
     - export IMAGE_TAGS="${CI_REGISTRY_IMAGE}:${PROJECT_VERSION}-main+${CI_COMMIT_SHORT_SHA},${CI_REGISTRY_IMAGE}:snapshot-latest"
     - mvn deploy -Pgitlab-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS