diff --git a/.github/workflows/upload-s3.yml b/.github/workflows/upload-s3.yml
index e460e9dec..3a0ae69bf 100644
--- a/.github/workflows/upload-s3.yml
+++ b/.github/workflows/upload-s3.yml
@@ -54,7 +54,7 @@ jobs:
         run: unzip acli.phar.zip
       - name: Store artifact in S3
         run: |
-          aws s3 cp acli.phar s3://acquia-cli/build/$GITHUB_SHA/
+          aws s3 cp acli.phar s3://acquia-cli/build/pr/${{ steps.pr.outputs.result }}
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -62,9 +62,9 @@ jobs:
       - name: Comment on PR
         run: |
           GITHUB_PR=${{ steps.pr.outputs.result }}
-          COMMENT="Try the dev build for this PR: https://acquia-cli.s3.amazonaws.com/build/$GITHUB_SHA/acli.phar
+          COMMENT="Try the dev build for this PR: https://acquia-cli.s3.amazonaws.com/build/pr/${{ steps.pr.outputs.result }}/acli.phar
           \`\`\`
-          curl -OL https://acquia-cli.s3.amazonaws.com/build/$GITHUB_SHA/acli.phar
+          curl -OL https://acquia-cli.s3.amazonaws.com/build/pr/${{ steps.pr.outputs.result }}/acli.phar
           chmod +x acli.phar
           \`\`\`"
           COMMENT_URL="https://github.com/$GITHUB_REPOSITORY/pull/$GITHUB_PR"