diff --git a/.github/actions/goreleaser-build-sign-publish/action_utils b/.github/actions/goreleaser-build-sign-publish/action_utils
index 051e0763fbd..641669fb6ab 100755
--- a/.github/actions/goreleaser-build-sign-publish/action_utils
+++ b/.github/actions/goreleaser-build-sign-publish/action_utils
@@ -80,7 +80,7 @@ goreleaser_release() {
 
   $GORELEASER_EXEC release ${flags} --config "$GORELEASER_CONFIG" "$@"
 
-  if [[ $ENABLE_DOCKER_PUBLISH == "true" ]]; then
+  if [[ $ENABLE_DOCKER_PUBLISH == "true" ]] && [[ $ENABLE_GORELEASER_SNAPSHOT == "true" ]]; then
       _publish_snapshot_images
       _publish_snapshot_manifests
   fi
diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml
index ee15c81e895..a8a774df570 100644
--- a/.github/workflows/build-publish.yml
+++ b/.github/workflows/build-publish.yml
@@ -98,7 +98,6 @@ jobs:
         id: goreleaser-build-sign-publish
         uses: ./.github/actions/goreleaser-build-sign-publish
         with:
-          # enable-docker-publish: "true"
           docker-registry: ${{ env.ECR_HOSTNAME}}
           docker-image-name: ${{ env.ECR_IMAGE_NAME }}
           docker-image-tag: ${{ github.ref_name }}