diff --git a/Makefile b/Makefile
index c2258493e..80e8614f5 100644
--- a/Makefile
+++ b/Makefile
@@ -200,8 +200,8 @@ create-kbcli-embed-charts-dir:
 
 build-single-kbcli-embed-chart.%: chart=$(word 2,$(subst ., ,$@))
 build-single-kbcli-embed-chart.%:
-	$(HELM) dependency update addons/addons/$(chart) --skip-refresh
-	$(HELM) package addons/addons/$(chart)
+	$(HELM) dependency update addons/addons-cluster/$(chart) --skip-refresh
+	$(HELM) package addons/addons-cluster/$(chart)
 	- bash -c "diff <($(HELM) template $(chart)-*.tgz) <($(HELM) template pkg/cluster/charts/$(chart).tgz)" > chart.diff
 	@if [ -s chart.diff ]; then \
  	  mv $(chart)-*.tgz pkg/cluster/charts/$(chart).tgz; \
diff --git a/addons b/addons
index 77eb4865f..8c29e5caa 160000
--- a/addons
+++ b/addons
@@ -1 +1 @@
-Subproject commit 77eb4865fec9eab8678078a04f97543a232e980a
+Subproject commit 8c29e5caa63a0f61b413c46749d6f9b15b9df736
diff --git a/docs/user_docs/cli/kbcli_cluster_create_xinference.md b/docs/user_docs/cli/kbcli_cluster_create_xinference.md
index c00bfa29c..d26fc09f3 100644
--- a/docs/user_docs/cli/kbcli_cluster_create_xinference.md
+++ b/docs/user_docs/cli/kbcli_cluster_create_xinference.md
@@ -34,7 +34,6 @@ kbcli cluster create xinference NAME [flags]
       --replicas int                 The number of replicas, for standalone mode, the replicas is 1, for replication mode, the default replicas is 2. Value range [1, 5]. (default 1)
       --tenancy string               The tenancy of cluster. Legal values [SharedNode, DedicatedNode]. (default "SharedNode")
       --termination-policy string    The termination policy of cluster. Legal values [DoNotTerminate, Halt, Delete, WipeOut]. (default "Delete")
-      --version string               Cluster version.
 ```
 
 ### Options inherited from parent commands
diff --git a/docs/user_docs/cli/kbcli_kubeblocks_install.md b/docs/user_docs/cli/kbcli_kubeblocks_install.md
index 7002d7c4b..953258eaf 100644
--- a/docs/user_docs/cli/kbcli_kubeblocks_install.md
+++ b/docs/user_docs/cli/kbcli_kubeblocks_install.md
@@ -46,6 +46,7 @@ kbcli kubeblocks install [flags]
   -f, --values strings               Specify values in a YAML file or a URL (can specify multiple)
       --version string               KubeBlocks version
       --wait                         Wait for KubeBlocks to be ready, including all the auto installed add-ons. It will wait for a --timeout period (default true)
+      --wait-addons                  Wait for auto installed add-ons. It will wait for a --timeout period (default true)
 ```
 
 ### Options inherited from parent commands
diff --git a/pkg/cluster/charts/apecloud-mysql-cluster.tgz b/pkg/cluster/charts/apecloud-mysql-cluster.tgz
index 9b35057b7..0103eb6cb 100644
Binary files a/pkg/cluster/charts/apecloud-mysql-cluster.tgz and b/pkg/cluster/charts/apecloud-mysql-cluster.tgz differ
diff --git a/pkg/cluster/charts/mongodb-cluster.tgz b/pkg/cluster/charts/mongodb-cluster.tgz
index de0a65a89..d2bf8283f 100644
Binary files a/pkg/cluster/charts/mongodb-cluster.tgz and b/pkg/cluster/charts/mongodb-cluster.tgz differ
diff --git a/pkg/cluster/charts/postgresql-cluster.tgz b/pkg/cluster/charts/postgresql-cluster.tgz
index 8a3f77e7a..824f16fad 100644
Binary files a/pkg/cluster/charts/postgresql-cluster.tgz and b/pkg/cluster/charts/postgresql-cluster.tgz differ
diff --git a/pkg/cluster/charts/redis-cluster.tgz b/pkg/cluster/charts/redis-cluster.tgz
index de5998335..267338e21 100644
Binary files a/pkg/cluster/charts/redis-cluster.tgz and b/pkg/cluster/charts/redis-cluster.tgz differ
diff --git a/pkg/cluster/charts/xinference-cluster.tgz b/pkg/cluster/charts/xinference-cluster.tgz
index de5c5c96e..7fb6a6adb 100644
Binary files a/pkg/cluster/charts/xinference-cluster.tgz and b/pkg/cluster/charts/xinference-cluster.tgz differ
diff --git a/pkg/cmd/kubeblocks/install.go b/pkg/cmd/kubeblocks/install.go
index b6f30c3b4..8696312a2 100644
--- a/pkg/cmd/kubeblocks/install.go
+++ b/pkg/cmd/kubeblocks/install.go
@@ -71,11 +71,12 @@ type Options struct {
 	HelmCfg *helm.Config
 
 	// Namespace is the current namespace the command running in
-	Namespace string
-	Client    kubernetes.Interface
-	Dynamic   dynamic.Interface
-	Timeout   time.Duration
-	Wait      bool
+	Namespace  string
+	Client     kubernetes.Interface
+	Dynamic    dynamic.Interface
+	Timeout    time.Duration
+	Wait       bool
+	WaitAddons bool
 }
 
 type InstallOptions struct {
@@ -159,6 +160,7 @@ func newInstallCmd(f cmdutil.Factory, streams genericiooptions.IOStreams) *cobra
 	cmd.Flags().BoolVar(&o.Check, "check", true, "Check kubernetes environment before installation")
 	cmd.Flags().DurationVar(&o.Timeout, "timeout", 300*time.Second, "Time to wait for installing KubeBlocks, such as --timeout=10m")
 	cmd.Flags().BoolVar(&o.Wait, "wait", true, "Wait for KubeBlocks to be ready, including all the auto installed add-ons. It will wait for a --timeout period")
+	cmd.Flags().BoolVar(&o.WaitAddons, "wait-addons", true, "Wait for auto installed add-ons. It will wait for a --timeout period")
 	cmd.Flags().BoolVar(&p.force, flagForce, p.force, "If present, just print fail item and continue with the following steps")
 	cmd.Flags().StringVar(&o.PodAntiAffinity, "pod-anti-affinity", "", "Pod anti-affinity type, one of: (Preferred, Required)")
 	cmd.Flags().StringArrayVar(&o.TopologyKeys, "topology-keys", nil, "Topology keys for affinity")
@@ -375,7 +377,7 @@ You can check the KubeBlocks status by running "kbcli kubeblocks status"
 
 // waitAddonsEnabled waits for auto-install addons status to be enabled
 func (o *InstallOptions) waitAddonsEnabled() error {
-	if !o.Wait {
+	if !o.Wait || !o.WaitAddons {
 		return nil
 	}