diff --git a/.devcontainer/codespaces/docker-compose.yml b/.devcontainer/codespaces/docker-compose.yml
index 3ab32136ada..a03fd5facb1 100644
--- a/.devcontainer/codespaces/docker-compose.yml
+++ b/.devcontainer/codespaces/docker-compose.yml
@@ -3,10 +3,10 @@ volumes:
 
 services:
   postgres:
-    image: postgres:16-alpine
+    image: postgres:18-alpine
     restart: unless-stopped
     volumes:
-      - postgres-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql
     environment:
       - POSTGRES_DB=n8n
       - POSTGRES_PASSWORD=password
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 16103c2a4fd..146db221f6b 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -3,10 +3,10 @@ volumes:
 
 services:
   postgres:
-    image: postgres:16-alpine
+    image: postgres:18-alpine
     restart: unless-stopped
     volumes:
-      - postgres-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql
     environment:
       - POSTGRES_DB=n8n
       - POSTGRES_PASSWORD=password
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
index 596a40b8511..82553451283 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - ${MOCK_API_DATA_PATH}/mappings:/home/wiremock/mappings
 
   postgres:
-    image: postgres:16.4
+    image: postgres:18.4
     restart: always
     user: root:root
     environment:
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
index b554d5b4b91..61f725603e7 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       timeout: 3s
 
   postgres:
-    image: postgres:16.4
+    image: postgres:18.4
     restart: always
     environment:
       - POSTGRES_DB=n8n
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
index ee2f221c937..2c5b8b51913 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       timeout: 3s
 
   postgres:
-    image: postgres:16.4
+    image: postgres:18.4
     user: root:root
     restart: always
     environment: