diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b2736c2..338a08d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -149,10 +149,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      - name: Set short SHA
-        shell: bash
-        run: |
-          echo "DOCKER_SHORT_TAG=${${{ github.sha }}:0:7}" >> "$GITHUB_ENV"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
diff --git a/.goreleaser.yml b/.goreleaser.yml
index a0b9219..a3033f6 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -31,9 +31,9 @@ dockers:
       - "oryd/hydra-maester:v{{ .Major }}"
       - "oryd/hydra-maester:v{{ .Major }}.{{ .Minor }}"
       - "oryd/hydra-maester:v{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
-      - "oryd/hydra-maester:{{ .Env.DOCKER_SHORT_TAG }}"
+      - "oryd/hydra-maester:{{ .ShortCommit }}"
       - "oryd/hydra-maester:latest"
 
 release:
   prerelease: auto
-  name_template: "{{.Env.RELEASE_NAME}}"
+  name_template: "{{ .Tag }}"