diff --git a/.github/ISSUE_TEMPLATE/03_help_question.yml b/.github/ISSUE_TEMPLATE/03_help_question.yml
index 8d829ed..2f456b9 100644
--- a/.github/ISSUE_TEMPLATE/03_help_question.yml
+++ b/.github/ISSUE_TEMPLATE/03_help_question.yml
@@ -7,7 +7,7 @@ body:
       value: |
         Before you hit the submit button:
           * Please see our [Contribution Guidelines](https://github.com/asmjit/asmjit/blob/master/CONTRIBUTING.md).
-          * [Gitter Chat](https://app.gitter.im/#/room/#asmjit:gitter.im) is usually faster to get answers.
+          * [Public Chat](https://app.element.io/#/room/#asmjit:matrix.org) is usually faster to get answers.
           * If you need a help, please include as much information as possible to make it clear what the intend is.
   - type: textarea
     id: issue-description
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b7b9962..7c33cc0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,7 @@
 
 ### Asking questions
 
-  * We prefer GitHub issues to be used for reporting bugs or feature requests, but it's still okay to ask questions there as well. However, please consider joining our [Chat](https://app.element.io/#/room/#asmjit:gitter.im) to ask questions; it has an active community that can quickly respond.
+  * We prefer GitHub issues to be used for reporting bugs or feature requests, but it's still okay to ask questions there as well. However, please consider joining our [Public Chat](https://app.element.io/#/room/#asmjit:matrix.org) to ask questions; it has an active community that can quickly respond.
 
 ### Suggesting feature requests
 
@@ -26,7 +26,7 @@
 
 ### Suggesting a website content enhancement
 
-  * [AsmJit's website](https://asmjit.com) is also generated, but not from public sources at the moment. If you did find an issue on the website you can either use contact information on the [support page](https://asmjit.com/support.html) or to discuss the change on our [Chat](https://app.element.io/#/room/#asmjit:gitter.im). Alternatively, opening a regular issue is also okay.
+  * [AsmJit's website](https://asmjit.com) is also generated, but not from public sources at the moment. If you did find an issue on the website you can either use contact information on the [support page](https://asmjit.com/support.html) or to discuss the change on our [Public Chat](https://app.element.io/#/room/#asmjit:matrix.org). Alternatively, opening a regular issue is also okay.
 
 
 ## Coding Style & Consistency
diff --git a/README.md b/README.md
index e1909df..5920eab 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ AsmJit is a library for low-latency machine code generation written in C++.
 
   * [Official Home Page (asmjit.com)](https://asmjit.com)
   * [Official Repository (asmjit/asmjit)](https://github.com/asmjit/asmjit)
-  * [Public Chat Channel](https://app.element.io/#/room/#asmjit:gitter.im)
+  * [Public Chat Channel](https://app.element.io/#/room/#asmjit:matrix.org)
   * [Zlib License](./LICENSE.md)
 
 See [asmjit.com](https://asmjit.com) page for more details, examples, and documentation.
@@ -61,7 +61,7 @@ Breaking the API is sometimes inevitable, what to do?
     * [asmjit_test_compiler_x86.cpp](./asmjit-testing/tests/asmjit_test_compiler_x86.cpp) - Tests targeting AsmJit's Compiler (x86/x64)
     * [asmjit_test_instinfo.cpp](./asmjit-testing/tests/asmjit_test_instinfo.cpp) - Tests that query instruction information
     * [asmjit_test_x86_sections.cpp](./asmjit-testing/tests/asmjit_test_x86_sections.cpp) - Multiple sections test
-  * Visit our [Gitter Chat](https://app.gitter.im/#/room/#asmjit:gitter.im) if you need a quick help
+  * Visit our [Public Chat](https://app.element.io/#/room/#asmjit:matrix.org) if you need a quick help
 
 Support & Funding
 -----------------