diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index d97fdef..c5de0ce 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -46,4 +46,4 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: |
-            git.kjan.de/templates/react:${{ gitea.event_name == 'workflow_run' && env.tag || 'dev' }}
+            git.kjan.de/templates/react:dev
diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
index 77cb2be..ad23761 100644
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -4,6 +4,45 @@ on:
   workflow_dispatch:
 
 jobs:
+  build-release:
+    name: Build Release
+    needs:
+      - release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Extract tag
+        run: |
+          TAG=$(git describe --tags --abbrev=0)
+          echo "TAG=$TAG" >> $GITHUB_ENV
+      - uses: actions/setup-node@v5
+        with:
+          node-version: 24
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+      - name: Install dependencies
+        run: bun install
+      - name: Build
+        run: bun run build
+      - name: Docker login
+        uses: docker/login-action@v1
+        with:
+          registry: git.kjan.de
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+      - name: Build and push docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: |
+            git.kjan.de/templates/react:latest
+            git.kjan.de/templates/react:${{ env.tag }}
   release:
     name: Release
     runs-on: ubuntu-latest