diff --git a/bootstrap/internal/controllers/rke2config_controller.go b/bootstrap/internal/controllers/rke2config_controller.go
index 01d81f24..5aa69540 100644
--- a/bootstrap/internal/controllers/rke2config_controller.go
+++ b/bootstrap/internal/controllers/rke2config_controller.go
@@ -151,14 +151,10 @@ func (r *RKE2ConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		scope.Config.Status.Ready = true
 		scope.Config.Status.DataSecretName = scope.Machine.Spec.Bootstrap.DataSecretName
 		conditions.MarkTrue(scope.Config, bootstrapv1.DataSecretAvailableCondition)
-
-		return ctrl.Result{}, nil
 	}
 	// Status is ready means a config has been generated.
 	if scope.Config.Status.Ready {
 		// In any other case just return as the config is already generated and need not be generated again.
-		conditions.MarkTrue(scope.Config, bootstrapv1.DataSecretAvailableCondition)
-
 		return ctrl.Result{}, nil
 	}
 
@@ -210,7 +206,7 @@ func (r *RKE2ConfigReconciler) prepareScope(
 
 		logger.Error(err, "", "rke2-config-namespaced-name", req.NamespacedName)
 
-		return nil, ctrl.Result{Requeue: true}, err
+		return nil, ctrl.Result{}, err
 	}
 
 	machine, err := util.GetOwnerMachine(ctx, r.Client, config.ObjectMeta)
@@ -642,10 +638,6 @@ func (r *RKE2ConfigReconciler) joinControlplane(ctx context.Context, scope *Scop
 		},
 	}
 
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-
 	var userData []byte
 
 	switch scope.Config.Spec.AgentConfig.Format {
@@ -866,7 +858,9 @@ func (r *RKE2ConfigReconciler) storeBootstrapData(ctx context.Context, scope *Sc
 
 	scope.Config.Status.DataSecretName = ptr.To(secret.Name)
 	scope.Config.Status.Ready = true
-	//	conditions.MarkTrue(scope.Config, bootstrapv1.DataSecretAvailableCondition)
+
+	conditions.MarkTrue(scope.Config, bootstrapv1.DataSecretAvailableCondition)
+
 	return nil
 }
 
diff --git a/controlplane/internal/controllers/rke2controlplane_controller.go b/controlplane/internal/controllers/rke2controlplane_controller.go
index 00729e5a..b732525d 100644
--- a/controlplane/internal/controllers/rke2controlplane_controller.go
+++ b/controlplane/internal/controllers/rke2controlplane_controller.go
@@ -100,7 +100,7 @@ func (r *RKE2ControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.Req
 			return ctrl.Result{}, err
 		}
 
-		return ctrl.Result{Requeue: true}, err
+		return ctrl.Result{}, err
 	}
 
 	// Fetch the Cluster.
@@ -145,7 +145,7 @@ func (r *RKE2ControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.Req
 			return ctrl.Result{}, errors.Wrapf(err, "failed to add finalizer")
 		}
 
-		return ctrl.Result{}, nil
+		return ctrl.Result{Requeue: true}, nil
 	}
 
 	defer func() {
@@ -742,7 +742,7 @@ func (r *RKE2ControlPlaneReconciler) reconcileKubeconfig(
 	configSecret, err := secret.GetFromNamespacedName(ctx, r.Client, clusterName, secret.Kubeconfig)
 
 	switch {
-	case apierrors.IsNotFound(errors.Cause(err)):
+	case apierrors.IsNotFound(err):
 		createErr := kubeconfig.CreateSecretWithOwner(
 			ctx,
 			r.Client,