diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ca5cab4073c8..226a796c46ed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ We do have a few guidelines in place to help you be successful with your contrib
 
 Here's a quick checklist for a good PR, more details below:
 
-1. [Keycloak Dev Mailing List](https://lists.jboss.org/mailman/listinfo/keycloak-dev)
+1. [Keycloak Dev Mailing List](https://groups.google.com/forum/#!forum/keycloak-dev)
 2. A JIRA associated with the PR
 3. One feature/change per PR
 4. One commit per PR
@@ -39,7 +39,7 @@ issues that are awaiting contributions in the
 ### Open a discussion on Keycloak Dev Mailing List
 
 As Keycloak is a community-driven project we require contributors to send a description of what they are planning to 
-work on to the [Keycloak Dev Mailing List](https://lists.jboss.org/mailman/listinfo/keycloak-dev).
+work on to the [Keycloak Dev Mailing List](https://groups.google.com/forum/#!forum/keycloak-dev).
 
 We recommend starting the discussion prior to submitting your PR. Through the mailing list you can get valuable
 feedback both from the core Keycloak team as well as the wider community.
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 4437cf556d90..78f54162e570 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -63,7 +63,7 @@ To become a maintainer, you need to demonstrate the following:
 * Ability to collaborate with the team
 * Helping the community
 
-A new maintainer must be proposed by sending an email to the [developer mailing list](https://lists.jboss.org/mailman/listinfo/keycloak-dev).
+A new maintainer must be proposed by sending an email to the [developer mailing list](https://groups.google.com/forum/#!forum/keycloak-dev).
 The email should include evidence of the above list.
 
 The existing maintainers will then discuss the proposal. If anyone objects or wants more information, the maintainers 
@@ -96,7 +96,7 @@ If the change has a bigger impact it has to follow the process for larger change
 ### Larger Changes
 
 For larger changes all maintainers and contributors should have a chance of reviewing the change. This is done by
-sending an email to the [developer mailing list](https://lists.jboss.org/mailman/listinfo/keycloak-dev) to start a
+sending an email to the [developer mailing list](https://groups.google.com/forum/#!forum/keycloak-dev) to start a
 discussion around the change.
 
 For new features we highly recommend creating a design proposal. There is no strict requirement of the content or layout,