diff --git a/forms-flow-idm/keycloak/docker-compose.yml b/forms-flow-idm/keycloak/docker-compose.yml
index df21043fab..c50b1b7772 100644
--- a/forms-flow-idm/keycloak/docker-compose.yml
+++ b/forms-flow-idm/keycloak/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       POSTGRES_USER: ${KEYCLOAK_JDBC_USER:-admin}
       POSTGRES_PASSWORD: ${KEYCLOAK_JDBC_PASSWORD:-changeme}
     ports:
-      - 5431:5431
+      - 5431:5432
     networks:
       - keycloak-server-network
 
@@ -33,12 +33,12 @@ services:
       - keycloak_custom_data:/keycloak_custom_data
     entrypoint: ["/bin/bash", "-c", "/keycloak_custom_data/start-keycloak.sh"]
     environment:
-      - DB_VENDOR=POSTGRES
-      - DB_ADDR=keycloak-db
-      - DB_PORT=5432
-      - DB_DATABASE=${KEYCLOAK_JDBC_DB:-keycloak}
-      - DB_USER=${KEYCLOAK_JDBC_USER:-admin}
-      - DB_PASSWORD=${KEYCLOAK_JDBC_PASSWORD:-changeme}
+      - KC_DB=postgres
+      - KC_DB_URL_HOST=keycloak-db
+      - KC_DB_URL_PORT=5432
+      - KC_DB_URL_DATABASE=${KEYCLOAK_JDBC_DB:-keycloak}
+      - KC_DB_USERNAME=${KEYCLOAK_JDBC_USER:-admin}
+      - KC_DB_PASSWORD=${KEYCLOAK_JDBC_PASSWORD:-changeme}
       - KEYCLOAK_ADMIN=${KEYCLOAK_ADMIN_USER:-admin}
       - KEYCLOAK_ADMIN_PASSWORD=${KEYCLOAK_ADMIN_PASSWORD:-changeme}
       - KEYCLOAK_START_MODE=${KEYCLOAK_START_MODE:-start-dev}