diff --git a/cmd/util.go b/cmd/util.go
index 59c9d815..4b10e4ad 100644
--- a/cmd/util.go
+++ b/cmd/util.go
@@ -35,7 +35,6 @@ func waitAction(ctx context.Context, client *hcloud.Client, action *hcloud.Actio
 				errCh <- ctx.Err()
 				return
 			case <-ticker.C:
-				break
 			}
 
 			action, _, err := client.Action.GetByID(ctx, action.ID)
diff --git a/pkg/clustermanager/cluster.go b/pkg/clustermanager/cluster.go
index a66c80de..ae6358a9 100644
--- a/pkg/clustermanager/cluster.go
+++ b/pkg/clustermanager/cluster.go
@@ -165,7 +165,6 @@ func (manager *Manager) InstallMasters() error {
 	numMaster := 0
 
 	for _, node := range manager.nodes {
-
 		if node.IsMaster {
 			_, err := manager.nodeCommunicator.RunCmd(node, "kubeadm reset")
 			if err != nil {
@@ -313,21 +312,15 @@ func (manager *Manager) InstallEtcdNodes(nodes []Node) error {
 
 //InstallWorkers installs kubernetes workers to given nodes
 func (manager *Manager) InstallWorkers(nodes []Node) error {
-	var joinCommand string
+	node, err := manager.clusterProvider.GetMasterNode()
+	if err != nil {
+		return err
+	}
+
 	// create join command
-	for _, node := range manager.nodes {
-		if node.IsMaster {
-			for tries := 0; ; tries++ {
-				output, err := manager.nodeCommunicator.RunCmd(node, "kubeadm token create --print-join-command")
-				if tries < 10 && err != nil {
-					return err
-				}
-				time.Sleep(2 * time.Second)
-				joinCommand = output
-				break
-			}
-			break
-		}
+	joinCommand, err := manager.nodeCommunicator.RunCmd(*node, "kubeadm token create --print-join-command")
+	if err != nil {
+		return err
 	}
 
 	errChan := make(chan error)
diff --git a/pkg/clustermanager/ssh_communicator.go b/pkg/clustermanager/ssh_communicator.go
index 8903a681..563cda33 100644
--- a/pkg/clustermanager/ssh_communicator.go
+++ b/pkg/clustermanager/ssh_communicator.go
@@ -121,10 +121,11 @@ func (sshComm *SSHCommunicator) WriteFile(node Node, filePath string, content st
 	defer connection.Close()
 	// log.Println("Connected succeeded!")
 	session, err := connection.NewSession()
-	defer session.Close()
 	if err != nil {
 		log.Fatalf("session failed:%v", err)
 	}
+	defer session.Close()
+
 	permission := "C0644"
 	if executable {
 		permission = "C0755"
diff --git a/pkg/hetzner/util.go b/pkg/hetzner/util.go
index a980f21f..5296a125 100644
--- a/pkg/hetzner/util.go
+++ b/pkg/hetzner/util.go
@@ -43,7 +43,6 @@ func waitAction(ctx context.Context, client *hcloud.Client, action *hcloud.Actio
 				errCh <- ctx.Err()
 				return
 			case <-ticker.C:
-				break
 			}
 
 			action, _, err := client.Action.GetByID(ctx, action.ID)