diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 121fd42e..2b9c9a22 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: ahmadnassri/action-dependabot-auto-merge@v2.6
       with:
-        github-token: '${{ secrets.ROBOT_ROX_GITHUB_TOKEN }}'
+        github-token: '${{ secrets.RHACS_BOT_GITHUB_TOKEN }}'
         command: "squash and merge"
         approve: true
         target: minor
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a48ac31f..19faa163 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,12 +21,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          token: ${{ secrets.PAT }}
+          token: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }}
       - uses: chainguard-dev/actions/setup-gitsign@main
       - name: Setup git user
+        env:
+          GITHUB_USERNAME: ${{ secrets.RHACS_BOT_GITHUB_USERNAME }}
+          GITHUB_EMAIL: ${{ secrets.RHACS_BOT_GITHUB_EMAIL }}
         run: |
-          git config --global user.email "roxbot@stackrox.com"
-          git config --global user.name "Robot Rox"
+          git config --global user.email "${GITHUB_EMAIL}"
+          git config --global user.name "${GITHUB_USERNAME}"
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'