diff --git a/pkg/scripts/kubeadm.go b/pkg/scripts/kubeadm.go
index b5aa8549c..42328830f 100644
--- a/pkg/scripts/kubeadm.go
+++ b/pkg/scripts/kubeadm.go
@@ -54,6 +54,7 @@ var (
 		sudo rm -rf /etc/kubernetes/encryption-providers
 		sudo rm -rf /var/lib/etcd/
 		sudo rm -rf "{{ .WORK_DIR }}"
+		sudo rm -rf /etc/kubeone
 	`)
 
 	kubeadmUpgradeLeaderScriptTemplate = heredoc.Doc(`
diff --git a/pkg/scripts/testdata/TestKubeadmReset-not-verbose.golden b/pkg/scripts/testdata/TestKubeadmReset-not-verbose.golden
index 5b2f351b3..9f7213a5f 100644
--- a/pkg/scripts/testdata/TestKubeadmReset-not-verbose.golden
+++ b/pkg/scripts/testdata/TestKubeadmReset-not-verbose.golden
@@ -6,3 +6,4 @@ sudo rm -rf /etc/kubernetes/admission
 sudo rm -rf /etc/kubernetes/encryption-providers
 sudo rm -rf /var/lib/etcd/
 sudo rm -rf "test-wd"
+sudo rm -rf /etc/kubeone
diff --git a/pkg/scripts/testdata/TestKubeadmReset-verbose.golden b/pkg/scripts/testdata/TestKubeadmReset-verbose.golden
index b8af0ee25..2b16c0305 100644
--- a/pkg/scripts/testdata/TestKubeadmReset-verbose.golden
+++ b/pkg/scripts/testdata/TestKubeadmReset-verbose.golden
@@ -6,3 +6,4 @@ sudo rm -rf /etc/kubernetes/admission
 sudo rm -rf /etc/kubernetes/encryption-providers
 sudo rm -rf /var/lib/etcd/
 sudo rm -rf "test-wd"
+sudo rm -rf /etc/kubeone
diff --git a/pkg/tasks/certs.go b/pkg/tasks/certs.go
index 2f219ee6c..b854f7acb 100644
--- a/pkg/tasks/certs.go
+++ b/pkg/tasks/certs.go
@@ -129,6 +129,10 @@ func earliestCertExpiry(conn ssh.Connection) (time.Time, error) {
 }
 
 func ensureCABundleConfigMap(s *state.State) error {
+	if s.DynamicClient == nil {
+		return errors.New("kubernetes client not initialized")
+	}
+
 	s.Logger.Infoln("Creating ca-bundle configMap...")
 
 	cm := cabundle.ConfigMap(s.Cluster.CABundle)
diff --git a/pkg/tasks/prerequisites.go b/pkg/tasks/prerequisites.go
index ffa631d09..c7e3b83ca 100644
--- a/pkg/tasks/prerequisites.go
+++ b/pkg/tasks/prerequisites.go
@@ -167,7 +167,7 @@ func installKubeadmFlatcar(s *state.State) error {
 }
 
 func uploadConfigurationFiles(s *state.State) error {
-	return s.RunTaskOnControlPlane(uploadConfigurationFilesToNode, state.RunParallel)
+	return s.RunTaskOnAllNodes(uploadConfigurationFilesToNode, state.RunParallel)
 }
 
 func uploadConfigurationFilesToNode(s *state.State, node *kubeoneapi.HostConfig, conn ssh.Connection) error {
diff --git a/pkg/tasks/tasks.go b/pkg/tasks/tasks.go
index 750508196..1d6cafdaf 100644
--- a/pkg/tasks/tasks.go
+++ b/pkg/tasks/tasks.go
@@ -109,7 +109,7 @@ func WithFullInstall(t Tasks) Tasks {
 		append(Tasks{
 			{
 				Fn: func(s *state.State) error {
-					s.Logger.Infoln("Configuring certs and etcd on first controller...")
+					s.Logger.Infoln("Configuring certs and etcd on control plane node...")
 					return s.RunTaskOnLeader(kubeadmCertsExecutor)
 				},
 				ErrMsg: "failed to provision certs and etcd on leader",
@@ -130,7 +130,7 @@ func WithFullInstall(t Tasks) Tasks {
 			},
 			{
 				Fn: func(s *state.State) error {
-					s.Logger.Infoln("Configuring certs and etcd on consecutive controller...")
+					s.Logger.Infoln("Configuring certs and etcd on consecutive control plane node...")
 					return s.RunTaskOnFollowers(kubeadmCertsExecutor, state.RunParallel)
 				},
 				ErrMsg: "failed to provision certs and etcd on followers",