diff --git a/.github/workflows/zitadel.yml b/.github/workflows/zitadel.yml
index ed0b21def1..66b031a231 100644
--- a/.github/workflows/zitadel.yml
+++ b/.github/workflows/zitadel.yml
@@ -22,6 +22,10 @@ jobs:
           go-version: 1.17
       - name: Source checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Fetch all tags
+        run: git fetch --force --tags
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -51,11 +55,6 @@ jobs:
           registry: europe-docker.pkg.dev
           username: _json_key_base64
           password: ${{ secrets.GCR_JSON_KEY_BASE64 }}
-      - uses: tibdex/github-app-token@v1
-        id: generate-token
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
       - uses: goreleaser/goreleaser-action@v2
         name: Publish ZITADEL
         if: steps.semantic.outputs.new_release_published == 'true' && github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch'
@@ -65,7 +64,7 @@ jobs:
           args: release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_TOKEN_TAP: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN_TAP: ${{ secrets.GITHUB_TOKEN_TAP }}
           RELEASE_VERSION: ${{ steps.semantic.outputs.release-version }} # I think this line is not needed. Nevertheless, it's explicit
       - name: Publish go coverage
         uses: codecov/codecov-action@v3.1.0
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index f2e5a595a7..dc37e81798 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -27,6 +27,7 @@ builds:
     goarch:
       - amd64
       - arm64
+      
 dist: .artifacts/goreleaser
 
 dockers: