diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c2a14ee7..c0bc31fd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,8 +15,6 @@ Model (SAMM) and supports its use.
 # Contributing Source Code (using GitHub)
 
 * We use this GitHub repository to track issues and feature requests.
-* For general discussions of the ESMF, modeling questions etc. we use
-  the [community forum](https://www.eclipse.org/forums/index.php/f/617/).
 * For discussions specific to development, the preferred way is
   the [developer mailing list](https://accounts.eclipse.org/mailing-list/esmf-dev).
 
diff --git a/documentation/ame-guide/modules/ROOT/pages/support/support.adoc b/documentation/ame-guide/modules/ROOT/pages/support/support.adoc
index 26a795fd..b7cfff3c 100644
--- a/documentation/ame-guide/modules/ROOT/pages/support/support.adoc
+++ b/documentation/ame-guide/modules/ROOT/pages/support/support.adoc
@@ -40,7 +40,9 @@ This action will hide the developer tools, allowing you to resume your work in t
 
 image::show-developer-tools.png[Developer Tools,width=65%]
 
-For general questions on semantic data structuring and the role of the Aspect Model Editor, discuss within the working groups of the https://www.eclipse.org/forums/index.php/f/617/[Eclipse Community Forums^,opts=nofollow].
+For general questions on semantic data structuring and the role of the Aspect
+Model Editor, feel free to join the
+https://chat.eclipse.org/#/room/#eclipse-semantic-modeling-framework:matrix.eclipse.org[ESMF Chat^,opts=nofollow].
 
 ++++
 <style>