diff --git a/dumbterm.yaml b/dumbterm.yaml
index 5a71641..048210c 100644
--- a/dumbterm.yaml
+++ b/dumbterm.yaml
@@ -19,11 +19,7 @@ services:
       ENABLE_STARSHIP: "true" # Enable starship prompt
       LOCKOUT_TIME: 15 # Minutes
       MAX_SESSION_AGE: 24 # Hours
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "udp://192.168.5.17:12201"
-        tag: "dumbterm"
+
 
     deploy:
       labels:
diff --git a/peekaping.yaml b/peekaping.yaml
index 66259f2..1361479 100644
--- a/peekaping.yaml
+++ b/peekaping.yaml
@@ -14,49 +14,53 @@ services:
     user: "1001:998"
     deploy:
       restart_policy:
-        condition: any
+        condition: on-failure
       labels:
         diun.enable: "true"
 
   migrate:
     image: 0xfurai/peekaping-migrate:latest
-    depends_on:
-      - peekaping-postgres
     environment:
       - DB_USER=peekaping
       - DB_PASS=peekapingpass
       - DB_NAME=peekaping
-      - DB_HOST=tasks.peekaping-postgres
+      - DB_HOST=peekaping-postgres   # <-- fix
       - DB_PORT=5432
       - TZ=America/Chicago
       - SERVER_PORT=8034
       - SERVER_HOST=0.0.0.0
+      - MODE=prod
     user: "1001:998"
     networks:
       - netgrimoire
+    deploy:
+      replicas: 0
+      restart_policy:
+        condition: none
 
   peekaping-server:
     image: 0xfurai/peekaping-server:latest
-    restart: unless-stopped
     networks:
       - netgrimoire
     environment:
       - DB_USER=peekaping
       - DB_PASS=peekapingpass
       - DB_NAME=peekaping
-      - DB_HOST=tasks.peekaping-postgres
+      - DB_HOST=peekaping-postgres   # <-- fix
       - DB_PORT=5432
       - TZ=America/Chicago
       - SERVER_PORT=8034
       - SERVER_HOST=0.0.0.0
-    depends_on:
-      - peekaping-postgres
-      - migrate
+      - MODE=prod
     deploy:
       restart_policy:
-        condition: any
+        condition: on-failure
       labels:
         diun.enable: "true"
+        # Caddy
+        caddy: peekaping.netgrimoire.com
+        caddy.import: authentik
+        caddy.reverse_proxy: "{{upstreams 8034}}"
 
   web:
     image: 0xfurai/peekaping-web:latest
@@ -65,7 +69,7 @@ services:
     user: "1001:998"
     deploy:
       restart_policy:
-        condition: any
+        condition: on-failure
       labels:
         # Homepage
         homepage.group: "Monitoring"
@@ -76,21 +80,15 @@ services:
 
         # Kuma integration
         kuma.monitoring.http.name: "Peekaping"
-        kuma.monitoring.http.url: "http://peekaping:8034"
+        kuma.monitoring.http.url: "http://peekaping-server:8034"   # <-- fix
 
         # Peekaping self-monitor
         peekaping.name: "Peekaping"
-        peekaping.url: "http://peekaping:8034"
+        peekaping.url: "http://peekaping-server:8034"   # <-- fix
 
         # Diun
         diun.enable: "true"
 
-        # Caddy
-        caddy: peekaping.netgrimoire.com
-        caddy.import: authentik
-        caddy.reverse_proxy: "{{upstreams 8034}}"
-
-
 networks:
   netgrimoire:
-    external: true
\ No newline at end of file
+    external: true