diff --git a/docs/_data/documentation_page.json b/docs/_data/documentation_page.json
deleted file mode 100644
index 2b4ee31b90..0000000000
--- a/docs/_data/documentation_page.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-  { "category": "Documentation", "title": "A longer description and available features and options", "url": "https://github.com/systemd/mkosi/blob/main/mkosi/resources/man/mkosi.1.md" }
-]
diff --git a/docs/index.md b/docs/index.md
index 36cb9db44c..782b2b7806 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,9 +9,9 @@ A fancy wrapper around `dnf --installroot`, `apt`, `pacman` and `zypper` that ge
 
 ---
 
-{% assign tutorials = site.pages | group_by:"category" %}
+{% assign tutorials = site.pages | where:"category","Tutorials" %}
 {% assign project = site.data.project_pages | group_by:"category" %}
-{% assign documentation = site.data.documentation_page | group_by:"category" %}
+{% assign documentation = site.data.documentation_page | where:"category","Manuals" %}
 {% assign merged = documentation | concat: tutorials | concat: project %}
 
 
diff --git a/docs/mkosi-addon.1.md b/docs/mkosi-addon.1.md
new file mode 120000
index 0000000000..1a4cfdaf10
--- /dev/null
+++ b/docs/mkosi-addon.1.md
@@ -0,0 +1 @@
+../mkosi/resources/man/mkosi-addon.1.md
\ No newline at end of file
diff --git a/docs/mkosi-initrd.1.md b/docs/mkosi-initrd.1.md
new file mode 120000
index 0000000000..c9bb295320
--- /dev/null
+++ b/docs/mkosi-initrd.1.md
@@ -0,0 +1 @@
+../mkosi/resources/man/mkosi-initrd.1.md
\ No newline at end of file
diff --git a/docs/mkosi-sandbox.1.md b/docs/mkosi-sandbox.1.md
new file mode 120000
index 0000000000..9ed20e07ea
--- /dev/null
+++ b/docs/mkosi-sandbox.1.md
@@ -0,0 +1 @@
+../mkosi/resources/man/mkosi-sandbox.1.md
\ No newline at end of file
diff --git a/docs/mkosi.1.md b/docs/mkosi.1.md
new file mode 120000
index 0000000000..1dc67fef5b
--- /dev/null
+++ b/docs/mkosi.1.md
@@ -0,0 +1 @@
+../mkosi/resources/man/mkosi.1.md
\ No newline at end of file
diff --git a/docs/mkosi.news.7.md b/docs/mkosi.news.7.md
new file mode 120000
index 0000000000..ab620e0320
--- /dev/null
+++ b/docs/mkosi.news.7.md
@@ -0,0 +1 @@
+../mkosi/resources/man/mkosi.news.7.md
\ No newline at end of file
diff --git a/mkosi/resources/man/mkosi-addon.1.md b/mkosi/resources/man/mkosi-addon.1.md
index 9d000fb086..146e22a0d5 100644
--- a/mkosi/resources/man/mkosi-addon.1.md
+++ b/mkosi/resources/man/mkosi-addon.1.md
@@ -1,6 +1,9 @@
-% mkosi-addon(1)
-%
-%
+---
+title: mkosi-addon(1)
+category: Manuals
+layout: default
+SPDX-License-Identifier: LGPL-2.1-or-later
+---
 
 # NAME
 
diff --git a/mkosi/resources/man/mkosi-initrd.1.md b/mkosi/resources/man/mkosi-initrd.1.md
index 4dd5d05189..eeaef706e2 100644
--- a/mkosi/resources/man/mkosi-initrd.1.md
+++ b/mkosi/resources/man/mkosi-initrd.1.md
@@ -1,6 +1,9 @@
-% mkosi-initrd(1)
-%
-%
+---
+title: mkosi-initrd(1)
+category: Manuals
+layout: default
+SPDX-License-Identifier: LGPL-2.1-or-later
+---
 
 # NAME
 
diff --git a/mkosi/resources/man/mkosi-sandbox.1.md b/mkosi/resources/man/mkosi-sandbox.1.md
index 950b8f3680..ce6fe83f77 100644
--- a/mkosi/resources/man/mkosi-sandbox.1.md
+++ b/mkosi/resources/man/mkosi-sandbox.1.md
@@ -1,6 +1,9 @@
-% mkosi-sandbox(1)
-%
-%
+---
+title: mkosi-sandbox(1)
+category: Manuals
+layout: default
+SPDX-License-Identifier: LGPL-2.1-or-later
+---
 
 # NAME
 
diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md
index 16550cc96d..c729fa8a61 100644
--- a/mkosi/resources/man/mkosi.1.md
+++ b/mkosi/resources/man/mkosi.1.md
@@ -1,6 +1,9 @@
-% mkosi(1)
-%
-%
+---
+title: mkosi(1)
+category: Manuals
+layout: default
+SPDX-License-Identifier: LGPL-2.1-or-later
+---
 
 # NAME
 
diff --git a/mkosi/resources/man/mkosi.news.7.md b/mkosi/resources/man/mkosi.news.7.md
index 428ab346c0..53dde4959a 100644
--- a/mkosi/resources/man/mkosi.news.7.md
+++ b/mkosi/resources/man/mkosi.news.7.md
@@ -1,6 +1,9 @@
-% mkosi.news(7)
-%
-%
+---
+title: mkosi.news(7)
+category: Manuals
+layout: default
+SPDX-License-Identifier: LGPL-2.1-or-later
+---
 
 # mkosi Changelog