Add more puppets, allow failure on 2.1.1