diff --git a/.github/workflows/comment-pr.yml b/.github/workflows/comment-pr.yml
new file mode 100644
index 00000000..7ff607ec
--- /dev/null
+++ b/.github/workflows/comment-pr.yml
@@ -0,0 +1,51 @@
+name: Comment on PR
+
+on:
+  workflow_run:
+    workflows: ["PR status checks"]
+    types: 
+      - completed
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    if: >
+      ${{ github.event.workflow_run.event == 'pull_request' && 
+          github.event.workflow_run.conclusion == 'success'
+       }}
+    steps:
+      - name: Download Artifact
+        uses: actions/github-script@v3
+        with:
+          script: |
+            let artifacts = await github.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: ${{ github.event.workflow_run.id }},
+            });
+            let artifact = artifacts.data.artifacts.filter(artifact => {
+              return artifact.name == "pr"
+            })[0];
+            let download = await github.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: artifact.id,
+                archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync('${{ github.workspace }}/pr.zip', Buffer.from(download.data));
+      - run: unzip pr.zip
+      - name: Comment on PR
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            let fs = require('fs');
+            let prNumber = Number(fs.readFileSync("./number"));
+            let statusCheck = fs.readFileSync("./status-check-output");
+            await github.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              body: '```' + statusCheck + '```',
+            });
\ No newline at end of file
diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml
index 46675ab7..33f4e990 100644
--- a/.github/workflows/status.yml
+++ b/.github/workflows/status.yml
@@ -1,12 +1,13 @@
 name: PR status checks
 on:
-  # This is so the status check can run on forks.
   pull_request_target:
     types: [assigned, opened, synchronize, reopened]
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions: 
+      contents: write
     strategy:
       matrix:
         node-version: [16.x]
@@ -37,15 +38,10 @@ jobs:
           output="${output//'%'/'%25'}"
           output="${output//$'\n'/'%0A'}"
           output="${output//$'\r'/'%0D'}"
-          echo "::set-output name=status_check_output::$output"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Auto Comment Status Check Result
-        # Use with caution
-        uses: bubkoo/auto-comment@v1
+          cat <<< "$output" > "./pr/status-check-output"
+          echo ${{ github.event.number }} > ./pr/number
+      - uses: actions/upload-artifact@v2
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          pullRequestSynchronize: "```${{ steps.status_check.outputs.status_check_output }}```"
-          pullRequestAssigned: "```${{ steps.status_check.outputs.status_check_output }}```"
-          pullRequestOpened: "```${{ steps.status_check.outputs.status_check_output }}```"
-          pullRequestReopened: "```${{ steps.status_check.outputs.status_check_output }}```"
+          name: pr
+          path: pr/
+          retention-days: 1