Addresses #6705 Only set the role_uuid inside the role vars