Prepare for Keycloak final