diff --git a/.gitea/workflows/deploy-monitoring-prod.yml b/.gitea/workflows/deploy-monitoring-prod.yml
index 56667cd..b529d12 100644
--- a/.gitea/workflows/deploy-monitoring-prod.yml
+++ b/.gitea/workflows/deploy-monitoring-prod.yml
@@ -45,17 +45,19 @@ jobs:
 
       - name: Download Deploy Inputs
         run: |
+          source ./common-functions-base.sh
+          export SPRING_PROFILES_ACTIVE=PROD
           rm -f .env .env.secrets.swag
           scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:prod/secrets/iklim.co/.env ./.env
           scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:prod/secrets/iklim.co/.env.secrets.swag ./.env.secrets.swag
-          test -s .env
-          test -s .env.secrets.swag
+          require_env_file ./.env "Main env file"
+          require_env_file ./.env.secrets.swag "SWAG secrets"
 
       - name: Deploy Monitoring Stack
         run: |
-          set -a; . ./.env; set +a
-          export IMAGE_LOKI="${IMAGE_LOKI}"
-          export IMAGE_PROMTAIL="${IMAGE_PROMTAIL}"
+          source ./common-functions-base.sh
+          export SPRING_PROFILES_ACTIVE=PROD
+          source_env_file ./.env
 
           # Remove leftover dozzle_users Docker secret from previous setup
           docker secret rm dozzle_users 2>/dev/null || true
@@ -86,7 +88,8 @@ jobs:
         run: |
           source ./common-functions-base.sh
           export SPRING_PROFILES_ACTIVE=PROD
-          set -a; . ./.env; . ./.env.secrets.swag; set +a
+          source_env_file ./.env
+          source_env_file ./.env.secrets.swag
           export PORTAINER_SUBDOMAIN="${PORTAINER_SUBDOMAIN:-portainer.iklim.co}"
           export RESTRICTED_IPS_BLOCK="$(echo "$RESTRICTED_IPS" | tr ',' '\n' | sed 's|.*|        allow &;|')"
 
@@ -109,7 +112,8 @@ jobs:
         run: |
           source ./common-functions-base.sh
           export SPRING_PROFILES_ACTIVE=PROD
-          set -a; . ./.env; . ./.env.secrets.swag; set +a
+          source_env_file ./.env
+          source_env_file ./.env.secrets.swag
           FLOATING_IP="${{ vars.PROD_FLOATING_IP }}"
           DOMAIN="iklim.co"
 
diff --git a/.gitea/workflows/deploy-monitoring-test.yml b/.gitea/workflows/deploy-monitoring-test.yml
index 14b2fab..07c532b 100644
--- a/.gitea/workflows/deploy-monitoring-test.yml
+++ b/.gitea/workflows/deploy-monitoring-test.yml
@@ -41,17 +41,19 @@ jobs:
 
       - name: Download Deploy Inputs
         run: |
+          source ./common-functions-base.sh
+          export SPRING_PROFILES_ACTIVE=TEST
           rm -f .env .env.secrets.swag
           scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:test/secrets/iklim.co/.env ./.env
           scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:test/secrets/iklim.co/.env.secrets.swag ./.env.secrets.swag
-          test -s .env
-          test -s .env.secrets.swag
+          require_env_file ./.env "Main env file"
+          require_env_file ./.env.secrets.swag "SWAG secrets"
 
       - name: Deploy Monitoring Stack
         run: |
-          set -a; . ./.env; set +a
-          export IMAGE_LOKI="${IMAGE_LOKI}"
-          export IMAGE_PROMTAIL="${IMAGE_PROMTAIL}"
+          source ./common-functions-base.sh
+          export SPRING_PROFILES_ACTIVE=TEST
+          source_env_file ./.env
 
           docker stack deploy \
             --with-registry-auth \
@@ -79,7 +81,8 @@ jobs:
         run: |
           source ./common-functions-base.sh
           export SPRING_PROFILES_ACTIVE=TEST
-          set -a; . ./.env; . ./.env.secrets.swag; set +a
+          source_env_file ./.env
+          source_env_file ./.env.secrets.swag
           export PORTAINER_SUBDOMAIN="${PORTAINER_SUBDOMAIN:-portainer-test.iklim.co}"
           export RESTRICTED_IPS_BLOCK="$(echo "$RESTRICTED_IPS" | tr ',' '\n' | sed 's|.*|        allow &;|')"
 
@@ -102,7 +105,8 @@ jobs:
         run: |
           source ./common-functions-base.sh
           export SPRING_PROFILES_ACTIVE=TEST
-          set -a; . ./.env; . ./.env.secrets.swag; set +a
+          source_env_file ./.env
+          source_env_file ./.env.secrets.swag
           FLOATING_IP="${{ vars.TEST_FLOATING_IP }}"
           DOMAIN="iklim.co"