A solution for managing a computing system comprising a plurality of client computing machines to be managed and at least one server computing machine for controlling the managing of the client computing machines, wherein each client computing machine has at least one of a plurality of roles in a deployment infrastructure for deploying management data from said at least one server computing machine to the client computing machines. A corresponding method comprises monitoring one or more operative parameters of each client computing machine against one or more reference policies, detecting a non-compliance of the operative parameters to the reference policies, and changing the role of at least one of the client computing machines in response to the non-compliance of the operative parameters to the reference policies for restoring a compliance thereto.