diff --git a/package.json b/package.json
index 15d519523f6..ab98d949462 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
         "escape-html": "^1.0.3",
         "file-saver": "^2.0.5",
         "filesize": "10.1.2",
-        "gfm.css": "^1.1.2",
+        "github-markdown-css": "^5.5.1",
         "glob-to-regexp": "^0.4.1",
         "graphemer": "^1.4.0",
         "highlight.js": "^11.3.1",
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png
index ff75b3473fe..fcf3acd7e8c 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png differ
diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss
index ad88a7c7863..530904767bb 100644
--- a/res/css/views/rooms/_EventTile.pcss
+++ b/res/css/views/rooms/_EventTile.pcss
@@ -701,7 +701,7 @@ $left-gutter: 64px;
             background-color: $inlinecode-background-color;
             border: 1px solid $inlinecode-border-color;
             border-radius: 4px;
-            /* The horizontal padding is added by gfm.css .markdown-body */
+            /* The horizontal padding is added by github-markdown-css .markdown-body */
             padding: $spacing-2 0;
             /* Avoid inline code blocks to be sticked when on multiple lines */
             line-height: $font-22px;
diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss
index 2c8fe592c42..d88350e946f 100644
--- a/res/css/views/rooms/_MessageComposer.pcss
+++ b/res/css/views/rooms/_MessageComposer.pcss
@@ -163,7 +163,7 @@ limitations under the License.
     word-break: break-word;
 
     /* FIXME: rather unpleasant hack to get rid of <p/> margins. */
-    /* really we should be mixing in markdown-body from gfm.css instead */
+    /* really we should be mixing in markdown-body from github-markdown-css instead */
     > :first-child {
         margin-top: 0 !important;
     }
diff --git a/res/themes/dark-custom/css/dark-custom.pcss b/res/themes/dark-custom/css/dark-custom.pcss
index 3acf914e69d..166d9cb2921 100644
--- a/res/themes/dark-custom/css/dark-custom.pcss
+++ b/res/themes/dark-custom/css/dark-custom.pcss
@@ -5,3 +5,4 @@
 @import "../../legacy-dark/css/_legacy-dark.pcss";
 @import "../../light-custom/css/_custom.pcss";
 @import "../../../../res/css/_components.pcss";
+@import url("github-markdown-css/github-markdown-dark.css");
diff --git a/res/themes/dark/css/dark.pcss b/res/themes/dark/css/dark.pcss
index d71f544fe21..51262598bea 100644
--- a/res/themes/dark/css/dark.pcss
+++ b/res/themes/dark/css/dark.pcss
@@ -6,3 +6,4 @@
 @import "../../light/css/_mods.pcss";
 @import "../../../../res/css/_components.pcss";
 @import url("highlight.js/styles/atom-one-dark.min.css");
+@import url("github-markdown-css/github-markdown-dark.css");
diff --git a/res/themes/legacy-dark/css/legacy-dark.pcss b/res/themes/legacy-dark/css/legacy-dark.pcss
index 061934d890a..ffb7e8d0aa3 100644
--- a/res/themes/legacy-dark/css/legacy-dark.pcss
+++ b/res/themes/legacy-dark/css/legacy-dark.pcss
@@ -5,3 +5,4 @@
 @import "_legacy-dark.pcss";
 @import "../../../../res/css/_components.pcss";
 @import url("highlight.js/styles/atom-one-dark.min.css");
+@import url("github-markdown-css/github-markdown-dark.css");
diff --git a/res/themes/legacy-light/css/legacy-light.pcss b/res/themes/legacy-light/css/legacy-light.pcss
index f44651e6892..4b3905a1f98 100644
--- a/res/themes/legacy-light/css/legacy-light.pcss
+++ b/res/themes/legacy-light/css/legacy-light.pcss
@@ -4,3 +4,4 @@
 @import "_legacy-light.pcss";
 @import "../../../../res/css/_components.pcss";
 @import url("highlight.js/styles/atom-one-light.min.css");
+@import url("github-markdown-css/github-markdown-light.css");
diff --git a/res/themes/light-custom/css/light-custom.pcss b/res/themes/light-custom/css/light-custom.pcss
index eeba1002e58..0bf3bd9ba2b 100644
--- a/res/themes/light-custom/css/light-custom.pcss
+++ b/res/themes/light-custom/css/light-custom.pcss
@@ -4,3 +4,4 @@
 @import "../../legacy-light/css/_legacy-light.pcss";
 @import "_custom.pcss";
 @import "../../../../res/css/_components.pcss";
+@import url("github-markdown-css/github-markdown-light.css");
diff --git a/res/themes/light-high-contrast/css/light-high-contrast.pcss b/res/themes/light-high-contrast/css/light-high-contrast.pcss
index 4d05078f787..a843809e510 100644
--- a/res/themes/light-high-contrast/css/light-high-contrast.pcss
+++ b/res/themes/light-high-contrast/css/light-high-contrast.pcss
@@ -6,3 +6,4 @@
 @import "../../light/css/_mods.pcss";
 @import "../../../../res/css/_components.pcss";
 @import url("highlight.js/styles/atom-one-light.min.css");
+@import url("github-markdown-css/github-markdown-light.css");
diff --git a/res/themes/light/css/light.pcss b/res/themes/light/css/light.pcss
index 361484828f2..d3264e491e7 100644
--- a/res/themes/light/css/light.pcss
+++ b/res/themes/light/css/light.pcss
@@ -5,3 +5,4 @@
 @import "_mods.pcss";
 @import "../../../../res/css/_components.pcss";
 @import url("highlight.js/styles/atom-one-light.min.css");
+@import url("github-markdown-css/github-markdown-light.css");
diff --git a/yarn.lock b/yarn.lock
index 07f3e51a71d..ea64ca735f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5683,10 +5683,10 @@ get-symbol-description@^1.0.0, get-symbol-description@^1.0.2:
     es-errors "^1.3.0"
     get-intrinsic "^1.2.4"
 
-gfm.css@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/gfm.css/-/gfm.css-1.1.2.tgz#94acfa600672663b9dd0fd4b6ee5d11c8dbc161e"
-  integrity sha512-KhK3rqxMj+UTLRxWnfUA5n8XZYMWfHrrcCxtWResYR2B3hWIqBM6v9FPGZSlVuX+ScLewizOvNkjYXuPs95ThQ==
+github-markdown-css@^5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/github-markdown-css/-/github-markdown-css-5.5.1.tgz#c2a609ca0b067552c8bfc09e797ace20d614f515"
+  integrity sha512-2osyhNgFt7DEHnGHbgIifWawAqlc68gjJiGwO1xNw/S48jivj8kVaocsVkyJqUi3fm7fdYIDi4C6yOtcqR/aEQ==
 
 gl-matrix@^3.4.3:
   version "3.4.3"