playbook: Refactor roles a bit

This is a small refactor to prepare for CentOS support