Pulling 'shell' from pillar globally makes no sense, probably a mistake; pulling it from user instead.

group requisites were wrong. They required {{ group }}_group, while {{ group }} was the actually added group.

Restructure according to new guidelines.