1. Add puppet client to compute resource 2. Decouple from AWS and include common resources that exist across vendors