Add server tag to the appropriate roles
Rename cm_cleanup var into more general cleanup. Introduce only_cleanup var