diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index e4ec9c9..d452c6c 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -1,19 +1,19 @@
-volumes:
-  txt_postgres_data: {}
-  txt_postgres_data_backups: {}
-
-services:
-  postgres:
-    image: postgres:14
-    hostname: postgres
-    ports:
-      - "5452:5432"
-    volumes:
-      - txt_postgres_data:/var/lib/postgresql/data
-      - txt_postgres_data_backups:/backups
-    environment:
-      - POSTGRES_HOST=postgres
-      - POSTGRES_PORT=5432
-      - POSTGRES_DB=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=txt_password
\ No newline at end of file
+volumes:
+  txt_postgres_data: {}
+  txt_postgres_data_backups: {}
+
+services:
+  postgres:
+    image: postgres:18
+    hostname: postgres
+    ports:
+      - "5452:5432"
+    volumes:
+      - txt_postgres_data:/var/lib/postgresql/docker
+      - txt_postgres_data_backups:/backups
+    environment:
+      - POSTGRES_HOST=postgres
+      - POSTGRES_PORT=5432
+      - POSTGRES_DB=postgres
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=txt_password
diff --git a/docker-compose.yml b/docker-compose.yml
index 6eeee41..8dd2776 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,12 +5,12 @@ volumes:
 
 services:
   postgres:
-    image: postgres:14
+    image: postgres:18
     hostname: postgres
     ports:
       - "5452:5432"
     volumes:
-      - txt_postgres_data:/var/lib/postgresql/data
+      - txt_postgres_data:/var/lib/postgresql/docker
       - txt_postgres_data_backups:/backups
     environment:
       - POSTGRES_HOST=postgres
diff --git a/src/TextServices.Tests.E2E/Infrastructure/E2ETestContext.cs b/src/TextServices.Tests.E2E/Infrastructure/E2ETestContext.cs
index 26c5572..7e210c1 100644
--- a/src/TextServices.Tests.E2E/Infrastructure/E2ETestContext.cs
+++ b/src/TextServices.Tests.E2E/Infrastructure/E2ETestContext.cs
@@ -18,7 +18,7 @@ public sealed class E2ETestContext : IAsyncLifetime
         Path.Combine(Path.GetTempPath(), "TextServicesE2E_" + Guid.NewGuid().ToString("N"));
 
     private readonly PostgreSqlContainer _postgres = new PostgreSqlBuilder()
-        .WithImage("postgres:16-alpine")
+        .WithImage("postgres:18-alpine")
         .Build();
 
     public BuilderApiFactory BuilderFactory { get; private set; } = null!;