diff --git a/charts/fleet-crd/templates/crds.yaml b/charts/fleet-crd/templates/crds.yaml
index f411f5c4b4..85b1ed3f41 100644
--- a/charts/fleet-crd/templates/crds.yaml
+++ b/charts/fleet-crd/templates/crds.yaml
@@ -505,8 +505,11 @@ spec:
                           nullable: true
                           type: object
                         timeoutSeconds:
-                          description: TimeoutSeconds is the time to wait for Helm
-                            operations.
+                          description: TimeoutSeconds is the number of seconds Fleet
+                            passes to Helm operations. Omitted or zero values use hook-only
+                            waiting. Positive values enable Helm status waiting during
+                            install and upgrade operations up to the configured timeout;
+                            uninstall and rollback operations keep hook-only waiting.
                           type: integer
                         values:
                           description: 'Values passed to Helm. It is possible to specify
@@ -971,8 +974,11 @@ spec:
                           nullable: true
                           type: object
                         timeoutSeconds:
-                          description: TimeoutSeconds is the time to wait for Helm
-                            operations.
+                          description: TimeoutSeconds is the number of seconds Fleet
+                            passes to Helm operations. Omitted or zero values use hook-only
+                            waiting. Positive values enable Helm status waiting during
+                            install and upgrade operations up to the configured timeout;
+                            uninstall and rollback operations keep hook-only waiting.
                           type: integer
                         values:
                           description: 'Values passed to Helm. It is possible to specify
@@ -2010,7 +2016,11 @@ spec:
                       nullable: true
                       type: object
                     timeoutSeconds:
-                      description: TimeoutSeconds is the time to wait for Helm operations.
+                      description: TimeoutSeconds is the number of seconds Fleet
+                        passes to Helm operations. Omitted or zero values use hook-only
+                        waiting. Positive values enable Helm status waiting during install
+                        and upgrade operations up to the configured timeout; uninstall
+                        and rollback operations keep hook-only waiting.
                       type: integer
                     values:
                       description: 'Values passed to Helm. It is possible to specify
@@ -3036,8 +3046,11 @@ spec:
                             nullable: true
                             type: object
                           timeoutSeconds:
-                            description: TimeoutSeconds is the time to wait for Helm
-                              operations.
+                            description: TimeoutSeconds is the number of seconds Fleet
+                              passes to Helm operations. Omitted or zero values use hook-only
+                              waiting. Positive values enable Helm status waiting during
+                              install and upgrade operations up to the configured timeout;
+                              uninstall and rollback operations keep hook-only waiting.
                             type: integer
                           values:
                             description: 'Values passed to Helm. It is possible to
@@ -8233,7 +8246,11 @@ spec:
                       nullable: true
                       type: object
                     timeoutSeconds:
-                      description: TimeoutSeconds is the time to wait for Helm operations.
+                      description: TimeoutSeconds is the number of seconds Fleet
+                        passes to Helm operations. Omitted or zero values use hook-only
+                        waiting. Positive values enable Helm status waiting during install
+                        and upgrade operations up to the configured timeout; uninstall
+                        and rollback operations keep hook-only waiting.
                       type: integer
                     values:
                       description: 'Values passed to Helm. It is possible to specify
@@ -9283,8 +9300,11 @@ spec:
                             nullable: true
                             type: object
                           timeoutSeconds:
-                            description: TimeoutSeconds is the time to wait for Helm
-                              operations.
+                            description: TimeoutSeconds is the number of seconds Fleet
+                              passes to Helm operations. Omitted or zero values use hook-only
+                              waiting. Positive values enable Helm status waiting during
+                              install and upgrade operations up to the configured timeout;
+                              uninstall and rollback operations keep hook-only waiting.
                             type: integer
                           values:
                             description: 'Values passed to Helm. It is possible to
diff --git a/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go b/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go
index 6b8042a1ac..6097a3dec9 100644
--- a/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go
+++ b/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go
@@ -234,7 +234,10 @@ type HelmOptions struct {
 	// Version of the chart to download
 	Version string `json:"version,omitempty"`
 
-	// TimeoutSeconds is the time to wait for Helm operations.
+	// TimeoutSeconds is the number of seconds Fleet passes to Helm operations.
+	// Omitted or zero values use hook-only waiting. Positive values enable Helm
+	// status waiting during install and upgrade operations up to the configured
+	// timeout; uninstall and rollback operations keep hook-only waiting.
 	TimeoutSeconds int `json:"timeoutSeconds,omitempty"`
 
 	// Values passed to Helm. It is possible to specify the keys and values