diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index d9019512..f7d3883c 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -148,7 +148,7 @@ jobs:
       - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 #v3.2.0
         id: pmd-actions-helper-app-token
         with:
-          app-id: ${{ secrets.PMD_ACTIONS_HELPER_ID }}
+          client-id: ${{ secrets.PMD_ACTIONS_HELPER_CLIENT_ID }}
           private-key: ${{ secrets.PMD_ACTIONS_HELPER_PRIVATE_KEY }}
           owner: pmd
           repositories: pmd-eclipse-plugin
@@ -232,7 +232,7 @@ jobs:
       - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 #v3.2.0
         id: pmd-actions-helper-app-token
         with:
-          app-id: ${{ secrets.PMD_ACTIONS_HELPER_ID }}
+          client-id: ${{ secrets.PMD_ACTIONS_HELPER_CLIENT_ID }}
           private-key: ${{ secrets.PMD_ACTIONS_HELPER_PRIVATE_KEY }}
           owner: pmd
           repositories: pmd-eclipse-plugin-p2-site
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
index ba398a06..5c59dab4 100644
--- a/.github/workflows/publish-snapshot.yml
+++ b/.github/workflows/publish-snapshot.yml
@@ -180,7 +180,7 @@ jobs:
       - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 #v3.2.0
         id: pmd-actions-helper-app-token
         with:
-          app-id: ${{ secrets.PMD_ACTIONS_HELPER_ID }}
+          client-id: ${{ secrets.PMD_ACTIONS_HELPER_CLIENT_ID }}
           private-key: ${{ secrets.PMD_ACTIONS_HELPER_PRIVATE_KEY }}
           owner: pmd
           repositories: pmd-eclipse-plugin-p2-site
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 3a8d7a3b..924f0cc4 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -16,6 +16,7 @@ This is a minor release.
 ### 🐛 Fixed Issues
 
 ### ✨ Merged pull requests
+* [#430](https://github.com/pmd/pmd-eclipse-plugin/pull/430): chore: Use client-id for create-github-app-token - [Andreas Dangel](https://github.com/adangel) (@adangel)
 * [#431](https://github.com/pmd/pmd-eclipse-plugin/pull/431): chore: Improve logging during tests at waitForPMDJobs - [Andreas Dangel](https://github.com/adangel) (@adangel)
 * [#432](https://github.com/pmd/pmd-eclipse-plugin/pull/432): refactor: Remove custom JavaProject cache - [Andreas Dangel](https://github.com/adangel) (@adangel)