diff --git a/.github/workflows/reusable-build-job.yml b/.github/workflows/reusable-build-job.yml
index 9430821..8e54c31 100644
--- a/.github/workflows/reusable-build-job.yml
+++ b/.github/workflows/reusable-build-job.yml
@@ -55,16 +55,6 @@ jobs:
       - name: Compile and build
         run: yarn clean && yarn compile && yarn build
 
-
-      - name: (DEBUG) Verify artifact contents before upload
-        run: |
-          echo "Listing dist files:"
-          ls -l packages/frontend/dist
-          echo "bundle.js hash:"
-          sha256sum packages/frontend/dist/bundle.js
-          sed -n '122663p' packages/frontend/dist/bundle.js
-
-
       - name: Upload dist and lib
         uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/reusable-deploy-job.yml b/.github/workflows/reusable-deploy-job.yml
index 3096ad0..e9fcae7 100644
--- a/.github/workflows/reusable-deploy-job.yml
+++ b/.github/workflows/reusable-deploy-job.yml
@@ -88,32 +88,8 @@ jobs:
           echo "FRONTEND_URL_WITHOUT_HTTPS=$(echo ${{ secrets.FRONTEND_URL }} | sed 's/^https:\/\///')" >> $GITHUB_ENV
           echo "BACKEND_URL_WITHOUT_HTTPS=$(echo ${{ secrets.BACKEND_URL }} | sed 's/^https:\/\///')" >> $GITHUB_ENV
 
-      - name: (DEBUG) Verify artifact contents before serverless upload
-        run: |
-          echo "Listing dist files:"
-          ls -l packages/frontend/dist
-          echo "bundle.js hash:"
-          sha256sum packages/frontend/dist/bundle.js
-          sed -n '122663p' packages/frontend/dist/bundle.js
-
       - name: Deploy Frontend
-        run: serverless s3sync bucket --bucket ${{ secrets.COMPANY_ABBREVIATION }}-lara-frontend-${{ inputs.target }} --dir packages/frontend/dist --verbose
-
-      - name: (DEBUG) Verify artifact contents after serverless upload
-        run: |
-          echo "Listing dist files:"
-          ls -l packages/frontend/dist
-          echo "bundle.js hash:"
-          sha256sum packages/frontend/dist/bundle.js
-          sed -n '122663p' packages/frontend/dist/bundle.js
+        run: serverless s3sync bucket --bucket ${{ secrets.COMPANY_ABBREVIATION }}-lara-frontend-${{ inputs.target }}
 
       - name: Deploy Backends
         run: serverless deploy --stage ${{ inputs.target }}
-
-      - name: (DEBUG) Verify artifact contents after serverless deploy
-        run: |
-          echo "Listing dist files:"
-          ls -l packages/frontend/dist
-          echo "bundle.js hash:"
-          sha256sum packages/frontend/dist/bundle.js
-          sed -n '122663p' packages/frontend/dist/bundle.js
diff --git a/packages/frontend/webpack.config.js b/packages/frontend/webpack.config.js
index 98e9eeb..b0c4eda 100644
--- a/packages/frontend/webpack.config.js
+++ b/packages/frontend/webpack.config.js
@@ -26,25 +26,33 @@ const getEnvironmentConfig = () => {
   const name = ENVIRONMENT_NAME ?? DEFAULT_ENVIRONMENT
 
   // For local development we load the variables from .env file
-
-  const envVarsPath = path.resolve(__dirname, '../../.env')
-  const { parsed } = dotenv.config({ path: envVarsPath })
-  if (parsed) {
-    return {
-      name,
-      mode: parsed.MODE,
-      microsoftClientID: parsed.MICROSOFT_CLIENT_ID,
-      microsoftTenantID: parsed.MICROSOFT_TENANT_ID,
-      debug: parsed.DEBUG === 'true',
-      authHeader: parsed.AUTH_HEADER,
-      backendUrl: parsed.BACKEND_URL,
-      frontendUrl: parsed.FRONTEND_URL,
-      supportMail: parsed.SUPPORT_MAIL,
+  console.log('process.env.CI: ' + process.env.CI)
+  if (!process.env.CI) {
+    const envVarsPath = path.resolve(__dirname, '../../.env')
+    const { parsed } = dotenv.config({ path: envVarsPath })
+    if (parsed) {
+      console.log(`Using environment variables from ${envVarsPath}`)
+      return {
+        name,
+        mode: parsed.MODE,
+        microsoftClientID: parsed.MICROSOFT_CLIENT_ID,
+        microsoftTenantID: parsed.MICROSOFT_TENANT_ID,
+        debug: parsed.DEBUG === 'true',
+        authHeader: parsed.AUTH_HEADER,
+        backendUrl: parsed.BACKEND_URL,
+        frontendUrl: parsed.FRONTEND_URL,
+        supportMail: parsed.SUPPORT_MAIL,
+      }
+    } else {
+      throw new Error(
+        `Failed to load environment variables from ${envVarsPath}. Please ensure the file exists and is correctly formatted.`
+      )
     }
   }
 
   // if running in CI/CD we load the variables from process.env.
-  // The values are injected by Gitlab
+  // The values are injected by GitHub
+  console.log(`Using injected environment variables from process.env`)
   return {
     name,
     mode: MODE ?? '',