diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml
index a4a0ceb..f286fc9 100644
--- a/.gitea/workflows/docker-build.yml
+++ b/.gitea/workflows/docker-build.yml
@@ -12,6 +12,7 @@ on:
   push:
     branches:
       - main
+      - next-release
   pull_request:
     branches:
       - main
@@ -39,35 +40,25 @@ jobs:
         id: calver
         uses: cal/gitea-actions/calver@main
 
-      # Dev build: push with dev + dev-SHA tags (PR/feature branches)
-      - name: Build Docker image (dev)
-        if: github.ref != 'refs/heads/main'
-        uses: https://github.com/docker/build-push-action@v5
+      - name: Resolve Docker tags
+        id: tags
+        uses: cal/gitea-actions/docker-tags@main
         with:
-          context: .
-          push: true
-          tags: |
-            manticorum67/paper-dynasty-discordapp:dev
-            manticorum67/paper-dynasty-discordapp:dev-${{ steps.calver.outputs.sha_short }}
-          cache-from: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache
-          cache-to: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache,mode=max
+          image: manticorum67/paper-dynasty-discordapp
+          version: ${{ steps.calver.outputs.version }}
+          sha_short: ${{ steps.calver.outputs.sha_short }}
 
-      # Production build: push with latest + CalVer tags (main only)
-      - name: Build Docker image (production)
-        if: github.ref == 'refs/heads/main'
+      - name: Build and push Docker image
         uses: https://github.com/docker/build-push-action@v5
         with:
           context: .
           push: true
-          tags: |
-            manticorum67/paper-dynasty-discordapp:latest
-            manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version }}
-            manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version_sha }}
+          tags: ${{ steps.tags.outputs.tags }}
           cache-from: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache
           cache-to: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache,mode=max
 
       - name: Tag release
-        if: success() && github.ref == 'refs/heads/main'
+        if: success() && steps.tags.outputs.channel == 'stable'
         uses: cal/gitea-actions/gitea-tag@main
         with:
           version: ${{ steps.calver.outputs.version }}
@@ -96,7 +87,7 @@ jobs:
           fi
 
       - name: Discord Notification - Success
-        if: success() && github.ref == 'refs/heads/main'
+        if: success() && steps.tags.outputs.channel != 'dev'
         uses: cal/gitea-actions/discord-notify@main
         with:
           webhook_url: ${{ secrets.DISCORD_WEBHOOK }}