diff --git a/stacks/apps/peertube/stack.yml b/stacks/apps/peertube/stack.yml
index 6891e1f..e9fc12b 100644
--- a/stacks/apps/peertube/stack.yml
+++ b/stacks/apps/peertube/stack.yml
@@ -8,7 +8,7 @@ services:
     - POSTGRES_USER=admin
     - POSTGRES_PASSWORD=AllOfTheStars+1
     - POSTGRES_DB=peertube
-    - POSTGRES_HOST=10.0.4.10
+    - POSTGRES_HOSTNAME=peertube-postgres
     - POSTGRES_PORT=5432
     # Redis configuration
     - REDIS_HOSTNAME=peertube-redis
@@ -74,6 +74,23 @@ services:
       mode: replicated
       replicas: 1
 
+  peertube-postgres:
+    image: postgres:17-alpine
+    secrets:
+    - postgres-master
+    networks:
+    - homelab
+    environment:
+    - POSTGRES_USER=admin
+    - POSTGRES_PASSWORD=AllOfTheStars+1
+    - POSTGRES_DB=peertube
+    volumes:
+    - /home/doc/projects/swarm-data/appdata/peertube/postgres:/var/lib/postgresql/data
+    ports:
+    - 5432:5432
+    deploy:
+      replicas: 1
+
 networks:
   homelab:
     external: true