diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 2e492e48c19..44fe78004d0 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,12 +1,13 @@
 <!--
-    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+    ESLint adheres to the Open JS Foundation Code of Conduct:
+    https://eslint.org/conduct
 
     This template is for bug reports. If you are here for another reason, please see below:
 
     1. To propose a new rule: https://eslint.org/docs/developer-guide/contributing/new-rules
     2. To request a rule change: https://eslint.org/docs/developer-guide/contributing/rule-changes
     3. To request a change that is not a bug fix, rule change, or new rule: https://eslint.org/docs/developer-guide/contributing/changes
-    4. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
+    4. If you have any questions, please stop by our chatroom: https://eslint.org/chat
 
     Note that leaving sections blank will make it difficult for us to troubleshoot and we may have to close the issue.
 -->
@@ -50,4 +51,3 @@
 **What did you expect to happen?**
 
 **What actually happened? Please include the actual, raw output from ESLint.**
-
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index dd7c10d1406..175871510d7 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -8,18 +8,20 @@ assignees: ''
 ---
 
 <!--
-    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+    ESLint adheres to the Open JS Foundation Code of Conduct:
+    https://eslint.org/conduct
 
     This template is for bug reports. If you are here for another reason, please see below:
 
     1. To propose a new rule: https://eslint.org/docs/developer-guide/contributing/new-rules
     2. To request a rule change: https://eslint.org/docs/developer-guide/contributing/rule-changes
     3. To request a change that is not a bug fix, rule change, or new rule: https://eslint.org/docs/developer-guide/contributing/changes
-    4. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
+    4. If you have any questions, please stop by our chatroom: https://eslint.org/chat
 
     Note that leaving sections blank will make it difficult for us to troubleshoot and we may have to close the issue.
 -->
 
+
 **Tell us about your environment**
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/CHANGE.md b/.github/ISSUE_TEMPLATE/CHANGE.md
index 6cf64254222..ef8437a4ef6 100644
--- a/.github/ISSUE_TEMPLATE/CHANGE.md
+++ b/.github/ISSUE_TEMPLATE/CHANGE.md
@@ -8,18 +8,21 @@ assignees: ''
 ---
 
 <!--
-    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+    ESLint adheres to the Open JS Foundation Code of Conduct:
+    https://eslint.org/conduct
 
     This template is for requesting a change that is not a bug fix, rule change, or new rule. If you are here for another reason, please see below:
 
     1. To report a bug: https://eslint.org/docs/developer-guide/contributing/reporting-bugs
     2. To request a rule change: https://eslint.org/docs/developer-guide/contributing/rule-changes
     3. To propose a new rule: https://eslint.org/docs/developer-guide/contributing/new-rules
-    4. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
+    4. If you have any questions, please stop by our chatroom: https://eslint.org/chat
 
     Note that leaving sections blank will make it difficult for us to troubleshoot and we may have to close the issue.
 -->
 
+
+
 **The version of ESLint you are using.**
 
 
diff --git a/.github/ISSUE_TEMPLATE/NEW_RULE.md b/.github/ISSUE_TEMPLATE/NEW_RULE.md
index 598e89c0f9a..86809ba1c16 100644
--- a/.github/ISSUE_TEMPLATE/NEW_RULE.md
+++ b/.github/ISSUE_TEMPLATE/NEW_RULE.md
@@ -8,18 +8,20 @@ assignees: ''
 ---
 
 <!--
-    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+    ESLint adheres to the Open JS Foundation Code of Conduct:
+    https://eslint.org/conduct
 
     This template is for new rule proposals. If you are proposing a new rule, please continue on. If you are here for another reason, please see below:
 
     1. To report a bug: https://eslint.org/docs/developer-guide/contributing/reporting-bugs
     2. To request a rule change: https://eslint.org/docs/developer-guide/contributing/rule-changes
     3. To request a change that is not a bug fix, rule change, or new rule: https://eslint.org/docs/developer-guide/contributing/changes
-    4. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
+    4. If you have any questions, please stop by our chatroom: https://eslint.org/chat
 
     Note that leaving sections blank will make it difficult for us to troubleshoot and we may have to close the issue.
 -->
 
+
 **Please describe what the rule should do:**
 
 **What category of rule is this? (place an "X" next to just one item)**
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md
index 375e2170ac9..cbcfec68239 100644
--- a/.github/ISSUE_TEMPLATE/QUESTION.md
+++ b/.github/ISSUE_TEMPLATE/QUESTION.md
@@ -1,6 +1,6 @@
 ---
 name: "⛔ Question"
-about: Please go to https://gitter.im/eslint/eslint
+about: Please go to https://eslint.org/chat
 title: ''
 labels: ''
 assignees: ''
@@ -8,13 +8,13 @@ assignees: ''
 ---
 
 <!--
-    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
-
+    ESLint adheres to the Open JS Foundation Code of Conduct:
+    https://eslint.org/conduct
 
     Please do not use GitHub for asking questions. Instead,
     please visit our chatroom:
 
-        https://gitter.im/eslint/eslint
+        https://eslint.org/chat
 
     Or our mailing list:
 
diff --git a/.github/ISSUE_TEMPLATE/RULE_CHANGE.md b/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
index d735010f60d..ced29fac37b 100644
--- a/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
+++ b/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
@@ -8,18 +8,20 @@ assignees: ''
 ---
 
 <!--
-    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+    ESLint adheres to the Open JS Foundation Code of Conduct:
+    https://eslint.org/conduct
 
     This template is for requesting a rule change. If you are here for another reason, please see below:
 
     1. To report a bug: https://eslint.org/docs/developer-guide/contributing/reporting-bugs
     2. To propose a new rule: https://eslint.org/docs/developer-guide/contributing/new-rules
     3. To request a change that is not a bug fix, rule change, or new rule: https://eslint.org/docs/developer-guide/contributing/changes
-    4. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
+    4. If you have any questions, please stop by our chatroom: https://eslint.org/chat
 
     Note that leaving sections blank will make it difficult for us to troubleshoot and we may have to close the issue.
 -->
 
+
 **What rule do you want to change?**
 
 **Does this change cause the rule to produce more or fewer warnings?**
diff --git a/.github/ISSUE_TEMPLATE/SECURITY.md b/.github/ISSUE_TEMPLATE/SECURITY.md
index c04f525365a..d69aa7f8c10 100644
--- a/.github/ISSUE_TEMPLATE/SECURITY.md
+++ b/.github/ISSUE_TEMPLATE/SECURITY.md
@@ -8,7 +8,8 @@ assignees: ''
 ---
 
 <!--
-    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+    ESLint adheres to the Open JS Foundation Code of Conduct:
+    https://eslint.org/conduct
 
 
     STOP! Please do not use GitHub for filing security issues.
diff --git a/README.md b/README.md
index 14a0b5c377e..28a885d84d2 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
 <br />
 [![Open Collective Backers](https://img.shields.io/opencollective/backers/eslint)](https://opencollective.com/eslint)
 [![Open Collective Sponsors](https://img.shields.io/opencollective/sponsors/eslint)](https://opencollective.com/eslint)
-[![Join the chat at https://gitter.im/eslint/eslint](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/eslint/eslint?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Follow us on Twitter](https://img.shields.io/twitter/follow/geteslint?label=Follow&style=social)](https://twitter.com/intent/user?screen_name=geteslint)
 
 # ESLint
@@ -18,7 +17,7 @@
 [Code of Conduct](https://js.foundation/community/code-of-conduct) |
 [Twitter](https://twitter.com/geteslint) |
 [Mailing List](https://groups.google.com/group/eslint) |
-[Chat Room](https://gitter.im/eslint/eslint)
+[Chat Room](https://eslint.org/chat)
 
 ESLint is a tool for identifying and reporting on patterns found in ECMAScript/JavaScript code. In many ways, it is similar to JSLint and JSHint with a few exceptions:
 
@@ -134,7 +133,7 @@ Once a language feature has been adopted into the ECMAScript standard (stage 4 a
 
 ### Where to ask for help?
 
-Join our [Mailing List](https://groups.google.com/group/eslint) or [Chatroom](https://gitter.im/eslint/eslint).
+Join our [Mailing List](https://groups.google.com/group/eslint) or [Chatroom](https://eslint.org/chat).
 
 ## <a name="releases"></a>Releases
 
diff --git a/SUPPORT.md b/SUPPORT.md
index 08942601a15..1eb428dd9f9 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -1 +1 @@
-If you have a question about how to use ESLint, please ask it in our [Gitter channel](https://gitter.im/eslint/eslint).
+If you have a question about how to use ESLint, please ask it in our [chatroom](https://eslint.org/chat).
diff --git a/docs/developer-guide/contributing/changes.md b/docs/developer-guide/contributing/changes.md
index 6b5f1590107..3c13051c39c 100644
--- a/docs/developer-guide/contributing/changes.md
+++ b/docs/developer-guide/contributing/changes.md
@@ -14,4 +14,4 @@ If you're requesting a change to a rule, it's helpful to include this informatio
 
 Please include as much detail as possible to help us properly address your issue. If we need to triage issues and constantly ask people for more detail, that's time taken away from actually fixing issues. Help us be as efficient as possible by including a lot of detail in your issues.
 
-**Note:** If you just have a question that won't necessarily result in a change to ESLint, such as asking how something works or how to contribute, please use the [mailing list](https://groups.google.com/group/eslint) or [chat](https://gitter.im/eslint/eslint) instead of filing an issue.
+**Note:** If you just have a question that won't necessarily result in a change to ESLint, such as asking how something works or how to contribute, please use the [mailing list](https://groups.google.com/group/eslint) or [chat](https://eslint.org/chat) instead of filing an issue.
diff --git a/docs/developer-guide/contributing/reporting-bugs.md b/docs/developer-guide/contributing/reporting-bugs.md
index 81f5e8562e7..4dd0da02f08 100644
--- a/docs/developer-guide/contributing/reporting-bugs.md
+++ b/docs/developer-guide/contributing/reporting-bugs.md
@@ -4,4 +4,4 @@ If you think you've found a bug in ESLint, please [create a new issue](https://g
 
 Please include as much detail as possible to help us properly address your issue. If we need to triage issues and constantly ask people for more detail, that's time taken away from actually fixing issues. Help us be as efficient as possible by including a lot of detail in your issues.
 
-**Note:** If you just have a question that won't necessarily result in a change to ESLint, such as asking how something works or how to contribute, please use the [mailing list](https://groups.google.com/group/eslint) or [chat](https://gitter.im/eslint/eslint) instead of filing an issue.
+**Note:** If you just have a question that won't necessarily result in a change to ESLint, such as asking how something works or how to contribute, please use the [mailing list](https://groups.google.com/group/eslint) or [chat](https://eslint.org/chat) instead of filing an issue.
diff --git a/docs/maintainer-guide/governance.md b/docs/maintainer-guide/governance.md
index b393d194452..06280a5b14e 100644
--- a/docs/maintainer-guide/governance.md
+++ b/docs/maintainer-guide/governance.md
@@ -48,7 +48,7 @@ A Committer who shows an above-average level of contribution to the project, par
 1. Send email congratulating the new committer and confirming that they would like to accept. This should also outline the responsibilities of a committer with a link to the maintainer guide.
 1. Add the GitHub user to the "ESLint Team" team
 1. Add committer email to the ESLint team mailing list
-1. Invite to Gitter team chatroom
+1. Invite to Discord team channel
 1. Tweet congratulations to the new committer from the ESLint Twitter account
 
 ### Reviewers
@@ -113,7 +113,7 @@ A Reviewer is invited to become a TSC member by existing TSC members. A nominati
 1. Add the GitHub user to the "ESLint TSC" GitHub team
 1. Set the GitHub user to be have the "Owner" role for the ESLint organization
 1. Send a welcome email with a link to the [maintainer guide](./) and the [npm 2FA guide](./npm-2fa).
-1. Invite to the Gitter TSC chatroom
+1. Invite to the Discord TSC channel
 1. Make the TSC member an admin on the ESLint team mailing list
 1. Add the TSC member to the recurring TSC meeting event on Google Calendar
 1. Add the TSC member as an admin to ESLint Twitter Account on Tweetdeck
@@ -122,8 +122,7 @@ A Reviewer is invited to become a TSC member by existing TSC members. A nominati
 
 #### TSC Meetings
 
-The TSC meets every other week in the [TSC Meeting](https://gitter.im/eslint/tsc-meetings) chatroom. The meeting is run by
-a designated moderator approved by the TSC.
+The TSC meets every other week in the TSC Meeting [Discord](https://eslint.org/chat) channel. The meeting is run by a designated moderator approved by the TSC.
 
 Items are added to the TSC agenda which are considered contentious or
 are modifications of governance, contribution policy, TSC membership,
diff --git a/messages/extend-config-missing.txt b/messages/extend-config-missing.txt
index 0411819ec4e..f7c5f71ebe3 100644
--- a/messages/extend-config-missing.txt
+++ b/messages/extend-config-missing.txt
@@ -2,4 +2,4 @@ ESLint couldn't find the config "<%- configName %>" to extend from. Please check
 
 The config "<%- configName %>" was referenced from the config file in "<%- importerName %>".
 
-If you still have problems, please stop by https://gitter.im/eslint/eslint to chat with the team.
+If you still have problems, please stop by https://eslint.org/chat to chat with the team.
diff --git a/messages/no-config-found.txt b/messages/no-config-found.txt
index 348f6dcd25f..f1f7beb63b1 100644
--- a/messages/no-config-found.txt
+++ b/messages/no-config-found.txt
@@ -4,4 +4,4 @@ ESLint couldn't find a configuration file. To set up a configuration file for th
 
 ESLint looked for configuration files in <%= directoryPath %> and its ancestors. If it found none, it then looked in your home directory.
 
-If you think you already have a configuration file or if you need more help, please stop by the ESLint chat room: https://gitter.im/eslint/eslint
+If you think you already have a configuration file or if you need more help, please stop by the ESLint chat room: https://eslint.org/chat
diff --git a/messages/plugin-conflict.txt b/messages/plugin-conflict.txt
index 6fcf7c83115..f8b60631c58 100644
--- a/messages/plugin-conflict.txt
+++ b/messages/plugin-conflict.txt
@@ -4,4 +4,4 @@ ESLint couldn't determine the plugin "<%- pluginId %>" uniquely.
 
 Please remove the "plugins" setting from either config or remove either plugin installation.
 
-If you still can't figure out the problem, please stop by https://gitter.im/eslint/eslint to chat with the team.
+If you still can't figure out the problem, please stop by https://eslint.org/chat to chat with the team.
diff --git a/messages/plugin-missing.txt b/messages/plugin-missing.txt
index 32e9f0ae5de..3d376733085 100644
--- a/messages/plugin-missing.txt
+++ b/messages/plugin-missing.txt
@@ -8,4 +8,4 @@ It's likely that the plugin isn't installed correctly. Try reinstalling by runni
 
 The plugin "<%- pluginName %>" was referenced from the config file in "<%- importerName %>".
 
-If you still can't figure out the problem, please stop by https://gitter.im/eslint/eslint to chat with the team.
+If you still can't figure out the problem, please stop by https://eslint.org/chat to chat with the team.
diff --git a/messages/whitespace-found.txt b/messages/whitespace-found.txt
index eea4efccedb..7d72149a8fd 100644
--- a/messages/whitespace-found.txt
+++ b/messages/whitespace-found.txt
@@ -1,3 +1,3 @@
 ESLint couldn't find the plugin "<%- pluginName %>". because there is whitespace in the name. Please check your configuration and remove all whitespace from the plugin name.
 
-If you still can't figure out the problem, please stop by https://gitter.im/eslint/eslint to chat with the team.
+If you still can't figure out the problem, please stop by https://eslint.org/chat to chat with the team.
diff --git a/packages/eslint-config-eslint/README.md b/packages/eslint-config-eslint/README.md
index d1c3dd0cb85..fb3027fb62f 100644
--- a/packages/eslint-config-eslint/README.md
+++ b/packages/eslint-config-eslint/README.md
@@ -1,9 +1,8 @@
 [![NPM version][npm-image]][npm-url]
-[![Join the chat at https://gitter.im/eslint/eslint](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/eslint/eslint?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # ESLint Configuration
 
-[Website](https://eslint.org) | [Configuring](https://eslint.org/docs/user-guide/configuring) | [Rules](https://eslint.org/docs/rules/) | [Contributing](https://eslint.org/docs/developer-guide/contributing) | [Twitter](https://twitter.com/geteslint) | [Mailing List](https://groups.google.com/group/eslint)
+[Website](https://eslint.org) | [Configuring](https://eslint.org/docs/user-guide/configuring) | [Rules](https://eslint.org/docs/rules/) | [Contributing](https://eslint.org/docs/developer-guide/contributing) | [Twitter](https://twitter.com/geteslint) | [Mailing List](https://groups.google.com/group/eslint) | [Chatroom](https://eslint.org/chat)
 
 Contains the ESLint configuration used for projects maintained by the ESLint team.
 
@@ -29,7 +28,7 @@ In your `.eslintrc` file, add:
 
 ### Where to ask for help?
 
-Join our [Mailing List](https://groups.google.com/group/eslint) or [Chatroom](https://gitter.im/eslint/eslint)
+Join our [Mailing List](https://groups.google.com/group/eslint) or [Chatroom](https://eslint.org/chat)
 
 [npm-image]: https://img.shields.io/npm/v/eslint-config-eslint.svg?style=flat-square
 [npm-url]: https://www.npmjs.com/package/eslint-config-eslint