diff --git a/charts/ci-build-deploy.yml b/charts/ci-build-deploy.yml
index 3ed965d..29a4d5a 100644
--- a/charts/ci-build-deploy.yml
+++ b/charts/ci-build-deploy.yml
@@ -22,9 +22,9 @@
       $BUILD_PATH
     - docker push "$IMAGE_TAG"
   artifacts:
-    paths:
-      - .env_file
-    expire_in: 1 hour
+    reports:
+      dotenv: build.env
+    expire_in: 1 day
 
 .build-data-manager-image:
   extends: .build-image
@@ -33,7 +33,7 @@
     BUILD_PATH: "./services"
     DOCKERFILE: "./services/data-manager/Dockerfile"
   after_script:
-    - echo "export DATA_MANAGER_IMAGE=$IMAGE_TAG" >> .env_file
+    - echo "DATA_MANAGER_IMAGE=$IMAGE_TAG" >> build.env
 
 build-data-manager-image-dev:
   extends: .build-data-manager-image
@@ -60,7 +60,7 @@ build-data-manager-image-prod:
     BUILD_PATH: "./services"
     DOCKERFILE: "./services/ical/Dockerfile"
   after_script:
-    - echo "export ICAL_IMAGE=$IMAGE_TAG" >> .env_file
+    - echo "ICAL_IMAGE=$IMAGE_TAG" >> build.env
 
 build-ical-image-dev:
   extends: .build-ical-image
@@ -87,7 +87,7 @@ build-ical-image-prod:
     BUILD_PATH: "./frontend"
     DOCKERFILE: "./frontend/Dockerfile"
   after_script:
-    - echo "export FRONTEND_IMAGE=$IMAGE_TAG" >> .env_file
+    - echo "FRONTEND_IMAGE=$IMAGE_TAG" >> build.env
 
 build-frontend-image-dev:
   extends: .build-frontend-image
@@ -118,10 +118,9 @@ build-frontend-image-prod:
     CHART_FILE: $CI_PROJECT_DIR/charts/Chart.yaml
   before_script:
     - apk add --no-cache gettext
-    - 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 "HELM_ARTIFACT_JOB_NAME=$CI_JOB_NAME" >> package.env
+    - echo "PROJECT_URL=$PROJECT_URL" >> package.env
+    - echo "PROJECT_NAME=$PROJECT_NAME" >> package.env
     - echo "Updating deployment URLs..."
     - ': "${DATA_MANAGER_IMAGE:=$CI_REGISTRY_IMAGE/data-manager:$FALLBACK_TAG}"'
     - ': "${ICAL_IMAGE:=$CI_REGISTRY_IMAGE/ical:$FALLBACK_TAG}"'
@@ -138,8 +137,9 @@ build-frontend-image-prod:
   artifacts:
     paths:
       - "*.tgz"
-      - .env_file
-    expire_in: 1 hour
+    reports:
+      dotenv: package.env
+    expire_in: 1 day
 
 package-helm-chart-dev:
   extends: .package-helm-chart
@@ -192,7 +192,6 @@ trigger_deploy:
   image: alpine:latest
   before_script:
     - apk add --no-cache curl
-    - source .env_file
   script:
     - echo "Triggering deploy pipeline ..."
     - |