diff --git a/peekaping.yaml b/peekaping.yaml
index 9706e02..5e72295 100644
--- a/peekaping.yaml
+++ b/peekaping.yaml
@@ -1,4 +1,3 @@
-version: "3.9"
 
 services:
   peekaping-postgres:
@@ -19,9 +18,16 @@ services:
       labels:
         diun.enable: "true"
 
+  migrate:
+    image: 0xfurai/peekaping-migrate:latest
+    depends_on:
+      - peekaping-postgres
+    networks:
+      - netgrimoire
 
-  peekaping:
-    image: ghcr.io/0xfurai/peekaping-bundle-postgres:latest
+  peekaping-server:
+    image: 0xfurai/peekaping-server:latest
+    restart: unless-stopped
     networks:
       - netgrimoire
     environment:
@@ -35,7 +41,18 @@ services:
       - SERVER_HOST=0.0.0.0
     depends_on:
       - peekaping-postgres
+      - migrate
+    deploy:
+      restart_policy:
+        condition: any
+      labels:
+        diun.enable: "true"
 
+  web:
+    image: 0xfurai/peekaping-web:latest
+    networks:
+      - netgrimoire
+    user: "1001:998"
     deploy:
       restart_policy:
         condition: any
@@ -63,6 +80,7 @@ services:
         caddy.import: authentik
         caddy.reverse_proxy: "{{upstreams 8034}}"
 
+
 networks:
   netgrimoire:
-    external: true
+    external: true
\ No newline at end of file