diff --git a/pages/05.troubleshooting/02.getting-help/docs.md b/pages/05.troubleshooting/02.getting-help/docs.md
index ea615c9e..2cc7c806 100644
--- a/pages/05.troubleshooting/02.getting-help/docs.md
+++ b/pages/05.troubleshooting/02.getting-help/docs.md
@@ -129,4 +129,4 @@ You may also find the following communities useful in certain cases:
 
 ## Forums
 
-Our forums, built on the excellent [Discourse](https://www.discourse.org/) project and hosted courtesy of [Nextgi](https://nextgi.com/), can be found at [`https://forums.userfrosting.com`](https://forums.userfrosting.com).
+Our forums can be found on [GitHub Discussions](https://github.com/orgs/userfrosting/discussions) for more in-dept and personalized questions.
diff --git a/themes/sitetheme/templates/partials/base.html.twig b/themes/sitetheme/templates/partials/base.html.twig
index df826c00..0bdb74fb 100644
--- a/themes/sitetheme/templates/partials/base.html.twig
+++ b/themes/sitetheme/templates/partials/base.html.twig
@@ -69,7 +69,7 @@
                     <span data-search-clear><i class="fa fa-close"></i></span>
                 </div>
 				<div id="mobile-nav">
-					<a href="https://www.userfrosting.com">Home</a> <a href="{{ base_url }}">Docs</a> <a href="https://forums.userfrosting.com/" >Forums</a><a href="https://chat.userfrosting.com"/>Chat</a>
+					<a href="https://www.userfrosting.com">Home</a> <a href="{{ base_url }}">Docs</a> <a href="https://github.com/orgs/userfrosting/discussions" >Forums</a><a href="https://chat.userfrosting.com"/>Chat</a>
 				</div>
             </div>
         </div>
diff --git a/themes/sitetheme/templates/partials/navigation.html.twig b/themes/sitetheme/templates/partials/navigation.html.twig
index f9488153..99c0b77e 100644
--- a/themes/sitetheme/templates/partials/navigation.html.twig
+++ b/themes/sitetheme/templates/partials/navigation.html.twig
@@ -16,7 +16,7 @@
                         <li><a href="https://learn.userfrosting.com/recipes">Recipes</a></li>
                     </ul>
                 </li>
-                <li><a href="https://forums.userfrosting.com" target="_blank">Forums</a></li>
+                <li><a href="https://github.com/orgs/userfrosting/discussions" target="_blank">Forums</a></li>
                 <li><a href="https://chat.userfrosting.com" target="_blank">Chat</a></li>
                 <span id="nav-social">
                     <li class="fa-stack"><a href="https://github.com/userfrosting/UserFrosting" target="_blank"><i class="fa fa-circle fa-stack-2x"></i><i class="fa fa-github fa-stack-1x"></i></a></li>