diff --git a/src-tauri/src/tray.rs b/src-tauri/src/tray.rs
index de27923e..09225949 100644
--- a/src-tauri/src/tray.rs
+++ b/src-tauri/src/tray.rs
@@ -17,7 +17,7 @@ use crate::{
 };
 
 const SUBSCRIBE_UPDATES_LINK: &str = "https://defguard.net/newsletter";
-const JOIN_COMMUNITY_LINK: &str = "https://matrix.to/#/#defguard:teonite.com";
+const JOIN_COMMUNITY_LINK: &str = "https://github.com/DefGuard/defguard/discussions/new/choose";
 const FOLLOW_US_LINK: &str = "https://floss.social/@defguard";
 
 const MAIN_WINDOW_ID: &str = "main";
@@ -28,7 +28,7 @@ const TRAY_EVENT_QUIT: &str = "quit";
 const TRAY_EVENT_SHOW: &str = "show";
 const TRAY_EVENT_HIDE: &str = "hide";
 const TRAY_EVENT_UPDATES: &str = "updates";
-const TRAY_EVENT_COMMINITY: &str = "community";
+const TRAY_EVENT_COMMUNITY: &str = "community";
 const TRAY_EVENT_FOLLOW: &str = "follow";
 
 /// Generate contents of system tray menu.
@@ -46,8 +46,8 @@ async fn generate_tray_menu(app: &AppHandle) -> Result<Menu<impl Runtime>, Error
     )?;
     let join_community = MenuItem::with_id(
         app,
-        TRAY_EVENT_COMMINITY,
-        "Join our community",
+        TRAY_EVENT_COMMUNITY,
+        "Community support",
         true,
         None::<&str>,
     )?;
@@ -208,7 +208,7 @@ pub fn handle_tray_menu_event(app: &AppHandle, event: MenuEvent) {
         TRAY_EVENT_UPDATES => {
             let _ = webbrowser::open(SUBSCRIBE_UPDATES_LINK);
         }
-        TRAY_EVENT_COMMINITY => {
+        TRAY_EVENT_COMMUNITY => {
             let _ = webbrowser::open(JOIN_COMMUNITY_LINK);
         }
         TRAY_EVENT_FOLLOW => {
diff --git a/src/i18n/en/index.ts b/src/i18n/en/index.ts
index 20b3c0e7..aa0ade37 100644
--- a/src/i18n/en/index.ts
+++ b/src/i18n/en/index.ts
@@ -144,7 +144,7 @@ If you are an admin/devops - all your customers (instances) and all their tunnel
               githubLink: `GitHub`,
               spreadWordText: `spreading the word about:`,
               defguard: `defguard!`,
-              joinMatrix: `join our Matrix server:`,
+              githubDiscussions: `Reach out to our community via `,
               supportUs: 'Support Us!',
             },
           },
diff --git a/src/i18n/fr/index.ts b/src/i18n/fr/index.ts
index 7b7aa7af..51bf3260 100644
--- a/src/i18n/fr/index.ts
+++ b/src/i18n/fr/index.ts
@@ -135,7 +135,7 @@ Si vous êtes un administrateur/devops - tous vos clients (instances) et tous le
               githubLink: `GitHub`,
               spreadWordText: `En faisant passer le mot sur :`,
               defguard: `defguard !`,
-              joinMatrix: `En nous rejoignant sur notre serveur Matrix :`,
+              githubDiscussions: `Contactez notre communauté via `,
               supportUs: 'Soutenez-nous !',
             },
           },
diff --git a/src/i18n/i18n-types.ts b/src/i18n/i18n-types.ts
index a88a420e..0808669e 100644
--- a/src/i18n/i18n-types.ts
+++ b/src/i18n/i18n-types.ts
@@ -343,9 +343,9 @@ type RootTranslation = {
 							 */
 							defguard: string
 							/**
-							 * j​o​i​n​ ​o​u​r​ ​M​a​t​r​i​x​ ​s​e​r​v​e​r​:
+							 * R​e​a​c​h​ ​o​u​t​ ​t​o​ ​o​u​r​ ​c​o​m​m​u​n​i​t​y​ ​v​i​a​ 
 							 */
-							joinMatrix: string
+							githubDiscussions: string
 							/**
 							 * S​u​p​p​o​r​t​ ​U​s​!
 							 */
@@ -2047,9 +2047,9 @@ export type TranslationFunctions = {
 							 */
 							defguard: () => LocalizedString
 							/**
-							 * join our Matrix server:
+							 * Reach out to our community via 
 							 */
-							joinMatrix: () => LocalizedString
+							githubDiscussions: () => LocalizedString
 							/**
 							 * Support Us!
 							 */
diff --git a/src/pages/client/pages/CarouselPage/cards/CarouselCards.tsx b/src/pages/client/pages/CarouselPage/cards/CarouselCards.tsx
index 6f0968d2..e3f6f97b 100644
--- a/src/pages/client/pages/CarouselPage/cards/CarouselCards.tsx
+++ b/src/pages/client/pages/CarouselPage/cards/CarouselCards.tsx
@@ -7,7 +7,7 @@ import { useI18nContext } from '../../../../../i18n/i18n-react';
 import { IconDefguard } from '../../../../../shared/components/icons/IconDefguard/IconDeguard';
 import SvgDefguardLogoText from '../../../../../shared/components/svg/DefguardLogoText';
 import { GitHubIcon } from '../../../../../shared/components/svg/GithubIcon';
-import { githubUrl, mastodonUrl, matrixUrl } from '../../../../../shared/constants';
+import { discussionsUrl, githubUrl, mastodonUrl } from '../../../../../shared/constants';
 import { Button } from '../../../../../shared/defguard-ui/components/Layout/Button/Button';
 import {
   ButtonSize,
@@ -172,8 +172,8 @@ export const SupportSlide = () => {
             <b>{localLL.defguard()}</b>
           </li>
           <li>
-            <span>{localLL.joinMatrix()} </span>
-            <a onClick={() => openLink(matrixUrl)}>{matrixUrl}</a>
+            <span>{localLL.githubDiscussions()} </span>
+            <a onClick={() => openLink(discussionsUrl)}>{discussionsUrl}</a>
           </li>
         </ul>
       </div>
diff --git a/src/pages/client/pages/ClientSettingsPage/components/InfoCard/InfoCard.tsx b/src/pages/client/pages/ClientSettingsPage/components/InfoCard/InfoCard.tsx
index f3d46404..bb7fde19 100644
--- a/src/pages/client/pages/ClientSettingsPage/components/InfoCard/InfoCard.tsx
+++ b/src/pages/client/pages/ClientSettingsPage/components/InfoCard/InfoCard.tsx
@@ -2,7 +2,11 @@ import Markdown from 'react-markdown';
 
 import { useI18nContext } from '../../../../../../i18n/i18n-react';
 import { GitHubIcon } from '../../../../../../shared/components/svg/GithubIcon';
-import { githubUrl, mastodonUrl, matrixUrl } from '../../../../../../shared/constants';
+import {
+  discussionsUrl,
+  githubUrl,
+  mastodonUrl,
+} from '../../../../../../shared/constants';
 import { Button } from '../../../../../../shared/defguard-ui/components/Layout/Button/Button';
 import {
   ButtonSize,
@@ -73,8 +77,8 @@ export const InfoCard = () => {
             <b>{supportLL.defguard()}</b>
           </li>
           <li>
-            <span>{supportLL.joinMatrix()} </span>
-            <a onClick={() => openLink(matrixUrl)}>{matrixUrl}</a>
+            <span>{supportLL.githubDiscussions()} </span>
+            <a onClick={() => openLink(discussionsUrl)}>{discussionsUrl}</a>
           </li>
         </ul>
       </div>
diff --git a/src/shared/constants.ts b/src/shared/constants.ts
index 25182bef..8cb26e98 100644
--- a/src/shared/constants.ts
+++ b/src/shared/constants.ts
@@ -11,7 +11,8 @@ export const mastodonUrl =
 
 export const githubUrl = 'https://github.com/Defguard/defguard';
 
-export const matrixUrl = 'https://matrix.to/#/#defguard:teonite.com';
+export const discussionsUrl =
+  'https://github.com/DefGuard/defguard/discussions/new/choose';
 
 export const CLIENT_VERSION_HEADER = 'defguard-client-version';