diff --git a/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin.yaml b/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin.yaml
index f121c0316..f276e68dc 100644
--- a/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin.yaml
+++ b/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin.yaml
@@ -25,6 +25,8 @@ spec:
   install:
     remediation:
       retries: -1
+  upgrade:
+    timeout: 5m
   storageNamespace: kube-system
   targetNamespace: kube-system
   releaseName: csi
diff --git a/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml b/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml
index aa7ebfa65..3c9d19456 100644
--- a/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml
+++ b/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml
@@ -25,6 +25,8 @@ spec:
   install:
     remediation:
       retries: -1
+  upgrade:
+    timeout: 5m
   storageNamespace: kube-system
   targetNamespace: kube-system
   releaseName: ccm
diff --git a/charts/t8s-cluster/templates/workload-cluster/cni-cilium.yaml b/charts/t8s-cluster/templates/workload-cluster/cni-cilium.yaml
index 205aae252..2cbce43dc 100644
--- a/charts/t8s-cluster/templates/workload-cluster/cni-cilium.yaml
+++ b/charts/t8s-cluster/templates/workload-cluster/cni-cilium.yaml
@@ -15,6 +15,8 @@ spec:
   install:
     remediation:
       retries: -1
+  upgrade:
+    timeout: 5m
   storageNamespace: kube-system
   targetNamespace: kube-system
   releaseName: cni
diff --git a/charts/t8s-cluster/templates/workload-cluster/gpu-operator.yaml b/charts/t8s-cluster/templates/workload-cluster/gpu-operator.yaml
index f47b8119c..d625772c2 100644
--- a/charts/t8s-cluster/templates/workload-cluster/gpu-operator.yaml
+++ b/charts/t8s-cluster/templates/workload-cluster/gpu-operator.yaml
@@ -15,6 +15,8 @@ spec:
   install:
     remediation:
       retries: -1
+  upgrade:
+    timeout: 5m
   storageNamespace: kube-system
   targetNamespace: kube-system
   releaseName: gpu-operator