diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml
index 38ac4c7..78afa7d 100644
--- a/.github/workflows/release-build.yaml
+++ b/.github/workflows/release-build.yaml
@@ -33,7 +33,7 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           image: ${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}
-          tags: ${{ github.event.release.tag_name }}-${{ matrix.arch }}
+          tags: ${{ github.event.release.name }}-${{ matrix.arch }}
           archs: ${{ matrix.arch }}
           containerfiles: |
             ./Dockerfile
@@ -45,7 +45,7 @@ jobs:
           username: ${{ secrets.QUAY_USER }}
           password: ${{ secrets.QUAY_PASSWORD }}
           image: ${{ env.IMAGE_BASE_NAME }}
-          tags: ${{ github.event.release.tag_name }}-${{ matrix.arch }}
+          tags: ${{ github.event.release.name }}-${{ matrix.arch }}
 
   manifest:
     name: Create and Push Multi-Arch Release Manifest
@@ -57,11 +57,11 @@ jobs:
 
       - name: Create Release Manifest
         run: |
-          buildah manifest create ${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.tag_name }}
-          buildah manifest add ${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.tag_name }} docker://${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.tag_name }}-amd64
-          buildah manifest add ${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.tag_name }} docker://${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.tag_name }}-arm64
+          buildah manifest create ${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.name }}
+          buildah manifest add ${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.name }} docker://${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.name }}-amd64
+          buildah manifest add ${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.name }} docker://${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.name }}-arm64
 
       - name: Push Multi-Arch Release Manifest
         run: |
-          buildah manifest push --all ${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.tag_name }} docker://${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.tag_name }} \
+          buildah manifest push --all ${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.name }} docker://${{ env.REGISTRY }}/${{ env.IMAGE_BASE_NAME }}:${{ github.event.release.name }} \
             --creds=${{ secrets.QUAY_USER }}:${{ secrets.QUAY_PASSWORD }}