diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 982f657c..10ef3c46 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,7 +86,7 @@ jobs:
           fi
           docker buildx build . --target ${{matrix.target}} --tag quay.io/argoproj/dataflow-${{matrix.target}}:$tag --push
 
-  draft-release:
+  publish-release:
     runs-on: ubuntu-latest
     needs: [ publish-images ]
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
@@ -113,9 +113,8 @@ jobs:
       - name: Draft release
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.tag.outputs.tag }}
-          draft: true
-          prerelease: true
+          tag_name: ${{ steps.tag.outputs.tag }}
+          prerelease: ${{ !startsWith(github.ref, 'refs/tags/' }}
           body_path: changelog
           files: |
             config/*.yaml