diff --git a/.github/workflows/create_rc_pr.yml b/.github/workflows/create_rc_pr.yml
index 1176c4b26a6826..d01a508ab671c0 100644
--- a/.github/workflows/create_rc_pr.yml
+++ b/.github/workflows/create_rc_pr.yml
@@ -107,7 +107,7 @@ jobs:
               env:
                 MATRIX: ${{ matrix.value }}
               run: |
-                git config --global user.name "github-actions[bot]"
-                git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+                git config user.name "github-actions[bot]"
+                git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
                 git fetch
                 inv -e release.create-rc "$MATRIX" --slack-webhook=${{ secrets.AGENT_RELEASE_SYNC_SLACK_WEBHOOK }} --github-action
diff --git a/tasks/release.py b/tasks/release.py
index f178eb4d5fd856..73ba2e1e82a30e 100644
--- a/tasks/release.py
+++ b/tasks/release.py
@@ -433,6 +433,10 @@ def create_rc(ctx, release_branch, patch_version=False, upstream="origin", slack
     with agent_context(ctx, release_branch):
         github = GithubAPI(repository=GITHUB_REPO_NAME)
 
+        if github_action:
+            ctx.run("git config --global user.name 'github-actions[bot]'")
+            ctx.run("git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'")
+
         # Get the version of the highest major: useful for some logging & to get
         # the version to use for Go submodules updates
         new_highest_version = next_rc_version(ctx, major_version, patch_version)