diff --git a/.github/workflows/artifact-links.yml b/.github/workflows/artifact-links.yml
deleted file mode 100644
index daaee47b79..0000000000
--- a/.github/workflows/artifact-links.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Artifacts links comment creator
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-
-jobs:
-  artifacts-url-comments:
-    name: Add artifacts links
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Add artifacts links to comments.
-        uses: tonyhallett/artifacts-url-comments@v1.1.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          prefix: "Compiled HEX from this Pull-Request"
-          suffix: "WARNING: No warranty or guarantee of any kind. Test/Fly at your own risk!"
-          format: name
-          addTo: pull
diff --git a/.github/workflows/hide-artifact-links.yml b/.github/workflows/hide-artifact-links.yml
index f45a107b08..99f95acd79 100644
--- a/.github/workflows/hide-artifact-links.yml
+++ b/.github/workflows/hide-artifact-links.yml
@@ -13,5 +13,4 @@ jobs:
         uses: int128/hide-comment-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          authors: "github-actions"
-          starts-with: "Compiled HEX from this Pull-Request"
+          contains: "Compiled HEX from this Pull-Request. WARNING: No warranty or guarantee of any kind. Test/Fly at your own risk!"
diff --git a/.github/workflows/link-PR-artifacts.yml b/.github/workflows/link-PR-artifacts.yml
new file mode 100644
index 0000000000..2d310b63d5
--- /dev/null
+++ b/.github/workflows/link-PR-artifacts.yml
@@ -0,0 +1,49 @@
+name: Link PR Artifacts
+
+on:
+  workflow_run:
+    workflows: [Upload PR Artifacts]
+    types:
+      - completed
+
+jobs:
+  download:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Download artifact'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "pr_number"
+            })[0];
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/pr_number.zip`, Buffer.from(download.data));
+
+      - name: 'Unzip artifact'
+        run: unzip pr_number.zip
+
+      - name: 'Comment on PR'
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            let fs = require('fs');
+            let issue_number = Number(fs.readFileSync('./pr_number'));
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: issue_number,
+              body: "Compiled HEX from this Pull-Request. WARNING: No warranty or guarantee of any kind. Test/Fly at your own risk!"
+            });
diff --git a/.github/workflows/upload-PR-artifacts.yml b/.github/workflows/upload-PR-artifacts.yml
new file mode 100644
index 0000000000..9b573ddd33
--- /dev/null
+++ b/.github/workflows/upload-PR-artifacts.yml
@@ -0,0 +1,20 @@
+name: Upload PR Artifacts
+
+on:
+  pull_request:
+
+jobs:
+  upload:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Save PR number
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+        run: |
+          mkdir -p ./pr
+          echo $PR_NUMBER > ./pr/pr_number
+      - uses: actions/upload-artifact@v4
+        with:
+          name: pr_number
+          path: pr/