diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 59a46317..07dbd810 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -26,8 +26,6 @@ jobs:
             --pull \
             --platform linux/arm64 \
             --build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}" \
-            --build-arg NEXT_PUBLIC_UMAMI_SCRIPT_URL="${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }}" \
-            --build-arg NEXT_PUBLIC_SENTRY_DSN="${{ secrets.NEXT_PUBLIC_SENTRY_DSN }}" \
             --build-arg SENTRY_DSN="${{ secrets.SENTRY_DSN }}" \
             -t registry.infra.mintel.me/mintel/klz-cables.com:latest \
             --push .
@@ -48,14 +46,10 @@ jobs:
           ssh-keyscan -H alpha.mintel.me >> ~/.ssh/known_hosts 2>/dev/null
 
           # Create .env file for remote deployment
-          cat > .env.remote << 'ENVEOF'
-NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
-NEXT_PUBLIC_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }}
-SENTRY_DSN=${{ secrets.SENTRY_DSN }}
-NEXT_PUBLIC_SENTRY_DSN=${{ secrets.NEXT_PUBLIC_SENTRY_DSN }}
-REDIS_URL=${{ secrets.REDIS_URL }}
-REDIS_KEY_PREFIX=${{ secrets.REDIS_KEY_PREFIX }}
-ENVEOF
+          echo "NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}" > .env.remote
+          echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env.remote
+          echo "REDIS_URL=${{ secrets.REDIS_URL }}" >> .env.remote
+          echo "REDIS_KEY_PREFIX=${{ secrets.REDIS_KEY_PREFIX }}" >> .env.remote
 
           # Copy .env file to remote server
           scp -o StrictHostKeyChecking=accept-new .env.remote deploy@alpha.mintel.me:/home/deploy/sites/klz-cables.com/.env
diff --git a/Dockerfile b/Dockerfile
index 1cbb576b..50455cbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,11 +23,9 @@ COPY . .
 ENV NEXT_TELEMETRY_DISABLED 1
 
 ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
-ARG NEXT_PUBLIC_UMAMI_SCRIPT_URL
-ARG NEXT_PUBLIC_SENTRY_DSN
+ARG SENTRY_DSN
 ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
-ENV NEXT_PUBLIC_UMAMI_SCRIPT_URL=$NEXT_PUBLIC_UMAMI_SCRIPT_URL
-ENV NEXT_PUBLIC_SENTRY_DSN=$NEXT_PUBLIC_SENTRY_DSN
+ENV SENTRY_DSN=$SENTRY_DSN
 
 RUN npm run build