MAESTRO-3030 Updated puppet