diff --git a/_includes/masthead-community.html b/_includes/masthead-community.html
index 1d5f4912a7..9b76636212 100644
--- a/_includes/masthead-community.html
+++ b/_includes/masthead-community.html
@@ -17,15 +17,15 @@ <h4><a href="{{forum.url}}">{{forum.title}}</a></h4>
 						{% endfor %}
 					</ul>
 				</div>
-				<div class="gitter">
-					<h3>Gitter</h3>
-					<span>Real-time (topic-specialized) chat</span>
+				<div class="discord">
+					<h3>Chat</h3>
+					<span>Real-time chat on Discord</span>
 					<ul>
-						{% for channel in site.data.chats-forums.gitterChannels %}
+						{% for server in site.data.chats-forums.discordServers %}
 							<li>
-								<a href="{{channel.url}}">
-									<img src="{{ site.baseurl }}/resources/img/frontpage/gitter-logo.png" alt="{{channel.name}}">
-									<h4>{{channel.name}}</h4>
+								<a href="{{server.url}}">
+									<img src="{{ site.baseurl }}/resources/img/frontpage/discord-logo.png" alt="{{server.name}}">
+									<h4>{{server.name}}</h4>
 								</a>
 							</li>
 						{% endfor %}
@@ -34,4 +34,4 @@ <h4>{{channel.name}}</h4>
 			</div>
 		</div>
 	</div>
-</section>
\ No newline at end of file
+</section>
diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html
index 743e27bd83..29fa5825fe 100644
--- a/_layouts/frontpage.html
+++ b/_layouts/frontpage.html
@@ -299,24 +299,24 @@ <h4>{{forum.title}}</h4>
         </a>
       {% endfor %}
     </div>
-    <div class="gitter">
-      <h3>Real-time (topic-specialized) chat</h3>
-      {% assign modLimit = site.data.chats-forums.gitterChannels.size | modulo: 2 %}
+    <div class="discord">
+      <h3>Real-time chat</h3>
+      {% assign modLimit = site.data.chats-forums.discordServers.size | modulo: 2 %}
       {% capture channelLimit %}
         {% if modLimit != 0 %}
-          {{site.data.chats-forums.gitterChannels.size | minus: 1}}
+          {{site.data.chats-forums.discordServers.size | minus: 1}}
         {% else %}
-          {{site.data.chats-forums.gitterChannels.size}}
+          {{site.data.chats-forums.discordServers.size}}
         {% endif %}
       {% endcapture %}
-      {% for channel in site.data.chats-forums.gitterChannels limit: channelLimit %}
+      {% for server in site.data.chats-forums.discordServers limit: channelLimit %}
         {% if forloop.first %}
           <ul class="first">
         {% endif %}
         <li>
-          <a href="{{channel.url}}">
-            <img src="{{ site.baseurl }}/resources/img/frontpage/gitter-logo.png" alt="">
-            <span>{{channel.name}}</span>
+          <a href="{{server.url}}">
+            <img src="{{ site.baseurl }}/resources/img/frontpage/discord-logo.png" alt="">
+            <span>{{server.name}}</span>
           </a>
         </li>
 
diff --git a/_overviews/FAQ/index.md b/_overviews/FAQ/index.md
index 42f5406a90..fc9f4a10c1 100644
--- a/_overviews/FAQ/index.md
+++ b/_overviews/FAQ/index.md
@@ -33,8 +33,8 @@ especially popular, well-known books.
 We don't have a list of all the Scala books that
 are out there; there are many.
 
-You can go on the [Scala room on
-Gitter](https://gitter.im/scala/scala) or another community forum and
+You can go on the \#scala-users room [on
+Discord](https://discord.com/invite/scala) or another community forum and
 ask for book recommendations. You'll get more helpful
 answers if you provide some information about your background and your
 reasons for wanting to learn Scala.
@@ -55,8 +55,8 @@ way.  In time, there will be more and more Scala 3 jobs as well.
 
 This is addressed on our [Community page](https://scala-lang.org/community/#scala-jobs).
 
-In short, the only officially sanctioned place is the [scala/job-board
-room on Gitter](https://gitter.im/scala/job-board).
+In short, the only officially sanctioned place is the \#jobs channel
+[on Discord](https://discord.com/invite/scala).
 
 ### Who's behind Scala?
 
diff --git a/_overviews/scala3-scaladoc/settings.md b/_overviews/scala3-scaladoc/settings.md
index 5408585942..d490f82043 100644
--- a/_overviews/scala3-scaladoc/settings.md
+++ b/_overviews/scala3-scaladoc/settings.md
@@ -87,7 +87,7 @@ A mapping is of the form '\<regex>::\[scaladoc3|scaladoc|javadoc]::\<path>'. You
 
 Links to social sites. For example:
 
-`-social-links:github::https://github.com/lampepfl/dotty,gitter::https://gitter.im/scala/scala,twitter::https://twitter.com/scala_lang`
+`-social-links:github::https://github.com/lampepfl/dotty,discord::https://discord.com/invite/scala,twitter::https://twitter.com/scala_lang`
 
 Valid values are of the form: '\[github|twitter|gitter|discord]::link'. Scaladoc also supports 'custom::link::white_icon_name::black_icon_name'. In this case icons must be present in 'images/' directory.
 
diff --git a/_sass/layout/table-of-content.scss b/_sass/layout/table-of-content.scss
index 5dca9f7945..642244d0c1 100755
--- a/_sass/layout/table-of-content.scss
+++ b/_sass/layout/table-of-content.scss
@@ -109,7 +109,7 @@
     @include clearfix;
     padding-bottom: $padding-small;
     .discourse,
-    .gitter {
+    .discord {
         h3 {
             margin-top: 0;
         }
@@ -168,7 +168,7 @@
         }
     }
 
-    .gitter {
+    .discord {
       ul {
         li {
           @include span-columns(3 of 6);
diff --git a/_sass/layout/talk-to-us.scss b/_sass/layout/talk-to-us.scss
index ca83f9676e..94c6a147e3 100755
--- a/_sass/layout/talk-to-us.scss
+++ b/_sass/layout/talk-to-us.scss
@@ -25,7 +25,7 @@
     }
 
     .discourse,
-    .gitter {
+    .discord {
         margin-bottom: 50px;
         @include clearfix;
     }
@@ -76,7 +76,7 @@
         }
     }
 
-    .gitter {
+    .discord {
         ul.first {
             @include shift(2);
 
diff --git a/_sips/sip-template.md b/_sips/sip-template.md
index b3caf4e276..07668523a8 100644
--- a/_sips/sip-template.md
+++ b/_sips/sip-template.md
@@ -110,10 +110,8 @@ process anyway so it's better to get them out up front.
 2. [API Documentation][2]
 3. [Academic/Research papers/supporting material][3]
 4. [Alternative Libraries/Implementations][4]
-5. [Discussion forum/post/gitter/IRC][5]
 
 [1]: https://github.com "GitHub"
 [2]: https://www.scala-lang.org/api/ "Scaladoc"
 [3]: https://en.wikipedia.org/wiki/Academic_publishing "Academic/Research"
 [4]: https://github.com/dogescript/dogescript "Alternatives"
-[5]: https://gitter.im "Gitter"
diff --git a/contribute.md b/contribute.md
index 471ab85a3c..1abb5e539c 100644
--- a/contribute.md
+++ b/contribute.md
@@ -69,7 +69,7 @@ The goal of this documentation repository is to be tighter and more organized th
 - **be polished** it must be thorough, complete, correct, organized, and "article-like" (personal programming notes don't quite fit.)
 - **be maintained** if the document might require revisions from time to time, it should come with an owner
 
-If you have something you're thinking about contributing, or that you're thinking about writing in order to contribute-- we'd love to consider it! Please don't hesitate to use GitHub issues and pull requests and the [scala/contributors room](https://gitter.im/scala/contributors) on Gitter for any questions, concerns, clarifications, etc.
+If you have something you're thinking about contributing, or that you're thinking about writing in order to contribute-- we'd love to consider it! Please don't hesitate to use GitHub issues and pull requests and the \#scala-contributors room [on Discord](https://discord.com/invite/scala) for any questions, concerns, clarifications, etc.
 
 ## Document Templates
 
diff --git a/resources/img/frontpage/discord-logo.png b/resources/img/frontpage/discord-logo.png
new file mode 100644
index 0000000000..c055c19c6c
Binary files /dev/null and b/resources/img/frontpage/discord-logo.png differ
diff --git a/resources/img/frontpage/gitter-logo.png b/resources/img/frontpage/gitter-logo.png
deleted file mode 100644
index ff91a264d4..0000000000
Binary files a/resources/img/frontpage/gitter-logo.png and /dev/null differ
diff --git a/scala3/scaladoc.md b/scala3/scaladoc.md
index fca1ba9593..69c307654e 100644
--- a/scala3/scaladoc.md
+++ b/scala3/scaladoc.md
@@ -35,7 +35,7 @@ Blog posts are a specific type of static sites. In the Scaladoc manual you can f
 
 ### Social links
 
-Furthermore, Scaladoc provides an easy way to configure your [social media links][social-links] e.g. Twitter or Gitter.
+Furthermore, Scaladoc provides an easy way to configure your [social media links][social-links] e.g. Twitter or Discord.
 
 ![](../resources/images/scala3/scaladoc/social-links.png){: style="width: 180px"}