diff --git a/.github/config.yml b/.github/config.yml
index dd96853821..4b98f97c0d 100644
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -4,7 +4,7 @@ newPRWelcomeComment: >
   <br>
   <br>
   A contributor will provide feedback soon.
-  Meanwhile, you can join the [chats](https://app.gitter.im/#/room/#jenkins-ci:matrix.org) and [community forums](https://community.jenkins.io/) to connect with other Jenkins users, developers, and maintainers.
+  Meanwhile, you can join the [chats](https://matrix.to/#/#jenkins-ci:matrix.org) and [community forums](https://community.jenkins.io/) to connect with other Jenkins users, developers, and maintainers.
 
 firstPRMergeComment: >
   Congratulations on getting your very first Jenkins core pull request merged 🎉🥳
@@ -14,7 +14,7 @@ firstPRMergeComment: >
   Thank you for your valuable input, and we look forward to seeing more of your contributions in the future!
   <br>
   <br>
-  We would like to invite you to join the [community chats](https://app.gitter.im/#/room/#jenkins-ci:matrix.org) and [forums](https://community.jenkins.io/) to meet other Jenkins contributors 😊
+  We would like to invite you to join the [community chats](https://matrix.to/#/#jenkins-ci:matrix.org) and [forums](https://community.jenkins.io/) to meet other Jenkins contributors 😊
   <br>
   Don't forget to check out the [participation](https://www.jenkins.io/participate/) page to learn more about how to contribute to Jenkins.
 
diff --git a/README.md b/README.md
index 2a198072a9..4febdbb1a5 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/jenkins/jenkins.svg)](https://hub.docker.com/r/jenkins/jenkins/)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3538/badge)](https://bestpractices.coreinfrastructure.org/projects/3538)
 [![Reproducible Builds](https://img.shields.io/badge/Reproducible_Builds-ok-green)](https://maven.apache.org/guides/mini/guide-reproducible-builds.html)
-[![Gitter](https://img.shields.io/gitter/room/jenkinsci/jenkins)](https://app.gitter.im/#/room/#jenkinsci_jenkins:gitter.im)
+[![Gitter](https://img.shields.io/gitter/room/jenkinsci/jenkins)](https://matrix.to/#/#jenkinsci_jenkins:gitter.im)
 
 ---
 
@@ -74,7 +74,7 @@ New to open source or Jenkins? Here’s how to get started:
 
 - Read the [Contribution Guidelines](CONTRIBUTING.md)
 - Check our [good first issues](https://github.com/jenkinsci/jenkins/issues?q=is%3Aissue%20is%3Aopen%20label%3A%22good%20first%20issue%22)
-- Join our [Gitter chat](https://app.gitter.im/#/room/#jenkinsci_newcomer-contributors:gitter.im) for questions and help
+- Join our [Gitter chat](https://matrix.to/#/#jenkinsci_newcomer-contributors:gitter.im) for questions and help
 
 For more information about participating in the community and contributing to the Jenkins project,
 see [this page](https://www.jenkins.io/participate/).