diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 236f9964c..bed9a0515 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -457,8 +457,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+
+          release_id=$(gh release list --repo ${{ github.repository }} --json id --jq '.[] | select(.draft == true) | .id' | head -n 1)
           # For each file in release directory
           for file in release/*; do
             echo "Uploading $file to release..."
-            gh release upload "${{ needs.release-please.outputs.tag_name }}" "$file" --clobber
+            gh release upload ${release_id} "$file" --clobber
           done
diff --git a/.github/workflows/push-staging-pr-on-close.yml b/.github/workflows/push-staging-pr-on-close.yml
index 6edb04a14..a435c3117 100644
--- a/.github/workflows/push-staging-pr-on-close.yml
+++ b/.github/workflows/push-staging-pr-on-close.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
         with:
-          ref: refs/pull/${{ github.event.pull_request.number }}/merge
+          ref: refs/pull/${{ github.event.pull_request.base.ref }}/merge
 
       - name: Download artifact
         uses: actions/download-artifact@v4
diff --git a/release-please-config.json b/release-please-config.json
index 502759d08..2465973a4 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -7,15 +7,18 @@
         },
         "web": {
             "package-name": "@unraid/web",
-            "release-type": "node"
+            "release-type": "node",
+            "skip-github-release": true
         },
         "unraid-ui": {
             "package-name": "@unraid/ui",
-            "release-type": "node"
+            "release-type": "node",
+            "skip-github-release": true
         },
         "plugin": {
             "package-name": "@unraid/connect-plugin",
-            "release-type": "node"
+            "release-type": "node",
+            "skip-github-release": true
         }
     },
     "separate-pull-requests": false,