diff --git a/root/usr/libexec/apps/joplin/joplin.sh b/root/usr/libexec/apps/joplin/joplin.sh
index c28a641..4114ab0 100644
--- a/root/usr/libexec/apps/joplin/joplin.sh
+++ b/root/usr/libexec/apps/joplin/joplin.sh
@@ -31,24 +31,39 @@ do_install_detail() {
 
   touch /opt/docker2/compose/joplin-app/docker-compose.yml
   cat > /opt/docker2/compose/joplin-app/docker-compose.yml <<EOF
-version: '3.7'
+version: '3'
 services:
-  app:
-    image: $IMAGE_NAME
-    restart: always
-    ports:
-      - ${LAN_IP}:${port}:22300
-    environment:
-      - POSTGRES_PASSWORD=${GEN_PASS}
+    app:
+        environment:
+            - APP_BASE_URL=http://${LAN_IP}:22300
+            - APP_PORT=22300
+            - POSTGRES_PASSWORD=${GEN_PASS}
+            - POSTGRES_DATABASE=joplin
+            - POSTGRES_USER=joplin 
+            - POSTGRES_PORT=5432 
+            - POSTGRES_HOST=db
+            - DB_CLIENT=pg
+        restart: unless-stopped
+        image: florider89/joplin-server:latest
+        ports:
+            - 22300:22300
+    db:
+        restart: unless-stopped
+        image: postgres:13.1
+        ports:
+            - 5432:5432
+        volumes:
+            - ./data:/var/lib/postgresql/data
+        environment:
+            - POSTGRES_PASSWORD=${GEN_PASS}
+            - POSTGRES_USER=joplin
+            - POSTGRES_DB=joplin
     labels:
       plugsy.name: "Joplin"
-      plugsy.category: "Productivity"
-      plugsy.link: "http://${LAN_IP}:${port}"
-  db:
-    image: postgres:13.1
-    restart: always
-    environment:
-      - POSTGRES_PASSWORD=${GEN_PASS}
+      plugsy.category: "Home"
+      plugsy.icon: "@styled-icons/material-outlined/NoteAlt"
+      plugsy.link: "http://${LAN_IP}:22300"
+
 EOF
 
   docker-compose -f /opt/docker2/compose/joplin-app/docker-compose.yml up -d