diff --git a/.github/workflows/pr-preview-build.yml b/.github/workflows/pr-preview-build.yml
index 5608198..e3eb92d 100644
--- a/.github/workflows/pr-preview-build.yml
+++ b/.github/workflows/pr-preview-build.yml
@@ -1,4 +1,4 @@
-name: PR Preview Release Binaries
+name: PR Preview Build
 
 on:
   pull_request:
@@ -52,7 +52,7 @@ jobs:
       - name: Upload Build Artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: agentapi-preview-build
+          name: agentapi-build-${{ github.event.pull_request.number }}
           path: ${{ github.workspace }}/out
           retention-days: 7
 
diff --git a/.github/workflows/pr-preview-release.yml b/.github/workflows/pr-preview-release.yml
index 4f20312..400b862 100644
--- a/.github/workflows/pr-preview-release.yml
+++ b/.github/workflows/pr-preview-release.yml
@@ -40,19 +40,20 @@ jobs:
       - name: Create or Update PR Release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_TAG: 'agentapi_${{ github.event.pull_request.number }}'
+          RELEASE_TAG: 'agentapi_${{ steps.pr.outputs.number }}'
+          PR_NUMBER: ${{ steps.pr.outputs.number }}
 
         run: |
           # Check if release exists
-          if gh release view "$RELEASE_TAG" &>/dev/null; then
+          if gh release view "$RELEASE_TAG" --repo ${{ github.repository }} &>/dev/null; then
             echo "Updating release $RELEASE_TAG"
-            gh release upload "$RELEASE_TAG" "$GITHUB_WORKSPACE"/out/* --clobber
+            gh release upload "$RELEASE_TAG" ./out/* --clobber --repo ${{ github.repository }}
           else
             echo "Creating release $RELEASE_TAG"
-            gh release create "$RELEASE_TAG" "$GITHUB_WORKSPACE"/out/* \
+            gh release create "$RELEASE_TAG" ./out/* \
               --title "$RELEASE_TAG" \
               --notes "Preview release for PR #${PR_NUMBER}" \
-              --draft --latest=false
+              --repo ${{ github.repository }}
           fi
 
       - name: Comment on PR