Remove roles to insert them as submodules
Add common roles as submodules