diff --git a/config/crd/bases/apps.emqx.io_emqxbrokers.yaml b/config/crd/bases/apps.emqx.io_emqxbrokers.yaml
index e3afc977..63218868 100644
--- a/config/crd/bases/apps.emqx.io_emqxbrokers.yaml
+++ b/config/crd/bases/apps.emqx.io_emqxbrokers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: emqxbrokers.apps.emqx.io
 spec:
   group: apps.emqx.io
diff --git a/config/crd/bases/apps.emqx.io_emqxenterprises.yaml b/config/crd/bases/apps.emqx.io_emqxenterprises.yaml
index ac0282c5..c15dc5ee 100644
--- a/config/crd/bases/apps.emqx.io_emqxenterprises.yaml
+++ b/config/crd/bases/apps.emqx.io_emqxenterprises.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: emqxenterprises.apps.emqx.io
 spec:
   group: apps.emqx.io
diff --git a/config/crd/bases/apps.emqx.io_emqxes.yaml b/config/crd/bases/apps.emqx.io_emqxes.yaml
index bdbd853b..87df0d31 100644
--- a/config/crd/bases/apps.emqx.io_emqxes.yaml
+++ b/config/crd/bases/apps.emqx.io_emqxes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: emqxes.apps.emqx.io
 spec:
   group: apps.emqx.io
diff --git a/config/crd/bases/apps.emqx.io_emqxplugins.yaml b/config/crd/bases/apps.emqx.io_emqxplugins.yaml
index bf19794f..fa65c5ee 100644
--- a/config/crd/bases/apps.emqx.io_emqxplugins.yaml
+++ b/config/crd/bases/apps.emqx.io_emqxplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: emqxplugins.apps.emqx.io
 spec:
   group: apps.emqx.io
diff --git a/config/crd/bases/apps.emqx.io_rebalances.yaml b/config/crd/bases/apps.emqx.io_rebalances.yaml
index 3ad98a54..10101a2f 100644
--- a/config/crd/bases/apps.emqx.io_rebalances.yaml
+++ b/config/crd/bases/apps.emqx.io_rebalances.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: rebalances.apps.emqx.io
 spec:
   group: apps.emqx.io
diff --git a/deploy/charts/emqx-operator/Chart.yaml b/deploy/charts/emqx-operator/Chart.yaml
index 9691e8c5..8d750b42 100644
--- a/deploy/charts/emqx-operator/Chart.yaml
+++ b/deploy/charts/emqx-operator/Chart.yaml
@@ -15,12 +15,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.2.24
+version: 2.2.25
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 2.2.24
+appVersion: 2.2.25
 
 sources:
   - https://github.com/emqx/emqx-operator/tree/main/deploy/charts/emqx-operator
diff --git a/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml
index 32204903..05ed7eed 100644
--- a/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml
+++ b/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml
@@ -5,7 +5,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: emqxbrokers.apps.emqx.io
 spec:
   conversion:
diff --git a/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml
index 4ca99680..5187599a 100644
--- a/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml
+++ b/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml
@@ -6,7 +6,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: emqxenterprises.apps.emqx.io
 spec:
   conversion:
diff --git a/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml
index 39cf19f9..86a1693a 100644
--- a/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml
+++ b/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml
@@ -6,7 +6,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: emqxes.apps.emqx.io
 spec:
   conversion:
diff --git a/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml
index 69e8c513..e5e4a243 100644
--- a/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml
+++ b/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml
@@ -6,7 +6,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: emqxplugins.apps.emqx.io
 spec:
   conversion:
diff --git a/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml
index b0476b56..21381fcc 100644
--- a/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml
+++ b/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml
@@ -6,7 +6,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: rebalances.apps.emqx.io
 spec:
   conversion: