Move ClusterName and ControlMachine options to parameters