diff --git a/Compose/joplin.yaml b/Compose/joplin.yaml
new file mode 100644
index 0000000..b82fe5c
--- /dev/null
+++ b/Compose/joplin.yaml
@@ -0,0 +1,74 @@
+
+services:
+
+  postgress:
+    image: postgres:15
+    container_name: postgress
+    hostname: postgress
+    volumes:
+      - /DockerVol/joplindb:/var/lib/postgresql/data
+    restart: unless-stopped
+    user: "1001:998"
+    networks:
+      - netgrimoire
+    environment:
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=joplin
+      - TZ=America/Chicago
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == docker1
+
+  joplin:
+    image: joplin/server:latest
+    container_name: joplin
+    hostname: joplin
+    depends_on:
+      - postgress
+    ports:
+      - "22300:22300"
+    restart: unless-stopped
+    networks:
+      - netgrimoire
+    environment:
+      - TZ=America/Chicago
+      - APP_PORT=22300
+      - APP_BASE_URL=https://joplin.netgrimoire.com
+      - DB_CLIENT=pg
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DATABASE=joplin
+      - POSTGRES_USER=postgres
+      - POSTGRES_PORT=5432
+      - POSTGRES_HOST=postgress
+      - MAILER_ENABLED=0
+      - MAILER_HOST=smtp.gmail.com
+      - MAILER_PORT=465
+      - MAILER_SECURE=0
+      - MAILER_AUTH_USER=youremail@gmail.com
+      - MAILER_AUTH_PASSWORD=Y0urP@ssw0rd
+      - MAILER_NOREPLY_NAME=Joplin
+      - MAILER_NOREPLY_EMAIL=email@email.com
+    user: "1001:998"
+    deploy:
+      labels:
+        - homepage.group=Services
+        - homepage.name=Joplin
+        - homepage.icon=joplin.png
+        - homepage.href=https://joplin.netgrimoire.com
+        - homepage.description=Note Server
+        - homepage.widget.type=joplin
+        - homepage.widget.url=http://joplin:22300
+        - kuma.joplin.http.name="Joplin"
+        - kuma.joplin.http.url=http://joplin:22300
+        - caddy=joplin.netgrimoire.com
+#        - caddy.import=authentik
+        - caddy.reverse_proxy="{{upstreams 22300}}"
+      placement:
+        constraints:
+          - node.hostname == docker1
+
+networks:
+  netgrimoire:
+    external: true