diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d8ca6b3a..24635977 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:16
+        image: postgres:18
         ports:
         - 5432:5432
         env:
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 4b6b996a..72c08a78 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -69,7 +69,7 @@ services:
     command: memcached -I 8M
 
   db:
-    image: postgres:16
+    image: postgres:18
     container_name: th_db
     restart: always
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index a01bd897..ac49ad7e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -68,7 +68,7 @@ services:
     command: memcached -I 8M
 
   db:
-    image: postgres:16
+    image: postgres:18
     container_name: th_db
     environment:
       # Relevant only when the container finds no existing database.