diff --git a/.changeset/stupid-dogs-call.md b/.changeset/stupid-dogs-call.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/stupid-dogs-call.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.github/workflows/pr-test.yaml b/.github/workflows/pr-test.yaml
index f17231ada58..5244fe3c16f 100644
--- a/.github/workflows/pr-test.yaml
+++ b/.github/workflows/pr-test.yaml
@@ -40,7 +40,7 @@ jobs:
           yarn install
 
       - name: Verify changesets
-        if: github.actor != 'janus-idp[bot]'
+        if: startsWith(github.ref_name, 'changeset-release/')
         run: |
           yarn changeset status --since=${{ github.event.pull_request.base.sha }}
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a62f399cfbb..f5cf73b1023 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -22,12 +22,6 @@ jobs:
     name: Release Packages
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
-        with:
-          # don't persist the GITHUB_TOKEN so the release can use use the generated token
-          persist-credentials: false
-
       - name: Generate token
         id: generate-token
         uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4 # v1.10.3
@@ -35,6 +29,11 @@ jobs:
           app-id: ${{ vars.JANUS_IDP_GITHUB_APP_ID }}
           private-key: ${{ secrets.JANUS_IDP_GITHUB_APP_PRIVATE_KEY }}
 
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+
       - name: Setup Node.js
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
         with:
diff --git a/.github/workflows/update-changeset-prs.yaml b/.github/workflows/update-changeset-prs.yaml
index 038c1a67bfc..9a1fc3d4b92 100644
--- a/.github/workflows/update-changeset-prs.yaml
+++ b/.github/workflows/update-changeset-prs.yaml
@@ -6,20 +6,40 @@ on:
       - 'changeset-release/**'
 
 jobs:
+  prev-commit:
+    name: Verify previous commit
+    runs-on: ubuntu-latest
+    outputs:
+      valid: ${{ steps.prev-commit.outputs.valid }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+
+      # We do not want an infinite loop; therefore, we are checking if the previous
+      # commit was created by this action.
+      - name: Get previous commit message
+        id: prev-commit
+        run: |
+          echo "valid=$(if [[ $(git log -1 --pretty=%B HEAD) != 'chore: update yarn.lock' ]]; then echo 'true'; else echo 'false'; fi)" >> $GITHUB_OUTPUT
+
   update-and-commit-files:
     name: Update and commit files
+    needs: prev-commit
+    if: needs.prev-commit.outputs.valid == 'true'
     runs-on: ubuntu-latest
 
-    permissions:
-      # Give the default GITHUB_TOKEN write permission to commit and push the changed files back to the repository.
-      contents: write
-
     steps:
+      - name: Generate token
+        id: generate-token
+        uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4 # v1.10.3
+        with:
+          app-id: ${{ vars.JANUS_IDP_GITHUB_APP_ID }}
+          private-key: ${{ secrets.JANUS_IDP_GITHUB_APP_PRIVATE_KEY }}
+
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
         with:
-          # Fetch the last 2 commits instead of just 1. (Fetching just 1 commit would overwrite the whole history)
-          fetch-depth: 2
+          token: ${{ steps.generate-token.outputs.token }}
 
       - name: Setup Node.js
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
@@ -31,17 +51,8 @@ jobs:
         # We want to commit the yarn.lock changes
         run: yarn install --no-immutable
 
-      - name: Get last commit message
-        id: last-commit
-        run: |
-          echo "message=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
-          echo "author=$(git log -1 --pretty=\"%an <%ae>\")" >> $GITHUB_OUTPUT
-
       - name: Amend previous commit
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_author: ${{ steps.last-commit.outputs.author }}
-          commit_message: ${{ steps.last-commit.outputs.message }}
-          commit_options: '--amend --no-edit'
-          push_options: '--force'
-          skip_fetch: true
+          commit_message: 'chore: update yarn.lock'
+          file_pattern: yarn.lock