diff --git a/charts/ci-build-deploy.yml b/charts/ci-build-deploy.yml
index a2a2f47..72d7f19 100644
--- a/charts/ci-build-deploy.yml
+++ b/charts/ci-build-deploy.yml
@@ -65,8 +65,6 @@ build-ical-image-dev:
   extends: .build-ical-image
   variables:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/ical:dev"
-  needs:
-    - job: build-data-manager-image-dev
   rules:
     - if: $CI_COMMIT_BRANCH == "development"
       changes:
@@ -76,8 +74,6 @@ build-ical-image-prod:
   extends: .build-ical-image
   variables:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/ical:latest"
-  needs:
-    - job: build-data-manager-image-prod
   rules:
     - if: $CI_COMMIT_BRANCH == "main"
       changes:
@@ -96,8 +92,6 @@ build-frontend-image-dev:
   extends: .build-frontend-image
   variables:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/frontend:dev"
-  needs:
-    - job: build-ical-image-dev
   rules:
     - if: $CI_COMMIT_BRANCH == "development"
       changes:
@@ -107,8 +101,6 @@ build-frontend-image-prod:
   extends: .build-frontend-image
   variables:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/frontend:latest"
-  needs:
-    - job: build-ical-image-prod
   rules:
     - if: $CI_COMMIT_BRANCH == "main"
       changes:
@@ -125,11 +117,15 @@ build-frontend-image-prod:
     CHART_FILE: $CI_PROJECT_DIR/charts/Chart.yaml
   before_script:
     - apk add --no-cache gettext
-    - echo "HELM_ARTIFACT_JOB_NAME=$CI_JOB_NAME" >> .env_file
-    - echo "PROJECT_URL=$PROJECT_URL" >> .env_file
-    - echo "PROJECT_NAME=$PROJECT_NAME" >> .env_file
+    - echo "export HELM_ARTIFACT_JOB_NAME=$CI_JOB_NAME" >> .env_file
+    - echo "export PROJECT_URL=$PROJECT_URL" >> .env_file
+    - echo "export PROJECT_NAME=$PROJECT_NAME" >> .env_file
     - source .env_file
     - echo "Updating deployment URLs..."
+    - ': "${DATA_MANAGER_IMAGE:=$CI_REGISTRY_IMAGE/data-manager:$FALLBACK_TAG}"'
+    - ': "${ICAL_IMAGE:=$CI_REGISTRY_IMAGE/ical:$FALLBACK_TAG}"'
+    - ': "${FRONTEND_IMAGE:=$CI_REGISTRY_IMAGE/frontend:$FALLBACK_TAG}"'
+    - export DATA_MANAGER_IMAGE ICAL_IMAGE FRONTEND_IMAGE
     - yq e -i '(.dataManager.image.name) = env(DATA_MANAGER_IMAGE)' $VALUES_FILE
     - yq e -i '(.ical.image.name) = env(ICAL_IMAGE)' $VALUES_FILE
     - yq e -i '(.frontend.image.name) = env(FRONTEND_IMAGE)' $VALUES_FILE
@@ -149,22 +145,23 @@ package-helm-chart-dev:
   variables:
     PROJECT_URL: $PROJECT_URL_DEV
     PROJECT_NAME: $CI_PROJECT_NAME-dev
+    FALLBACK_TAG: dev
   script:
     - yq e -i '(.production) = false' $VALUES_FILE
-  needs:
-    - build-frontend-image-dev
   rules:
     - if: '$CI_COMMIT_BRANCH == "development"'
       changes:
         - services/data-manager/**/*
         - services/ical/**/*
         - frontend/**/*
+        - charts/**/*
 
 package-helm-chart-prod:
   extends: .package-helm-chart
   variables:
     PROJECT_URL: $PROJECT_URL_PROD
     PROJECT_NAME: $CI_PROJECT_NAME
+    FALLBACK_TAG: latest
   script:
     - yq e -i '(.frontend.googleSiteVerification) = env(GOOGLE_VERIFICATION)' $VALUES_FILE
     - |
@@ -181,14 +178,13 @@ package-helm-chart-prod:
       {{- end }}
       EOF
     - envsubst < configmap-google.yaml > $CHARTS_DIR/templates/configmap-google.yaml
-  needs:
-    - build-frontend-image-prod
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
       changes:
         - services/data-manager/**/*
         - services/ical/**/*
         - frontend/**/*
+        - charts/**/*
 
 trigger_deploy:
   stage: deploy