diff --git a/paperless/docker-compose.yml b/paperless/docker-compose.yml
index b373e39..54465b4 100644
--- a/paperless/docker-compose.yml
+++ b/paperless/docker-compose.yml
@@ -1,16 +1,16 @@
 services:
   broker:
     container_name: paperless-broker
-    image: docker.io/library/redis:7
+    image: docker.io/library/redis:8
     restart: unless-stopped
     volumes:
       - /home/ccalifice/docker-data/paperless/redisdata:/data
 
   db:
-    image: docker.io/library/postgres:15
+    image: docker.io/library/postgres:18
     restart: unless-stopped
     volumes:
-      - /home/ccalifice/docker-data/paperless/pgdata:/var/lib/postgresql/data
+      - /home/ccalifice/docker-data/paperless/pgdata:/var/lib/postgresql
     environment:
       POSTGRES_DB: paperless
       POSTGRES_USER: paperless
@@ -28,11 +28,6 @@ services:
       - tika
     ports:
       - "8000:8000"
-    healthcheck:
-      test: ["CMD", "curl", "-fs", "-S", "--max-time", "2", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
     volumes:
       - /home/ccalifice/docker-data/paperless/data:/usr/src/paperless/data
       - /home/ccalifice/docker-data/paperless/media:/usr/src/paperless/media
@@ -56,7 +51,7 @@ services:
       - caddy-net
 
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.3.0
+    image: docker.io/gotenberg/gotenberg:8.25
     restart: unless-stopped
     # The gotenberg chromium route is used to convert .eml files. We do not
     # want to allow external content like tracking pixels or even javascript.
@@ -64,12 +59,9 @@ services:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
       - "--chromium-allow-list=file:///tmp/.*"
-    container_name: gotenberg
-
   tika:
-    image: ghcr.io/paperless-ngx/tika:latest
+    image: docker.io/apache/tika:latest
     restart: unless-stopped
-    container_name: tika
 
 networks:
   caddy-net: