diff --git a/templates/index.html b/templates/index.html
index abaeb828..c9a039d9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -466,7 +466,7 @@ <h3 class="p-heading--2">
     <div class="row">
       <div class="col-9 col-start-large-4">
         <div class="u-fixed-width"><hr class="p-rule"></div>
-        <p>Learn more about charms on <a href="http://discourse.charmhub.io">Discourse</a> and <a href="http://chat.charmhub.io">Mattermost</a></p>
+        <p>Learn more about charms on <a href="http://discourse.charmhub.io">Discourse</a> and <a href="https://matrix.to/#/#charmhub:ubuntu.com">Matrix</a></p>
       </div>
     </div>
   </section>
diff --git a/templates/partials/_navigation.html b/templates/partials/_navigation.html
index 2c2ab37a..25bc37a7 100644
--- a/templates/partials/_navigation.html
+++ b/templates/partials/_navigation.html
@@ -28,7 +28,7 @@
               <a href="https://discourse.charmhub.io/" class="p-navigation__dropdown-item">Discourse forum</a>
             </li>
             <li>
-              <a href="https://chat.charmhub.io" class="p-navigation__dropdown-item">Mattermost chat</a>
+              <a href="https://matrix.to/#/#charmhub:ubuntu.com" class="p-navigation__dropdown-item">Matrix chat</a>
             </li>
           </ul>
         </li>