diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index f6ae2b4..c31fb57 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -17,7 +17,7 @@ services:
   # PostgreSQL Database
   # ==========================================================================
   postgres:
-    image: postgres:16-alpine
+    image: postgres:18-alpine
     container_name: agentgate-postgres
     environment:
       POSTGRES_USER: ${POSTGRES_USER:-agentgate}
diff --git a/docker-compose.yml b/docker-compose.yml
index 9d3fabd..0027906 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   # PostgreSQL Database
   # ==========================================================================
   postgres:
-    image: postgres:16-alpine
+    image: postgres:18-alpine
     container_name: agentgate-postgres
     environment:
       POSTGRES_USER: ${POSTGRES_USER:-agentgate}