diff --git a/README.md b/README.md
index 7c7bd17..a95e43c 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Not every stack is tested to fully work.
 - [x] Duplicati
 - [x] Folding@Home
 - [x] [Gatus](https://github.com/TwiN/gatus)
+- [x] [Joplin](https://hub.docker.com/r/joplin/server) (working, abandoned)
 - [ ] Lidarr (didn't test, may not work)
 - [x] magnetico-web-telegram
 - [x] magneticod
diff --git a/joplin/.env.dist b/joplin/.env.dist
new file mode 100644
index 0000000..789bbe9
--- /dev/null
+++ b/joplin/.env.dist
@@ -0,0 +1,11 @@
+DB_CLIENT=pg
+POSTGRES_PASSWORD=joplin
+POSTGRES_DATABASE=joplin
+POSTGRES_USER=joplin
+POSTGRES_PORT=5432
+#POSTGRES_HOST=db
+
+APP_BASE_URL=https://domain.tld
+
+APP_PORT=22300
+EXTERNAL_PORT=8030
diff --git a/joplin/data/.gitignore b/joplin/data/.gitignore
new file mode 100644
index 0000000..11b4bb1
--- /dev/null
+++ b/joplin/data/.gitignore
@@ -0,0 +1,2 @@
+/*
+!/.gitignore
\ No newline at end of file
diff --git a/joplin/docker-compose.yml b/joplin/docker-compose.yml
new file mode 100644
index 0000000..bc911fb
--- /dev/null
+++ b/joplin/docker-compose.yml
@@ -0,0 +1,22 @@
+version: "3.7"
+services:
+    db:
+        image: postgres:13
+        volumes:
+            - ./data/postgres:/var/lib/postgresql/data
+        expose:
+            - "5432"
+        restart: unless-stopped
+        env_file: .env
+
+    app:
+        image: joplin/server:latest
+        depends_on:
+            - db
+        ports:
+            - "127.0.0.1:${EXTERNAL_PORT:-8030}:22300"
+        env_file: .env
+        environment:
+            - POSTGRES_HOST=${POSTGRES_HOST:-db}
+        restart: unless-stopped
+        user: '${HOST_USER:-0}'