diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ab0a386..bd98e60 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -228,7 +228,7 @@ jobs:
       # Optional manifest for latest
       - name: manifest-ghcr-latest
         run: docker manifest create ${{ env.GHCR_IMAGE_NAME }}:latest --amend ${{ steps.meta-ghcr.outputs.tags }}-amd64 --amend ${{ steps.meta-ghcr.outputs.tags }}-arm64v8
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && ! contains(github.ref, '-pre-')
       # Optional manifest for tag versions (includes revisions)
       - name: manifest-ghcr-tags
         run: docker manifest create ${{ steps.meta-ghcr-tag.outputs.tags }} --amend ${{ steps.meta-ghcr-tag.outputs.tags }}-amd64 --amend ${{ steps.meta-ghcr-tag.outputs.tags }}-arm64v8
@@ -238,7 +238,7 @@ jobs:
         run: docker manifest push ${{ steps.meta-ghcr.outputs.tags }}
       - name: push-ghcr-latest
         run: docker manifest push ${{ env.GHCR_IMAGE_NAME }}:latest
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && ! contains(github.ref, '-pre-')
       - name: push-ghcr-tags
         run: docker manifest push ${{ steps.meta-ghcr-tag.outputs.tags }}
         if: startsWith(github.ref, 'refs/tags/')
@@ -249,7 +249,7 @@ jobs:
         run: docker manifest create ${{ steps.meta-dockerhub.outputs.tags }} --amend ${{ steps.meta-dockerhub.outputs.tags }}-amd64 --amend ${{ steps.meta-dockerhub.outputs.tags }}-arm64v8
       - name: manifest-dockerhub-latest
         run: docker manifest create ${{ env.DOCKER_IMAGE_NAME }}:latest --amend ${{ steps.meta-dockerhub.outputs.tags }}-amd64 --amend ${{ steps.meta-dockerhub.outputs.tags }}-arm64v8
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && ! contains(github.ref, '-pre-')
       - name: manifest-dockerhub-tags
         run: docker manifest create ${{ steps.meta-dockerhub-tag.outputs.tags }} --amend ${{ steps.meta-dockerhub-tag.outputs.tags }}-amd64 --amend ${{ steps.meta-dockerhub-tag.outputs.tags }}-arm64v8
         if: startsWith(github.ref, 'refs/tags/')
@@ -257,7 +257,7 @@ jobs:
         run: docker manifest push ${{ steps.meta-dockerhub.outputs.tags }}
       - name: push-dockerhub-latest
         run: docker manifest push ${{ env.DOCKER_IMAGE_NAME }}:latest
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && ! contains(github.ref, '-pre-')
       - name: push-dockerhub-tags
         run: docker manifest push ${{ steps.meta-dockerhub-tag.outputs.tags }}
         if: startsWith(github.ref, 'refs/tags/')
@@ -289,7 +289,7 @@ jobs:
                 generate_release_notes: true,
                 name: process.env.RELEASE_TAG,
                 owner: context.repo.owner,
-                prerelease: false,
+                prerelease: ${{ (startsWith(github.ref, 'refs/tags/') && contains(github.ref, '-pre-')) && true || false }},
                 repo: context.repo.repo,
                 tag_name: process.env.RELEASE_TAG,
               });