diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 4a11962fe..a1cf2c91e 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -1,9 +1,14 @@
 name: Component Detection CI
 
-on: 
+on:
   push:
-    branches: 
+    branches:
       - main
+  pull_request:
+  release:
+    types:
+      - published
+  workflow_dispatch:
 
 jobs:
   build:
@@ -38,17 +43,9 @@ jobs:
     - name: Tar the output
       run: tar -C ./dist -cvf ./dist-release/component-detection.tar.gz .
 
-    - name: Create a release draft
-      id: create_release_draft
-      uses: release-drafter/release-drafter@v5
-      with:
-          disable-autolabeler: true
-      env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
     - name: Upload Extension Release Asset
       id: upload-component-detection-release-asset 
-      if: startsWith(github.ref, 'refs/tags/')
+      if: github.event_name == 'release'
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -59,18 +56,18 @@ jobs:
         asset_content_type: application/zip
 
     - name: Add NuGet publication source for Github packages
-      if: startsWith(github.ref, 'refs/tags/')
+      if: github.event_name == 'release'
       run: dotnet nuget add source https://nuget.pkg.github.com/microsoft/index.json --password $GITHUB_TOKEN --username notused --store-password-in-clear-text --name cgwriter
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Generate NuGet packages
-      if: startsWith(github.ref, 'refs/tags/')
+      if: github.event_name == 'release'
       run: dotnet pack -o dist-nuget -c Release
 
       # dotnet nuget push seems to have some probs, use curl for GH
     - name: Publish nuget
-      if: startsWith(github.ref, 'refs/tags/')
+      if: github.event_name == 'release'
       run: |
            for f in ./dist-nuget/*.nupkg
            do
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
new file mode 100644
index 000000000..205e59253
--- /dev/null
+++ b/.github/workflows/release-drafter.yml
@@ -0,0 +1,20 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  update_release_draft:
+    permissions:
+      contents: write
+      pull-requests: read
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        with:
+          disable-autolabeler: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}