diff --git a/public/svgs/joplin.png b/public/svgs/joplin.png
new file mode 100644
index 000000000..d17a1d2c1
Binary files /dev/null and b/public/svgs/joplin.png differ
diff --git a/templates/compose/joplin.yaml b/templates/compose/joplin.yaml
new file mode 100644
index 000000000..8b283bff5
--- /dev/null
+++ b/templates/compose/joplin.yaml
@@ -0,0 +1,33 @@
+# documentation: https://github.com/laurent22/joplin/blob/dev/packages/server/README.md
+# slogan: Self-hosted sync server for Joplin
+# tags: joplin
+# logo: svgs/joplin.png
+# port: 22300
+version: '3'
+services:
+  db:
+    image: 'postgres:16'
+    volumes:
+      - './data/postgres:/var/lib/postgresql/data'
+    restart: unless-stopped
+    environment:
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_DB=joplin
+  app:
+    image: 'joplin/server:latest'
+    depends_on:
+      - db
+    ports:
+      - '22300:22300'
+    restart: unless-stopped
+    environment:
+      - APP_PORT=22300
+      - APP_BASE_URL=$SERVICE_FQDN_JOPLIN
+      - DB_CLIENT=pg
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DATABASE=joplin
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PORT=5432
+      - POSTGRES_HOST=db
+