diff --git a/docs/faq.md b/docs/faq.md
index 3e6ce24e19b..7ccb70bdf9e 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -5,7 +5,7 @@ title: FAQ: General
 
 ## Do you have a chat room?
 
-[![Gitter](https://img.shields.io/gitter/room/:user/:repo.svg?style=for-the-badge)](https://gitter.im/OpenAPITools/openapi-generator)  
+[![Jion the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM)
 
 ## What is the governance structure of the OpenAPI Generator project?
 
diff --git a/website/core/Footer.js b/website/core/Footer.js
index 14a67c4727a..87013fc63c2 100755
--- a/website/core/Footer.js
+++ b/website/core/Footer.js
@@ -55,7 +55,7 @@ class Footer extends React.Component {
               rel="noreferrer noopener">
               Stack Overflow
             </a>
-            <a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a>
+            <a href="https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM">Chat Room</a>
             <a
               href="https://twitter.com/oas_generator"
               target="_blank"
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index 5a4468d8e53..1ac295e4d67 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -233,11 +233,12 @@ class Index extends React.Component {
               '* Gradle Plugin\n' +
               '* CLI via Homebrew\n' +
               '* CLI via Docker\n' +
+              '* CLI via npm\n' +
               '* Generator SaaS\n\n' +
               'For details, see  [Workflow Integrations](' + this.docUrl('integrations.html', this.props.language) + ')\n\n' +
               'Generation also allows for easy customization via options, custom templates, or even custom generators on your classpath. ' +
                'See [Customization](' + this.docUrl('customization.html', this.props.language) + ') for details.\n\n' +
-              'As a very community-oriented project, the core team is also active on the project\'s [Gitter channel](https://gitter.im/OpenAPITools/openapi-generator).',
+              'As a very community-oriented project, the core team is also active on the project\'s [Slack Workspace](https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM).',
             image: `${baseUrl}img/color-logo.svg`,
             imageAlign: 'right',
             title: 'Learn How',