diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml
index bffd9eff..1798dad5 100644
--- a/.forgejo/workflows/deploy.yml
+++ b/.forgejo/workflows/deploy.yml
@@ -20,7 +20,9 @@ jobs:
             set -e
             cd /srv/gateway/current
             git remote set-url origin ssh://git@git.poweron.swiss:2222/PowerOn/plattform-core.git
-            git pull
+            git fetch origin main
+            git checkout -B main origin/main
+            git checkout HEAD -- env-gateway-prod-forgejo.env
             cp env-gateway-prod-forgejo.env .env
             rm -f env-*.env
             source .venv/bin/activate
@@ -45,7 +47,9 @@ jobs:
             set -e
             cd /srv/gateway/current
             git remote set-url origin ssh://git@git.poweron.swiss:2222/PowerOn/plattform-core.git
-            git pull
+            git fetch origin main
+            git checkout -B main origin/main
+            git checkout HEAD -- env-gateway-prod-forgejo.env
             cp env-gateway-prod-forgejo.env .env
             rm -f env-*.env
             source .venv/bin/activate