Add run stages, and ensure puppet is stopped after running