Fix deploy/undeploy bug with more tha one cluster