diff --git a/README.md b/README.md
index 33d653e7..34272308 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,7 @@
 | paperless-ngx | ghcr.io/paperless-ngx/paperless-ngx:latest |
 | pgbackweb | eduardolat/pgbackweb:latest |
 | pgbackweb-db | postgres:16-alpine |
+| plantuml-server | plantuml/plantuml-server:jetty |
 | plausible | ghcr.io/plausible/community-edition:v2.1.0 |
 | plausible_db | postgres:16-alpine |
 | plausible_events_db | clickhouse/clickhouse-server:24.3.3.102-alpine |
diff --git a/docker-compose.yml b/docker-compose.yml
index 38e44e03..33e1de0d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3471,6 +3471,12 @@ services:
     image: postgres:16-alpine
     volumes:
       - pgbackweb-data:/var/lib/postgresql/data
+  plantuml-server:
+    container_name: plantuml-server
+    expose:
+      - 8080
+    image: 'plantuml/plantuml-server:jetty'
+    restart: unless-stopped
   plausible:
     command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
     container_name: plausible