diff --git a/.cirrus/tasks.yml b/.cirrus/tasks.yml
index b8b55b58a..a7c1e7a68 100644
--- a/.cirrus/tasks.yml
+++ b/.cirrus/tasks.yml
@@ -66,10 +66,7 @@ build_gcp_app_template: &BUILD_GCP_APP_TEMPLATE
     - chmod 700 get_helm.sh
     - ./get_helm.sh
   helm_dependency_build_script:
-    - cd charts/sonarqube-dce
-    - helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
-    - helm repo add bitnami-pre2022 https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-    - helm dependency build
+    - ./.cirrus/build_chart_dependencies.sh charts/sonarqube-dce
   tag_and_promote_script:
     - export CURRENT_MINOR_VERSION=$(echo ${GCLOUD_TAG} | cut -d '.' -f 1,2)
     - docker build -f google-cloud-marketplace-k8s-app/Dockerfile --build-arg REGISTRY=${GCLOUD_REGISTRY} --build-arg TAG=${GCLOUD_TAG} --tag ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/deployer:${CURRENT_MINOR_VERSION} .
@@ -156,14 +153,12 @@ chart_static_compatibility_test_task:
     memory: 1Gb
   <<: *CLONE_SCRIPT_TEMPLATE
   script:
-    - helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
-    - helm repo add bitnami-pre2022 https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    - cd "${CIRRUS_WORKING_DIR}" && ./.cirrus/build_chart_dependencies.sh charts/sonarqube
     - cd ${CIRRUS_WORKING_DIR}/charts/sonarqube
-    - helm dependency build
-    - ../../.cirrus/unit_helm_compatibility_test.sh
+    - "${CIRRUS_WORKING_DIR}"/.cirrus/unit_helm_compatibility_test.sh
     - cd ${CIRRUS_WORKING_DIR}/charts/sonarqube-dce
-    - helm dependency build
-    - ../../.cirrus/unit_helm_compatibility_test.sh    
+    - cd "${CIRRUS_WORKING_DIR}" && ./.cirrus/build_chart_dependencies.sh charts/sonarqube-dce
+    - "${CIRRUS_WORKING_DIR}"/.cirrus/unit_helm_compatibility_test.sh
 
 chart_fixture_test_task:
   <<: *ONLY_ON_NON_RELEASE_DRAFT_TEMPLATE
@@ -174,13 +169,9 @@ chart_fixture_test_task:
     memory: 1Gb
   <<: *CLONE_SCRIPT_TEMPLATE
   script:
-    - helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
-    - helm repo add bitnami-pre2022 https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-    - cd ${CIRRUS_WORKING_DIR}/charts/sonarqube
-    - helm dependency build
-    - cd ${CIRRUS_WORKING_DIR}/charts/sonarqube-dce
-    - helm dependency build
-    - cd ../..
+    - cd "${CIRRUS_WORKING_DIR}" && ./.cirrus/build_chart_dependencies.sh charts/sonarqube
+    - cd "${CIRRUS_WORKING_DIR}" && ./.cirrus/build_chart_dependencies.sh charts/sonarqube-dce
+    - cd ${CIRRUS_WORKING_DIR}
     - .cirrus/generate_helm_fixtures.sh
     - git diff --exit-code