diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 3f61e1fac6..2023545762 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -13,15 +13,17 @@ on:
 jobs:
   test:
     runs-on: ubuntu-20.04
+    env:
+      ZITADEL_IMAGE_REGISTRY: 'ghcr.io/zitadel/zitadel'
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
       - name: Set TAG env manual trigger
         if: github.event_name == 'workflow_dispatch'
-        run: echo "RELEASE_VERSION=${{ github.event.inputs.releaseversion }}" >> $GITHUB_ENV
+        run: echo "ZITADEL_IMAGE=${ZITADEL_IMAGE_REGISTRY}:${{ github.event.inputs.releaseversion }}" >> $GITHUB_ENV
       - name: Set TAG env on release
         if: github.event_name == 'release'
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+        run: echo "ZITADEL_IMAGE=${ZITADEL_IMAGE_REGISTRY}:${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
         with:
@@ -30,8 +32,6 @@ jobs:
       - name: Test
         run: docker compose run e2e
         working-directory: e2e
-        env:
-          ZITADEL_IMAGE: ghcr.io/zitadel/zitadel:${RELEASE_VERSION}
       - name: Archive production tests
         if: always()
         uses: actions/upload-artifact@v2