diff --git a/ci/scripts/detect-docker-updates.sh b/ci/scripts/detect-docker-updates.sh
index cc10b3dfd1..3d15719b56 100755
--- a/ci/scripts/detect-docker-updates.sh
+++ b/ci/scripts/detect-docker-updates.sh
@@ -9,7 +9,7 @@ fi
 
 title_prefix="Upgrade CI to Docker"
 milestone_number=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/milestones\?state\=open | jq -c --arg MILESTONE "$MILESTONE" '.[] | select(.title==$MILESTONE)' | jq -r '.number')
-existing_upgrade_issues=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/issues\?labels\=type:%20task\&state\=open\&creator\=spring-buildmaster\&milestone\=${milestone_number} | jq -c --arg TITLE_PREFIX "$title_prefix" '.[] | select(.title | startswith($TITLE_PREFIX))' )
+existing_upgrade_issues=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/issues\?labels\=type:%20task\&state\=open\&creator\=spring-builds\&milestone\=${milestone_number} | jq -c --arg TITLE_PREFIX "$title_prefix" '.[] | select(.title | startswith($TITLE_PREFIX))' )
 
 latest="https://download.docker.com/linux/static/stable/x86_64/docker-$latest_version.tgz"
 current=$( git-repo/ci/images/get-docker-url.sh )
diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh
index c435b9466c..d523da774f 100755
--- a/ci/scripts/detect-jdk-updates.sh
+++ b/ci/scripts/detect-jdk-updates.sh
@@ -51,7 +51,7 @@ if [[ ${milestone_result} = "null" || ${milestone_result} = "" ]]; then
 fi
 
 milestone_number=$( jq -r '.number' <<< "$milestone_result" )
-existing_tasks=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/issues\?labels\=type:%20task\&state\=open\&creator\=spring-buildmaster\&milestone\=${milestone_number} )
+existing_tasks=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/issues\?labels\=type:%20task\&state\=open\&creator\=spring-builds\&milestone\=${milestone_number} )
 existing_jdk_issues=$( jq -r -c --arg TITLE "$ISSUE_TITLE" '.[] | select(has("title")) | select(.title==$TITLE)' <<< "$existing_tasks" )
 
 if [[ ${existing_jdk_issues} = "" ]]; then
diff --git a/ci/scripts/detect-ubuntu-image-updates.sh b/ci/scripts/detect-ubuntu-image-updates.sh
index c44eab48c1..9557a5658f 100755
--- a/ci/scripts/detect-ubuntu-image-updates.sh
+++ b/ci/scripts/detect-ubuntu-image-updates.sh
@@ -12,7 +12,7 @@ if [[ $current = $latest ]]; then
 fi
 
 milestone_number=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/milestones\?state\=open | jq -c --arg MILESTONE "$MILESTONE" '.[] | select(.title==$MILESTONE)' | jq -r '.number')
-existing_tasks=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/issues\?labels\=type:%20task\&state\=open\&creator\=spring-buildmaster\&milestone\=${milestone_number} )
+existing_tasks=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/issues\?labels\=type:%20task\&state\=open\&creator\=spring-builds\&milestone\=${milestone_number} )
 existing_upgrade_issues=$( echo "$existing_tasks" | jq -c --arg TITLE "$ISSUE_TITLE" '.[] | select(.title==$TITLE)' )
 
 if [[ ${existing_upgrade_issues} = "" ]]; then
diff --git a/ci/scripts/stage.sh b/ci/scripts/stage.sh
index 94fc2d5006..bfc2690198 100755
--- a/ci/scripts/stage.sh
+++ b/ci/scripts/stage.sh
@@ -29,8 +29,8 @@ fi
 echo "Staging $stageVersion (next version will be $nextVersion)"
 sed -i "s/version=$snapshotVersion/version=$stageVersion/" gradle.properties
 
-git config user.name "Spring Buildmaster" > /dev/null
-git config user.email "spring-buildmaster@users.noreply.github.com" > /dev/null
+git config user.name "Spring Builds" > /dev/null
+git config user.email "spring-builds@users.noreply.github.com" > /dev/null
 git add gradle.properties > /dev/null
 git commit -m"Release v$stageVersion" > /dev/null
 git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
diff --git a/ci/scripts/update-homebrew-tap.sh b/ci/scripts/update-homebrew-tap.sh
index 6677e84253..591f595413 100755
--- a/ci/scripts/update-homebrew-tap.sh
+++ b/ci/scripts/update-homebrew-tap.sh
@@ -10,8 +10,8 @@ pushd updated-homebrew-tap-repo > /dev/null
   curl https://repo.spring.io/libs-release-local/org/springframework/boot/spring-boot-cli/${version}/spring-boot-cli-${version}-homebrew.rb --output spring-boot-cli-${version}-homebrew.rb 
   rm spring-boot.rb
   mv spring-boot-cli-*.rb spring-boot.rb
-  git config user.name "Spring Buildmaster" > /dev/null
-  git config user.email "spring-buildmaster@users.noreply.github.com" > /dev/null
+  git config user.name "Spring Builds" > /dev/null
+  git config user.email "spring-builds@users.noreply.github.com" > /dev/null
   git add spring-boot.rb > /dev/null
   git commit -m "Upgrade to Spring Boot ${version}" > /dev/null
   echo "DONE"