diff --git a/cluster/validation.go b/cluster/validation.go
index a0b7e248..5995cfd4 100644
--- a/cluster/validation.go
+++ b/cluster/validation.go
@@ -71,15 +71,6 @@ func validateHostsOptions(c *Cluster) error {
 				return fmt.Errorf("Role [%s] for host (%d) is not recognized", role, i+1)
 			}
 		}
-		k := 0
-		for _, role := range host.Role {
-			if role == services.ControlRole || role == services.WorkerRole {
-				k++
-			}
-		}
-		if k > 1 {
-			return fmt.Errorf("Host (%d) can't contain both worker and controlplane roles", i+1)
-		}
 	}
 	return nil
 }
diff --git a/services/kubelet.go b/services/kubelet.go
index 4c50142c..416eadde 100644
--- a/services/kubelet.go
+++ b/services/kubelet.go
@@ -44,7 +44,6 @@ func buildKubeletConfig(host hosts.Host, kubeletService v1.KubeletService, isMas
 		},
 	}
 	if isMaster {
-		imageCfg.Cmd = append(imageCfg.Cmd, "--register-with-taints=node-role.kubernetes.io/master=:NoSchedule")
 		imageCfg.Cmd = append(imageCfg.Cmd, "--node-labels=node-role.kubernetes.io/master=true")
 	}
 	hostCfg := &container.HostConfig{
diff --git a/services/workerplane.go b/services/workerplane.go
index 0d4ca263..fe25c032 100644
--- a/services/workerplane.go
+++ b/services/workerplane.go
@@ -10,29 +10,33 @@ func RunWorkerPlane(controlHosts []hosts.Host, workerHosts []hosts.Host, workerS
 	logrus.Infof("[%s] Building up Worker Plane..", WorkerRole)
 	for _, host := range controlHosts {
 		// only one master for now
-		err := runKubelet(host, workerServices.Kubelet, true)
-		if err != nil {
+		if err := runKubelet(host, workerServices.Kubelet, true); err != nil {
 			return err
 		}
-		err = runKubeproxy(host, workerServices.Kubeproxy)
-		if err != nil {
+		if err := runKubeproxy(host, workerServices.Kubeproxy); err != nil {
 			return err
 		}
 	}
 	for _, host := range workerHosts {
 		// run nginx proxy
-		err := runNginxProxy(host, controlHosts)
-		if err != nil {
-			return err
+		isControlPlaneHost := false
+		for _, role := range host.Role {
+			if role == ControlRole {
+				isControlPlaneHost = true
+				break
+			}
+		}
+		if !isControlPlaneHost {
+			if err := runNginxProxy(host, controlHosts); err != nil {
+				return err
+			}
 		}
 		// run kubelet
-		err = runKubelet(host, workerServices.Kubelet, false)
-		if err != nil {
+		if err := runKubelet(host, workerServices.Kubelet, false); err != nil {
 			return err
 		}
 		// run kubeproxy
-		err = runKubeproxy(host, workerServices.Kubeproxy)
-		if err != nil {
+		if err := runKubeproxy(host, workerServices.Kubeproxy); err != nil {
 			return err
 		}
 	}
@@ -43,27 +47,22 @@ func RunWorkerPlane(controlHosts []hosts.Host, workerHosts []hosts.Host, workerS
 func RemoveWorkerPlane(controlHosts []hosts.Host, workerHosts []hosts.Host) error {
 	logrus.Infof("[%s] Tearing down Worker Plane..", WorkerRole)
 	for _, host := range controlHosts {
-		err := removeKubelet(host)
-		if err != nil {
+		if err := removeKubelet(host); err != nil {
 			return err
 		}
-		err = removeKubeproxy(host)
-		if err != nil {
+		if err := removeKubeproxy(host); err != nil {
 			return err
 		}
 	}
 
 	for _, host := range workerHosts {
-		err := removeKubelet(host)
-		if err != nil {
+		if err := removeKubelet(host); err != nil {
 			return err
 		}
-		err = removeKubeproxy(host)
-		if err != nil {
+		if err := removeKubeproxy(host); err != nil {
 			return err
 		}
-		err = removeNginxProxy(host)
-		if err != nil {
+		if err := removeNginxProxy(host); err != nil {
 			return err
 		}
 	}