diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5b30b26114..e4425b248e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1000,3 +1000,4 @@ workflows:
             branches:
               only:
                 - master
+                - /release\/\d+\.\d+\.x$/
diff --git a/.circleci/scripts/cherry-picker.sh b/.circleci/scripts/cherry-picker.sh
index ac08a2acc2..6961e996e5 100755
--- a/.circleci/scripts/cherry-picker.sh
+++ b/.circleci/scripts/cherry-picker.sh
@@ -157,11 +157,12 @@ if echo "$resp" | jq -e '.items[].labels[] | select(.name | contains("docs-cherr
     fi
 fi
 
+git config --local user.email "github-team-consul-core@hashicorp.com"
+git config --local user.name "hc-github-team-consul-core"
+
 backport_failures=0
 # loop through all labels on the PR
 for label in $labels; do
-    git config --local user.email "github-team-consul-core@hashicorp.com"
-    git config --local user.name "hc-github-team-consul-core"
     status "checking label: $label"
     # if the label matches docs-cherrypick, it will attempt to cherry-pick to stable-website
     if [[ $label =~ docs-cherrypick ]]; then