diff --git a/api/v1alpha1/userconfig/service/clickhouse/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/clickhouse/zz_generated.deepcopy.go
index 3f9dae09..177650e5 100644
--- a/api/v1alpha1/userconfig/service/clickhouse/zz_generated.deepcopy.go
+++ b/api/v1alpha1/userconfig/service/clickhouse/zz_generated.deepcopy.go
@@ -101,6 +101,11 @@ func (in *PrivateAccess) DeepCopyInto(out *PrivateAccess) {
 		*out = new(bool)
 		**out = **in
 	}
+	if in.ClickhouseMysql != nil {
+		in, out := &in.ClickhouseMysql, &out.ClickhouseMysql
+		*out = new(bool)
+		**out = **in
+	}
 	if in.Prometheus != nil {
 		in, out := &in.Prometheus, &out.Prometheus
 		*out = new(bool)
@@ -131,6 +136,11 @@ func (in *PrivatelinkAccess) DeepCopyInto(out *PrivatelinkAccess) {
 		*out = new(bool)
 		**out = **in
 	}
+	if in.ClickhouseMysql != nil {
+		in, out := &in.ClickhouseMysql, &out.ClickhouseMysql
+		*out = new(bool)
+		**out = **in
+	}
 	if in.Prometheus != nil {
 		in, out := &in.Prometheus, &out.Prometheus
 		*out = new(bool)
@@ -161,6 +171,11 @@ func (in *PublicAccess) DeepCopyInto(out *PublicAccess) {
 		*out = new(bool)
 		**out = **in
 	}
+	if in.ClickhouseMysql != nil {
+		in, out := &in.ClickhouseMysql, &out.ClickhouseMysql
+		*out = new(bool)
+		**out = **in
+	}
 	if in.Prometheus != nil {
 		in, out := &in.Prometheus, &out.Prometheus
 		*out = new(bool)
diff --git a/api/v1alpha1/userconfig/service/opensearch/opensearch.go b/api/v1alpha1/userconfig/service/opensearch/opensearch.go
index 8c8a44f2..1b132a6d 100644
--- a/api/v1alpha1/userconfig/service/opensearch/opensearch.go
+++ b/api/v1alpha1/userconfig/service/opensearch/opensearch.go
@@ -301,7 +301,7 @@ type Opensearch struct {
 	ScriptMaxCompilationsRate *string `groups:"create,update" json:"script_max_compilations_rate,omitempty"`
 
 	// +kubebuilder:validation:Minimum=1
-	// +kubebuilder:validation:Maximum=65536
+	// +kubebuilder:validation:Maximum=1000000
 	// Maximum number of aggregation buckets allowed in a single response. OpenSearch default value is used when this is not defined.
 	SearchMaxBuckets *int `groups:"create,update" json:"search_max_buckets,omitempty"`
 
diff --git a/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml b/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml
index f035a644..06e32d83 100644
--- a/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml
+++ b/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml
@@ -600,7 +600,7 @@ spec:
                         description: Maximum number of aggregation buckets allowed
                           in a single response. OpenSearch default value is used when
                           this is not defined.
-                        maximum: 65536
+                        maximum: 1000000
                         minimum: 1
                         type: integer
                       thread_pool_analyze_queue_size:
diff --git a/config/crd/bases/aiven.io_opensearches.yaml b/config/crd/bases/aiven.io_opensearches.yaml
index f035a644..06e32d83 100644
--- a/config/crd/bases/aiven.io_opensearches.yaml
+++ b/config/crd/bases/aiven.io_opensearches.yaml
@@ -600,7 +600,7 @@ spec:
                         description: Maximum number of aggregation buckets allowed
                           in a single response. OpenSearch default value is used when
                           this is not defined.
-                        maximum: 65536
+                        maximum: 1000000
                         minimum: 1
                         type: integer
                       thread_pool_analyze_queue_size:
diff --git a/docs/docs/api-reference/opensearch.md b/docs/docs/api-reference/opensearch.md
index 6a774209..b575b295 100644
--- a/docs/docs/api-reference/opensearch.md
+++ b/docs/docs/api-reference/opensearch.md
@@ -248,7 +248,7 @@ OpenSearch settings.
 - [`override_main_response_version`](#spec.userConfig.opensearch.override_main_response_version-property){: name='spec.userConfig.opensearch.override_main_response_version-property'} (boolean). Compatibility mode sets OpenSearch to report its version as 7.10 so clients continue to work. Default is false.
 - [`reindex_remote_whitelist`](#spec.userConfig.opensearch.reindex_remote_whitelist-property){: name='spec.userConfig.opensearch.reindex_remote_whitelist-property'} (array of strings, MaxItems: 32). Whitelisted addresses for reindexing. Changing this value will cause all OpenSearch instances to restart.
 - [`script_max_compilations_rate`](#spec.userConfig.opensearch.script_max_compilations_rate-property){: name='spec.userConfig.opensearch.script_max_compilations_rate-property'} (string, MaxLength: 1024). Script compilation circuit breaker limits the number of inline script compilations within a period of time. Default is use-context.
-- [`search_max_buckets`](#spec.userConfig.opensearch.search_max_buckets-property){: name='spec.userConfig.opensearch.search_max_buckets-property'} (integer, Minimum: 1, Maximum: 65536). Maximum number of aggregation buckets allowed in a single response. OpenSearch default value is used when this is not defined.
+- [`search_max_buckets`](#spec.userConfig.opensearch.search_max_buckets-property){: name='spec.userConfig.opensearch.search_max_buckets-property'} (integer, Minimum: 1, Maximum: 1000000). Maximum number of aggregation buckets allowed in a single response. OpenSearch default value is used when this is not defined.
 - [`thread_pool_analyze_queue_size`](#spec.userConfig.opensearch.thread_pool_analyze_queue_size-property){: name='spec.userConfig.opensearch.thread_pool_analyze_queue_size-property'} (integer, Minimum: 10, Maximum: 2000). Size for the thread pool queue. See documentation for exact details.
 - [`thread_pool_analyze_size`](#spec.userConfig.opensearch.thread_pool_analyze_size-property){: name='spec.userConfig.opensearch.thread_pool_analyze_size-property'} (integer, Minimum: 1, Maximum: 128). Size for the thread pool. See documentation for exact details. Do note this may have maximum value depending on CPU count - value is automatically lowered if set to higher than maximum value.
 - [`thread_pool_force_merge_size`](#spec.userConfig.opensearch.thread_pool_force_merge_size-property){: name='spec.userConfig.opensearch.thread_pool_force_merge_size-property'} (integer, Minimum: 1, Maximum: 128). Size for the thread pool. See documentation for exact details. Do note this may have maximum value depending on CPU count - value is automatically lowered if set to higher than maximum value.