diff --git a/api/v1/common_types.go b/api/v1/common_types.go
index a88c2d902a..fc2f65b046 100644
--- a/api/v1/common_types.go
+++ b/api/v1/common_types.go
@@ -24,7 +24,7 @@ type DataflowState string
 // DataflowUpdateRequestType defines the type of versioned flow update request.
 type DataflowUpdateRequestType string
 
-// ComponentUpdateStrategy defines the type of strategy to update a component
+// ComponentUpdateStrategy defines the type of strategy to update a component.
 // +kubebuilder:validation:Enum={"drop","drain"}
 type ComponentUpdateStrategy string
 
@@ -58,7 +58,7 @@ type ClientConfigType string
 // +kubebuilder:validation:Enum={"external","internal"}
 type ClusterType string
 
-// ClusterManagerType represents an interface implementing the ClientConfigManager.
+// ClusterManagerType defines the type of manager will handle the cluster.
 // +kubebuilder:validation:Enum={"zookeeper","kubernetes"}
 type ClusterManagerType string
 
diff --git a/api/v1/nificluster_types.go b/api/v1/nificluster_types.go
index c3440fde9e..c215f684f4 100644
--- a/api/v1/nificluster_types.go
+++ b/api/v1/nificluster_types.go
@@ -44,10 +44,10 @@ type NifiClusterSpec struct {
 	ProxyUrl string `json:"proxyUrl,omitempty"`
 	// Service defines the policy for services owned by NiFiKop operator.
 	Service ServicePolicy `json:"service,omitempty"`
-	// Pod defines the policy for  pods owned by NiFiKop operator.
+	// Pod defines the policy for pods owned by NiFiKop operator.
 	Pod PodPolicy `json:"pod,omitempty"`
-	// clusterManager specifies
-	// +kubebuilder:default:=kubernetes
+	// clusterManager specifies which manager will handle the cluster election and states.
+	// +kubebuilder:default:=zookeeper
 	// +optional
 	ClusterManager ClusterManagerType `json:"clusterManager,omitempty"`
 	// zKAddress specifies the ZooKeeper connection string
diff --git a/api/v1alpha1/common_types.go b/api/v1alpha1/common_types.go
index e4bc8057a8..95b8e6554b 100644
--- a/api/v1alpha1/common_types.go
+++ b/api/v1alpha1/common_types.go
@@ -29,7 +29,7 @@ type ConnectionState string
 // DataflowUpdateRequestType defines the type of versioned flow update request.
 type DataflowUpdateRequestType string
 
-// ComponentUpdateStrategy defines the type of strategy to update a component
+// ComponentUpdateStrategy defines the type of strategy to update a component.
 // +kubebuilder:validation:Enum={"drop","drain"}
 type ComponentUpdateStrategy string
 
@@ -51,15 +51,15 @@ type ConfigurationState string
 // InitClusterNode holds info about if the node was part of the init cluster setup.
 type InitClusterNode bool
 
-// PKIBackend represents an interface implementing the PKIManager
+// PKIBackend represents an interface implementing the PKIManager.
 // +kubebuilder:validation:Enum={"cert-manager","vault"}
 type PKIBackend string
 
-// ClientConfigType represents an interface implementing the ClientConfigManager
+// ClientConfigType represents an interface implementing the ClientConfigManager.
 // +kubebuilder:validation:Enum={"tls","basic"}
 type ClientConfigType string
 
-// ClusterType represents an interface implementing the  ClientConfigManager
+// ClusterType represents an interface implementing the ClientConfigManager.
 // +kubebuilder:validation:Enum={"external","internal"}
 type ClusterType string
 
diff --git a/api/v1alpha1/nificonnection_types.go b/api/v1alpha1/nificonnection_types.go
index 58eb8b86a5..90b254db34 100644
--- a/api/v1alpha1/nificonnection_types.go
+++ b/api/v1alpha1/nificonnection_types.go
@@ -17,7 +17,7 @@ type NifiConnectionSpec struct {
 	Destination ComponentReference `json:"destination"`
 	// the Configuration of the connection.
 	Configuration ConnectionConfiguration `json:"configuration,omitempty"`
-	// describes the way the operator will deal with data when a connection will be updated : drop or drain.
+	// describes the way the operator will deal with data when a connection will be updated: drop or drain.
 	UpdateStrategy v1.ComponentUpdateStrategy `json:"updateStrategy"`
 }
 
diff --git a/config/crd/bases/nifi.konpyutaika.com_nificlusters.yaml b/config/crd/bases/nifi.konpyutaika.com_nificlusters.yaml
index 1e88ac6ae2..2fabca1c1d 100644
--- a/config/crd/bases/nifi.konpyutaika.com_nificlusters.yaml
+++ b/config/crd/bases/nifi.konpyutaika.com_nificlusters.yaml
@@ -35,7 +35,7 @@ spec:
               clusterImage:
                 type: string
               clusterManager:
-                default: kubernetes
+                default: zookeeper
                 enum:
                 - zookeeper
                 - kubernetes
diff --git a/helm/nifikop/crds/nifi.konpyutaika.com_nificlusters.yaml b/helm/nifikop/crds/nifi.konpyutaika.com_nificlusters.yaml
index 1e88ac6ae2..2fabca1c1d 100644
--- a/helm/nifikop/crds/nifi.konpyutaika.com_nificlusters.yaml
+++ b/helm/nifikop/crds/nifi.konpyutaika.com_nificlusters.yaml
@@ -35,7 +35,7 @@ spec:
               clusterImage:
                 type: string
               clusterManager:
-                default: kubernetes
+                default: zookeeper
                 enum:
                 - zookeeper
                 - kubernetes