Merge "Fix keycloak proxy image"