diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 53e77851..fec4910f 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -21,7 +21,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: virio-msg-draft-v${{ github.run_number }} # Or a more meaningful tag
+          tag_name: ${{github.ref_name}}-${{ github.repository_owner }}-draft-v${{ github.run_number }}
           release_name: Draft ${{ github.run_number }}
           draft: false
           prerelease: false
@@ -33,5 +33,5 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: virtio-v1.4-wd01.pdf
-          asset_name: virtio-v1.4-wd01.pdf
+          asset_name: ${{github.ref_name}}-${{ github.repository_owner }}-draft-v${{ github.run_number }}.pdf
           asset_content_type: application/pdf