Revert "Revert "more changes - added templates for other admin virts""

This reverts commit d85193aa3de60739748d4b2c782b400b73070387.