diff --git a/.github/workflows/composer-diff.yml b/.github/workflows/composer-diff.yml
index 3bfdb4fcd..baa7e0b07 100644
--- a/.github/workflows/composer-diff.yml
+++ b/.github/workflows/composer-diff.yml
@@ -1,7 +1,6 @@
 name: Composer Diff
 on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
+  pull_request:
     paths:
       - composer.lock
 permissions:
@@ -9,16 +8,29 @@ permissions:
   contents: read
 
 jobs:
-  comment-composer-lock-diff:
-    name: Comment composer.lock diff
+  composer-diff:
+    name: Composer Diff
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
-      - name: Comment composer.lock diff
-        uses: WyriHaximus/github-action-composer.lock-diff@v1
+
+      - name: Generate composer diff
+        id: composer_diff
+        uses: IonBazan/composer-diff-action@v1
+
+      - uses: marocchino/sticky-pull-request-comment@v2
+        if: ${{ steps.composer_diff.outputs.composer_diff_exit_code != 0 }}
+        with:
+          header: composer-diff
+          message: |
+            <details>
+            <summary>Composer package changes</summary>
+
+            ${{ steps.composer_diff.outputs.composer_diff }}
+
+            </details>
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}