Let's solve the config problem in a different PR.