diff --git a/content/admin/_index.de.md b/content/admin/_index.de.md
index 5bfe058..aace852 100644
--- a/content/admin/_index.de.md
+++ b/content/admin/_index.de.md
@@ -22,9 +22,43 @@ Eine kurze Übersicht über die verschiedenen Services des Systems und ihre Inte
 * Selfservice: Portal in dem sich Bürger- und Firmenläufer:innen registrieren und ihre Daten einsehen können
 * Beamershow: Zeigt aktuelle Statistiken und Toplisten zum Event an
 * Scanclient: Software für die Scannerstationen
+* Kiosk: Software für die Registrierung von Läufer:innen vor Ort
 * Docs: Diese Dokumentation
 
-![Service Diagramms](/images/service_interaction.png)
+```mermaid
+flowchart LR
+  subgraph Anwendungen
+    Frontend
+    Beamershow
+    Scanclient
+    Selfservice
+    Kiosk
+  end
+
+  subgraph Services
+    Backend
+    Mailer
+    Document-Server
+  end
+
+  subgraph Extern
+    Datenbank
+    Mail-Server
+  end
+
+  Frontend --> |Zeigt Daten an und bearbeitet sie| Backend
+  Beamershow -->|Fragt aktuelle Statistiken ab| Backend
+  Scanclient --> |Generiert und validiert Scans| Backend
+  Selfservice --> |Registriert Läufer| Backend
+  Kiosk --> |Registriert Läufer| Backend
+
+  Backend --> |Speichert Daten| Datenbank
+  Backend --> |Sendet Mails| Mailer
+  Mailer --> |Sendet Mails| Mail-Server
+
+  Frontend --> |Generiert PDFs| Document-Server
+  Selfservice --> |Generiert PDFs| Document-Server
+```
 
 ## FAQ
 
diff --git a/content/admin/_index.en.md b/content/admin/_index.en.md
index 5f0f221..72484da 100644
--- a/content/admin/_index.en.md
+++ b/content/admin/_index.en.md
@@ -16,15 +16,49 @@ If you are interested in the operation for regular users, take a look at the [Us
 A brief overview of the various services of the system and their interaction
 
 * Backend: Contains the main logic and manages the data (via database connection)
-* Mailer: Automatically sends emails based on HTML templates
-* Document Server: Creates PDFs (certificates, runner cards, sponsorship declarations) from HTML templates
-* Frontend: Administration interface for the admins and users of the runner system
-* Self-service: Portal where citizen and company runners can register and view their data
-* Beamer Show: Displays current statistics and top lists for the event
-* Scan Client: Software for the scanner stations
+* Mailer: Automatically sends mails based on HTML templates
+* Document-Server: Creates PDFs (certificates, runner cards, sponsorship declarations) from HTML templates
+* Frontend: Management interface for the admins and users of the runner system
+* Selfservice: Portal where citizen and company runners can register and view their data
+* Beamershow: Displays current statistics and top lists for the event
+* Scanclient: Software for the scanner stations
+* Kiosk: Software for the on-site registration of runners
 * Docs: This documentation
 
-![Service Diagrams](/images/service_interaction.png)
+```mermaid
+flowchart LR
+  subgraph Applications
+    Frontend
+    Beamershow
+    Scanclient
+    Selfservice
+    Kiosk
+  end
+
+  subgraph Services
+    Backend
+    Mailer
+    Document-Server
+  end
+
+  subgraph External
+    Database
+    Mail-Server
+  end
+
+  Frontend --> |Displays and edits data| Backend
+  Beamershow -->|Requests current statistics| Backend
+  Scanclient --> |Generates and validates scans| Backend
+  Selfservice --> |Registers runners| Backend
+  Kiosk --> |Registers runners| Backend
+
+  Backend --> |Stores data| Database
+  Backend --> |Sends mails| Mailer
+  Mailer --> |Sends mails| Mail-Server
+
+  Frontend --> |Generates PDFs| Document-Server
+  Selfservice --> |Generates PDFs| Document-Server
+```
 
 ## FAQ
 
diff --git a/static/images/service_interaction.png b/static/images/service_interaction.png
deleted file mode 100644
index d2fc9f6..0000000
Binary files a/static/images/service_interaction.png and /dev/null differ