diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml
index f196c1747..f8dc404e0 100644
--- a/.github/workflows/changelog-check.yml
+++ b/.github/workflows/changelog-check.yml
@@ -18,19 +18,15 @@ jobs:
 
       - name: Check for changelog updates
         run: |
-          git fetch origin ${{ github.base_ref }}
-          if ! git diff --name-only origin/${{ github.base_ref }}...HEAD | grep -q "docs/pages/resources/changelog.md"; then
+          git fetch origin next
+          if ! git diff --name-only origin/next...HEAD | grep -q "docs/pages/resources/changelog.md"; then
             echo "no_changelog=true" >> $GITHUB_ENV
           fi
 
       - name: Comment on PR
         if: env.no_changelog == 'true'
-        uses: actions/github-script@v7
+        uses: peter-evans/create-or-update-comment@v3
         with:
-          script: |
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.name,
-              issue_number: context.issue.number,
-              body: '❌ No changelog entry was found. Please add an entry to `docs/pages/resources/changelog.md`.'
-            })
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ❌ No changelog entry was found. Please add an entry to `docs/pages/resources/changelog.md`.