Add role vars to differentiate with role defaults