Fix up the yml and also the foreman configuration