diff --git a/.github/workflows/build-next.yml b/.github/workflows/build-next.yml
index e9f52091..d3b7ad03 100644
--- a/.github/workflows/build-next.yml
+++ b/.github/workflows/build-next.yml
@@ -4,10 +4,11 @@ on:
   push:
     branches:
       - main
+      - "v[0-9]+"
   workflow_dispatch:
 
 concurrency:
-  group: build-next-image
+  group: build-next-image-${{ github.ref_name }}
   cancel-in-progress: true
 
 permissions:
@@ -66,7 +67,7 @@ jobs:
           args: release --clean --skip=announce,validate --parallelism=4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BUILD_NEXT: "true"
+          BUILD_NEXT: ${{ github.ref_name == 'main' && 'next' || format('next-{0}', github.ref_name) }}
           SKIP_RELEASE: "true"
           SKIP_CHANGELOG: "true"
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index d3b48efd..797ad234 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -184,7 +184,7 @@ dockers_v2:
       - "pocketid/pocket-id"
       - "ghcr.io/{{ .Env.GITHUB_REPOSITORY_OWNER }}/pocket-id"
     tags:
-      - "next"
+      - "{{ .Env.BUILD_NEXT }}"
     platforms:
       - linux/amd64
       - linux/arm64
@@ -212,7 +212,7 @@ dockers_v2:
       - "pocketid/pocket-id"
       - "ghcr.io/{{ .Env.GITHUB_REPOSITORY_OWNER }}/pocket-id"
     tags:
-      - "next-distroless"
+      - "{{ .Env.BUILD_NEXT }}-distroless"
     platforms:
       - linux/amd64
       - linux/arm64