diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc
index 17783c7c066..4f947ab57ce 100644
--- a/CODE_OF_CONDUCT.adoc
+++ b/CODE_OF_CONDUCT.adoc
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 individual is representing the project or its community.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
-contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will
+contacting a project maintainer at spring-code-of-conduct@spring.io. All complaints will
 be reviewed and investigated and will result in a response that is deemed necessary and
 appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
 with regard to the reporter of an incident.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3857859a2e2..93e430897e8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ First off, thank you for taking the time to contribute! :+1: :tada:
 
 This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc).
 By participating you are expected to uphold this code.
-Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+Please report unacceptable behavior to spring-code-of-conduct@spring.io.
 
 ### How to Contribute
 
diff --git a/README.md b/README.md
index b9f9671488e..b3736166443 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Spring provides everything required beyond the Java programming language for cre
 
 ## Code of Conduct
 
-This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc). By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc). By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@spring.io.
 
 ## Access to Binaries
 
diff --git a/gradle/publications.gradle b/gradle/publications.gradle
index 86e0d2221c0..db0772caa4f 100644
--- a/gradle/publications.gradle
+++ b/gradle/publications.gradle
@@ -29,7 +29,7 @@ publishing {
 					developer {
 						id = "jhoeller"
 						name = "Juergen Hoeller"
-						email = "jhoeller@pivotal.io"
+						email = "juergen.hoeller@broadcom.com"
 					}
 				}
 				issueManagement {