Align with the current versions from Keycloak