diff --git a/lab-server/.env.example b/lab-server/.env.example
index 18ad81ce..8cc56b74 100644
--- a/lab-server/.env.example
+++ b/lab-server/.env.example
@@ -2,6 +2,7 @@ PORT=8081
 
 # Keycloak credentials
 KEYCLOAK_PORT=28080
+KEYCLOAK_MANAGEMENT_PORT=29000
 KEYCLOAK_DB_NAME=keycloak_db
 KEYCLOAK_DB_USER=kc-db-admin
 KEYCLOAK_DB_PASS=kc-db-admin
diff --git a/lab-server/docker-compose.yml b/lab-server/docker-compose.yml
index c6775832..ffc05443 100644
--- a/lab-server/docker-compose.yml
+++ b/lab-server/docker-compose.yml
@@ -38,17 +38,21 @@ services:
         restart: unless-stopped
 
     keycloak:
-        image: jboss/keycloak:16.1.0
+        image: quay.io/keycloak/keycloak:25.0.1
         environment:
-            DB_VENDOR: postgres
-            DB_ADDR: keycloak-db
-            DB_DATABASE: ${KEYCLOAK_DB_NAME}
-            DB_USER: ${KEYCLOAK_DB_USER}
-            DB_PASSWORD: ${KEYCLOAK_DB_PASS}
-            KEYCLOAK_USER: ${KEYCLOAK_USER}
-            KEYCLOAK_PASSWORD: ${KEYCLOAK_PASS}
+            KC_DB: postgres
+            KC_DB_URL_HOST: keycloak-db
+            KC_DB_URL_DATABASE: ${KEYCLOAK_DB_NAME}
+            KC_DB_USERNAME: ${KEYCLOAK_DB_USER}
+            KC_DB_PASSWORD: ${KEYCLOAK_DB_PASS}
+            KEYCLOAK_ADMIN: ${KEYCLOAK_USER}
+            KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_PASS}
+            KC_HTTP_MANAGEMENT_PORT: 9000
+            KC_HEALTH_ENABLED: true
+        command: start-dev
         ports:
             - ${KEYCLOAK_PORT}:8080
+            - ${KEYCLOAK_MANAGEMENT_PORT}:9000
         depends_on:
             - keycloak-db
         restart: unless-stopped