diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 457297f..4169440 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -5,8 +5,6 @@ volumes:
         external: true
     victoria-metrics:
         external: true
-    postgres-16:
-        external: true
     postgres-17:
         external: true
 
@@ -24,14 +22,6 @@ networks:
                   gateway: 2a01:e0a:5b7:35f1::1
 
 services:
-    postgres16:
-        image: postgres:16-alpine
-        volumes:
-            - postgres-16:/var/lib/postgresql/data
-            - ssl:/ssl:ro
-        environment:
-            - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K
-        restart: always
     postgres:
         image: postgres:17-alpine
         volumes:
@@ -44,7 +34,7 @@ services:
                 ipv6_address: 2a01:e0a:5b7:35f1::5432
         restart: always
     caddy:
-        image: caddy-alpine:latest
+        image: caddy:alpine
         volumes:
             - ssl:/ssl:ro
             - /etc/caddy:/etc/caddy
@@ -62,7 +52,7 @@ services:
                 ipv6_address: 2a01:e0a:5b7:35f1::443
                 ipv4_address: 172.20.0.250
     redis:
-        image: redis:alpine
+        image: valkey/valkey
         restart: always
         volumes:
             - /srv/docker/volume/redis/data:/data
@@ -95,10 +85,7 @@ services:
         mem_limit: 128M
         command: /run/powerdns_exporter -api-url http://pdns:8081/api/v1/ -api-key ${API_KEY}
     grafana:
-        image: grafana/grafana:11.4.1
-        environment:
-        - GF_INSTALL_PLUGINS=https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/v0.4.0/victorialogs-datasource-v0.4.0.zip;victorialogs-datasource
-        - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=victorialogs-datasource
+        image: grafana/grafana:main
         volumes:
             - /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini
         restart: always
@@ -248,12 +235,8 @@ services:
 #        command: minio server /data
 #        mem_limit: 1G
 #        cpus: 0.5
-    matrixsyncv3:
-        image: ghcr.io/matrix-org/sliding-sync:latest
-        env_file: env/matrixsyncv3
-        restart: always
     conduwuit:
-        image: girlbossceo/conduwuit
+        image: ghcr.io/girlbossceo/conduwuit:latest
         env_file: env/conduwuit
         volumes:
             - /srv/docker/volume/conduwuit/config:/config:ro
@@ -262,17 +245,6 @@ services:
         restart: always
         mem_limit: 2G
         cpus: 1
-    dendrite:
-        image: matrixdotorg/dendrite-monolith:main
-        volumes:
-            - /srv/docker/volume/dendrite/dendrite.yaml:/etc/dendrite/dendrite.yaml:ro
-            - /srv/docker/volume/dendrite/cert:/cert:ro
-            - /srv/docker/volume/dendrite/media:/var/dendrite/media
-            - /srv/docker/volume/dendrite/logs:/var/dendrite/logs
-            - /srv/docker/volume/dendrite/jetstream:/var/dendrite/jetstream
-        restart: always
-        mem_limit: 2G
-        cpus: 1
     matrix-alertmanager:
         image: jaywink/matrix-alertmanager:latest
         env_file: env/matrix-alertmanager