diff --git a/static/css/fonts/Inter.css b/assets/css/fonts/Inter.css
similarity index 100%
rename from static/css/fonts/Inter.css
rename to assets/css/fonts/Inter.css
diff --git a/static/css/fonts/README.md b/assets/css/fonts/README.md
similarity index 97%
rename from static/css/fonts/README.md
rename to assets/css/fonts/README.md
index aca333042..8c939e26b 100644
--- a/static/css/fonts/README.md
+++ b/assets/css/fonts/README.md
@@ -16,7 +16,7 @@ load them. Example call:
 ```sh
 python3 download_google_fonts_css.py \
   "https://fonts.googleapis.com/css?family=Inter:300,300i,400,400i,700,700i" \
-  ../../fonts \
+  ../../../static/fonts \
   ../../fonts 
 ```
   
diff --git a/static/css/fonts/download_google_fonts_css.py b/assets/css/fonts/download_google_fonts_css.py
similarity index 100%
rename from static/css/fonts/download_google_fonts_css.py
rename to assets/css/fonts/download_google_fonts_css.py
diff --git a/static/css/fonts/requirements.txt b/assets/css/fonts/requirements.txt
similarity index 100%
rename from static/css/fonts/requirements.txt
rename to assets/css/fonts/requirements.txt
diff --git a/static/diagrams/README.md b/assets/diagrams/README.md
similarity index 100%
rename from static/diagrams/README.md
rename to assets/diagrams/README.md
diff --git a/static/diagrams/membership.drawio b/assets/diagrams/membership.drawio
similarity index 100%
rename from static/diagrams/membership.drawio
rename to assets/diagrams/membership.drawio
diff --git a/static/diagrams/membership.png b/assets/diagrams/membership.png
similarity index 100%
rename from static/diagrams/membership.png
rename to assets/diagrams/membership.png
diff --git a/static/diagrams/threaded-dag-threads.drawio b/assets/diagrams/threaded-dag-threads.drawio
similarity index 100%
rename from static/diagrams/threaded-dag-threads.drawio
rename to assets/diagrams/threaded-dag-threads.drawio
diff --git a/static/diagrams/threaded-dag-threads.png b/assets/diagrams/threaded-dag-threads.png
similarity index 100%
rename from static/diagrams/threaded-dag-threads.png
rename to assets/diagrams/threaded-dag-threads.png
diff --git a/static/diagrams/threaded-dag.drawio b/assets/diagrams/threaded-dag.drawio
similarity index 100%
rename from static/diagrams/threaded-dag.drawio
rename to assets/diagrams/threaded-dag.drawio
diff --git a/static/diagrams/threaded-dag.png b/assets/diagrams/threaded-dag.png
similarity index 100%
rename from static/diagrams/threaded-dag.png
rename to assets/diagrams/threaded-dag.png
diff --git a/static/js/toc.js b/assets/js/toc.js
similarity index 100%
rename from static/js/toc.js
rename to assets/js/toc.js
diff --git a/config.toml b/config.toml
index 581214b20..2494ad1e9 100644
--- a/config.toml
+++ b/config.toml
@@ -134,15 +134,6 @@ sidebar_menu_compact = true
   [[module.imports]]
     path = "github.com/matrix-org/docsy"
     disable = false
-  # Mounting /assets and /static as assets directories helps Hugo to generate
-  # the correct URL.
-  [[module.mounts]]
-    source = 'assets'
-    target = 'assets'
-  [[module.mounts]]
-    source = 'static'
-    target = 'assets'
-
 
 # custom output formats
 
diff --git a/layouts/partials/hooks/body-end.html b/layouts/partials/hooks/body-end.html
index 377470d91..5848b74f4 100644
--- a/layouts/partials/hooks/body-end.html
+++ b/layouts/partials/hooks/body-end.html
@@ -13,5 +13,5 @@
   in the document.
 
 */}}
-
-<script defer language="javascript" type="text/javascript"  src="{{ "js/toc.js" | urlize | relURL }}"></script>
+{{ $toc := resources.Get "js/toc.js" -}}
+<script defer language="javascript" type="text/javascript"  src="{{ $toc.RelPermalink }}"></script>
diff --git a/layouts/partials/hooks/head-end.html b/layouts/partials/hooks/head-end.html
index c01536699..2284701bf 100644
--- a/layouts/partials/hooks/head-end.html
+++ b/layouts/partials/hooks/head-end.html
@@ -13,5 +13,6 @@
  Google Fonts manually via a script:
  https://github.com/matrix-org/matrix-spec/tree/main/static/css/fonts
 */}}
-<link rel="preload" href="{{ "css/fonts/Inter.css" | relURL }}" as="style">
-<link rel="stylesheet" href="{{ "css/fonts/Inter.css" | relURL }}">
+{{ $inter := resources.Get "css/fonts/Inter.css" -}}
+<link rel="preload" href="{{ $inter.RelPermalink }}" as="style">
+<link rel="stylesheet" href="{{ $inter.RelPermalink }}">