Simplify puppet setup