diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a405e8a749..89e7d91fe7 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -48,7 +48,7 @@ jobs:
 
     services:
       postgres:
-        image: 'postgres:17-alpine'
+        image: 'postgres:18-alpine'
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/docker-compose-pgsql.yml b/docker-compose-pgsql.yml
index f7a9e0bc0a..3c55eb6c3b 100644
--- a/docker-compose-pgsql.yml
+++ b/docker-compose-pgsql.yml
@@ -14,7 +14,7 @@ services:
       - ./install/docker/setup.json:/usr/src/app/setup.json
 
   postgres:
-    image: postgres:17.6-alpine
+    image: postgres:18.0-alpine
     restart: unless-stopped
     environment:
       POSTGRES_USER: nodebb
diff --git a/docker-compose.yml b/docker-compose.yml
index 32b02159f8..ee7a18ceb0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
       - redis
 
   postgres:
-    image: postgres:17.6-alpine
+    image: postgres:18.0-alpine
     restart: unless-stopped
     environment:
       POSTGRES_USER: nodebb