role templates: revert
Revert "role templates: revert"

This reverts commit d2f68222bfe3b305bc3ac8d37ba1ff859da623b4.
role template clean up