diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 6326e1a..0568b7d 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -20,7 +20,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:17
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index b7f5a3e..0936d27 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -21,7 +21,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:17
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/webdav-stress-test.yml b/.github/workflows/webdav-stress-test.yml
index c4665bd..2e4fc2e 100644
--- a/.github/workflows/webdav-stress-test.yml
+++ b/.github/workflows/webdav-stress-test.yml
@@ -56,7 +56,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:17-alpine
+        image: postgres:18-alpine
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index ed921ae..8d0bf00 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,7 +1,7 @@
 # Docker Compose configuration for development with hot-reloading
 services:
   postgres:
-    image: postgres:17-alpine
+    image: postgres:18-alpine
     environment:
       POSTGRES_USER: readur
       POSTGRES_PASSWORD: readur
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 96f758e..a1b2a93 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,6 +1,6 @@
 services:
   postgres_test:
-    image: postgres:17-alpine
+    image: postgres:18-alpine
     container_name: readur_postgres_test
     environment:
       POSTGRES_USER: readur_test
diff --git a/docker-compose.yml b/docker-compose.yml
index 3effb8f..ac595da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: postgres:17-alpine
+    image: postgres:18-alpine
     environment:
       POSTGRES_USER: readur
       POSTGRES_PASSWORD: readur