diff --git a/docker-compose.yaml b/docker-compose.yaml
index 225cf5d4..dadb2963 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -10,8 +10,8 @@ services:
   postgres:
     image: "openmaptiles/postgis:6.0"
     environment:
-      POSTGRES_USER: obs
-      POSTGRES_PASSWORD: obs
+      POSTGRES_USER: keycloak
+      POSTGRES_PASSWORD: password
       POSTGRES_DB: obs
     ports:
       - '5432:5432'
@@ -87,17 +87,17 @@ services:
       - start
 
   keycloak:
-    image: quay.io/keycloak/keycloak:20.0
+    image: quay.io/keycloak/keycloak:21.0
     ports:
-      - 3003:8080
+      - '3003:8080'
     depends_on:
       - postgres
     environment:
       KC_HOSTNAME: localhost
-      KC_DB_URL: jdbc:postgresql://localhost:5432/obs
-      KC_DB: obs
-      KC_DB_USERNAME: obs
-      KC_DB_PASSWORD: obs
+      KC_DB_URL: jdbc:postgresql://postgres:5432/obs
+      KC_DB: postgres
+      KC_DB_USERNAME: keycloak
+      KC_DB_PASSWORD: password
       KEYCLOAK_ADMIN: admin
       KEYCLOAK_ADMIN_PASSWORD: admin
     command: