diff --git a/docker-compose.yaml b/docker-compose.yaml
index d18e4f3..e98f460 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,11 +17,11 @@ services:
       DB_FILE: /var/lib/joplin/database.sqlite
 
       # Postgres
-      POSTGRES_HOST: 
-      POSTGRES_DATABASE:
-      POSTGRES_USER: 
-      POSTGRES_PASSWORD:
-      POSTGRES_PORT:
+      POSTGRES_HOST: postgres
+      POSTGRES_DATABASE: joplindb
+      POSTGRES_USER: joplin
+      POSTGRES_PASSWORD: ${PG_PASS}
+      POSTGRES_PORT: 5432
 
 
       #LDAP
@@ -57,6 +57,22 @@ services:
       - joplin-net
 
 
+  postgres:
+    container_name: postgres
+    image: postgres:16
+    restart: always
+    environment:
+      POSTGRES_DB: joplindb
+      POSTGRES_USER: joplin
+      POSTGRES_PASSWORD: ${PG_PASS}
+    ports:
+      - "5432:5432"
+    volumes:
+      - database:/var/lib/postgresql/data
+    networks:
+      - joplin-net
+
+
   joplin-vieweb:
     image: gri38/django-joplin-vieweb:latest
     container_name: joplin-vieweb
@@ -95,6 +111,7 @@ volumes:
   data:
   vieweb:
   apidata:
+  database:
 
 
 networks: