diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index b479322d0..d83837050 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -57,7 +57,7 @@ jobs:
         uses: docker/setup-buildx-action@v4
 
       - name: "Login to GitHub Container Registry"
-        if: contains(github.event.release.tag_name, 'Release') && github.event.release.target_commitish == 'master'
+        if: ${{ github.event_name == 'release' && github.event.release.prerelease == false }}
         uses: docker/login-action@v4
         with:
           password: ${{ github.token }}
@@ -73,5 +73,5 @@ jobs:
           context: .
           labels: ${{ steps.metadata.outputs.labels }}
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref_type == 'tag' }}
+          push: ${{ github.event_name == 'release' && github.event.release.prerelease == false }}
           tags: ${{ steps.metadata.outputs.tags }}