diff --git a/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2
index c2108d8..f359f47 100644
--- a/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2
@@ -3,7 +3,7 @@
 
 services:
   database:
-    image: docker.io/library/mariadb:11
+    image: docker.io/library/mariadb:12
     environment:
       - "MARIADB_DATABASE=wordpress"
       - "MARIADB_ROOT_PASSWORD={{ secret__mariadb_root_password }}"
diff --git a/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2
index 165c62d..ea48002 100644
--- a/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2
@@ -46,12 +46,12 @@ services:
       - "8080:8080"
 
   db:
-    image: docker.io/library/postgres:15.17
+    image: docker.io/library/postgres:18
     restart: unless-stopped
     networks:
       - keycloak
     volumes:
-      - "./database:/var/lib/postgresql/data"
+      - "./database:/var/lib/postgresql"
     environment:
       POSTGRES_USER: keycloak
       POSTGRES_PASSWORD: {{ secret__keycloak_db_password }}