diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml
index eccefba..b0ac44b 100644
--- a/.gitea/workflows/release-nightly.yml
+++ b/.gitea/workflows/release-nightly.yml
@@ -88,6 +88,6 @@ jobs:
             linux/arm64
           push: true
           tags: |
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
             ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
-            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}            
 
diff --git a/.gitea/workflows/release-tag.yml b/.gitea/workflows/release-tag.yml
index 41df1ef..41a44e9 100644
--- a/.gitea/workflows/release-tag.yml
+++ b/.gitea/workflows/release-tag.yml
@@ -99,5 +99,5 @@ jobs:
             linux/arm64
           push: true
           tags: |
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
             ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
-            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}            
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index a4b87ab..57f6a29 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -101,7 +101,7 @@ snapshot:
   name_template: "{{ .Branch }}-devel"
 
 nightly:
-  name_template: "{{ .Branch }}"
+  name_template: "nightly"
 
 gitea_urls:
   api: https://gitea.com/api/v1