Design for KEYCLOAK-238