improve cloudcontrol setup