diff --git a/docker-compose/Joplin/joplin.yml b/docker-compose/Joplin/joplin.yml
new file mode 100644
index 0000000..df15df6
--- /dev/null
+++ b/docker-compose/Joplin/joplin.yml
@@ -0,0 +1,29 @@
+version: '3'
+services:
+    db:
+        image: postgres
+        volumes:
+            - /docker/joplin:/var/lib/postgresql/data
+        ports:
+            - "5433:5432"
+        restart: unless-stopped
+        environment:
+            - POSTGRES_PASSWORD=tajemnehaslodobazy
+            - POSTGRES_USER=joplin
+            - POSTGRES_DB=joplin
+    app:
+        image: joplin/server:latest
+        depends_on:
+            - db
+        ports:
+            - "22300:22300"
+        restart: unless-stopped
+        environment:
+            - APP_PORT=22300
+            - APP_BASE_URL=https://joplin.karcewicz.pl
+            - DB_CLIENT=pg
+            - POSTGRES_PASSWORD=tajemnehaslodobazy
+            - POSTGRES_DATABASE=postgres
+            - POSTGRES_USER=joplin
+            - POSTGRES_PORT=5432
+            - POSTGRES_HOST=db
\ No newline at end of file