diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 49dd5bb0..5d5984a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,6 +61,15 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
+      - name: Create/Update Draft
+        uses: lucacome/draft-release@v1.0.1
+        with:
+          minor-label: "enhancement"
+          major-label: "change"
+          publish: ${{ github.ref_type == 'tag' }}
+          collapse-after: 50
+        if: github.event_name != 'pull_request'
+
       - name: Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -73,6 +82,8 @@ jobs:
           tags: ${{ matrix.nginx_version }}
           cache-from: type=gha,scope=${{ matrix.nginx_version }}
           cache-to: type=gha,scope=${{ matrix.nginx_version }},mode=max
+          provenance: true
+          sbom: true
           target: export
           build-args: NGINX_VERSION=${{ matrix.nginx_version }}
           outputs: type=tar,dest=linux-amd64-nginx-${{ matrix.nginx_version }}-ngx_http_module.so.tar
@@ -84,5 +95,12 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: linux-amd64-nginx-${{ matrix.nginx_version }}-ngx_http_module.so.tgz
+          name: linux-amd64-nginx-${{ matrix.nginx_version }}-ngx_http_module.so.tar.gz
           path: linux-amd64-nginx-${{ matrix.nginx_version }}-ngx_http_module.so.tar.gz
+
+      - name: Upload binaries on release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        if: github.ref_type == 'tag'
+        run: |
+          gh release upload ${{ github.ref_name }} linux-amd64-nginx-${{ matrix.nginx_version }}-ngx_http_module.so.tar.gz --clobber
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
deleted file mode 100644
index 9a3bf019..00000000
--- a/.github/workflows/draft-release.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Create/Update Draft
-        uses: lucacome/draft-release@v1.0.1
-        with:
-          minor-label: "enhancement"
-          major-label: "change"
-          publish: ${{ github.ref_type == 'tag' }}
-          collapse-after: 50