diff --git a/.github/workflows/build_preview_sites.yml b/.github/workflows/build_preview_sites.yml
index 9558c161247d1..c322485372cc3 100644
--- a/.github/workflows/build_preview_sites.yml
+++ b/.github/workflows/build_preview_sites.yml
@@ -12,24 +12,30 @@ jobs:
     with:
       APP_ID: "d1a7j77663uxsc"
       APP_NAME: "vector.dev"
+    secrets:
       REQUEST_TOKEN: ${{ secrets.REQUEST_TOKEN }}
       REQUEST_MESSAGE: ${{ secrets.REQUEST_MESSAGE }}
       ENDPOINT: ${{ secrets.BUILDER_ENDPOINT }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   deploy_rust_doc_preview_site:
     uses: ./.github/workflows/create_preview_sites.yml
     with:
       APP_ID: "d1hoyoksbulg25"
       APP_NAME: "Rust Doc"
+    secrets:
       REQUEST_TOKEN: ${{ secrets.REQUEST_TOKEN }}
       REQUEST_MESSAGE: ${{ secrets.REQUEST_MESSAGE }}
       ENDPOINT: ${{ secrets.BUILDER_ENDPOINT }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   deploy_vrl_playground_preview_site:
     uses: ./.github/workflows/create_preview_sites.yml
     with:
       APP_ID: "d2lr4eds605rpz"
       APP_NAME: "VRL Playground"
+    secrets:
       REQUEST_TOKEN: ${{ secrets.REQUEST_TOKEN }}
       REQUEST_MESSAGE: ${{ secrets.REQUEST_MESSAGE }}
       ENDPOINT: ${{ secrets.BUILDER_ENDPOINT }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/create_preview_sites.yml b/.github/workflows/create_preview_sites.yml
index 78eb9048fc44e..57e082a1599b8 100644
--- a/.github/workflows/create_preview_sites.yml
+++ b/.github/workflows/create_preview_sites.yml
@@ -11,18 +11,19 @@ on:
         description: "Application name for the comment"
         required: true
         type: string
+    secrets:
       REQUEST_TOKEN:
         description: "Token for the request"
         required: true
-        type: secret
       REQUEST_MESSAGE:
         description: "Message for the request"
         required: true
-        type: secret
       ENDPOINT:
         description: "Request endpoint"
         required: true
-        type: secret
+      GITHUB_TOKEN:
+        description: "GitHub Token"
+        required: true
 
 jobs:
   create_preview_site:
@@ -59,6 +60,12 @@ jobs:
 
     # Kick off the job in amplify
     - name: Deploy Site
+      env:
+        APP_ID: ${{ inputs.APP_ID }}
+        APP_NAME: ${{ inputs.APP_NAME }}
+        REQUEST_TOKEN: ${{ secrets.REQUEST_TOKEN }}
+        REQUEST_MESSAGE: ${{ secrets.REQUEST_MESSAGE }}
+        ENDPOINT: ${{ secrets.ENDPOINT }}
       run: |
         HMAC_KEY=$(echo -n $REQUEST_MESSAGE | openssl dgst -sha256 -hmac "$REQUEST_TOKEN" -binary | od -An -tx1 | tr -d ' \n'; echo)
         SIGNATURE="sha256=$HMAC_KEY"
@@ -79,16 +86,19 @@ jobs:
       if: success()
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        APP_ID: ${{ inputs.APP_ID }}
+        APP_NAME: ${{ inputs.APP_NAME }}
       uses: actions/github-script@v6.4.1
       with:
         script: |
+          const fs = require('fs');
           const prNumber = fs.readFileSync('./pr/number', 'utf8');
           const issueNumber = parseInt(prNumber);
 
           await github.rest.issues.createComment({
             owner: context.repo.owner,
             repo: context.repo.repo,
-            issue_number: issue_number,
+            issue_number: issueNumber,
             body: `Your preview site for the **${APP_NAME}** will be ready in a few minutes, please allow time for it to build. \n \n Heres your preview link: \n [${APP_NAME} preview](https://${SANITIZED_BRANCH_NAME}.${APP_ID}.amplifyapp.com)`
           });