diff --git a/.github/workflows/development-build.yml b/.github/workflows/development-build.yml
index 681cbda3a..312162c21 100644
--- a/.github/workflows/development-build.yml
+++ b/.github/workflows/development-build.yml
@@ -29,7 +29,7 @@ jobs:
           file: docker/prod-ssu/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
   aarch64:
       runs-on: [self-hosted, arm64]
       permissions:
@@ -50,7 +50,7 @@ jobs:
             file: docker/prod-ssu/Dockerfile
             platforms: linux/aarch64
             push: true
-            tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64
+            tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64
   merge-manifest:
       runs-on: ubuntu-latest
       permissions:
@@ -72,7 +72,7 @@ jobs:
             password: ${{ secrets.GITHUB_TOKEN  }}
         - name: Create & publish manifest
           run: |
-            docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
+            docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
         - uses: sarisia/actions-status-discord@v1
           if: always()
           with: