diff --git a/README.md b/README.md
index 6637d0bc..86b53977 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
    ｜ 
   <a href="https://blog.exaloop.io" target="_blank"><b>Blog</b></a>
   &nbsp;&#65372;&nbsp;
-  <a href="https://discourse.exaloop.io" target="_blank"><b>Forum</b></a>
+  <a href="https://github.com/exaloop/codon/discussions" target="_blank"><b>Forum</b></a>
   &nbsp;&#65372;&nbsp;
   <a href="https://join.slack.com/t/exaloop/shared_invite/zt-1jusa4kc0-T3rRWrrHDk_iZ1dMS8s0JQ" target="_blank">Chat</a>
   &nbsp;&#65372;&nbsp;
diff --git a/docs/intro/faq.md b/docs/intro/faq.md
index 06fca801..3d827a82 100644
--- a/docs/intro/faq.md
+++ b/docs/intro/faq.md
@@ -130,7 +130,7 @@ to help provide a sense of where to look first:
 - [`stdlib/`](https://github.com/exaloop/codon/tree/develop/stdlib): standard library code
 
 You can also take a look at some of the [open issues](https://github.com/exaloop/codon/issues). If you
-have any question or suggestions, please feel free to ask in [the forum](https://discourse.exaloop.io).
+have any question or suggestions, please feel free to ask in [the forum](https://github.com/exaloop/codon/discussions).
 
 ## Is there a Contributor License Agreement (CLA)?