Fix the yaml paths and add more users