diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index e996a7a0b..863e6db5d 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -52,5 +52,6 @@ spec:
           requests:
             cpu: 100m
             memory: 20Mi
+        terminationMessagePolicy: FallbackToLogsOnError
       terminationGracePeriodSeconds: 10
       serviceAccountName: manager
diff --git a/templates/addons/crs-powervs.yaml b/templates/addons/crs-powervs.yaml
index 870e6d4d9..7fa3f4fa6 100644
--- a/templates/addons/crs-powervs.yaml
+++ b/templates/addons/crs-powervs.yaml
@@ -243,15 +243,16 @@ data:
               env:
                 - name: ENABLE_VPC_PUBLIC_ENDPOINT
                   value: "true"
+              resources:
+                requests:
+                  cpu: 200m
+              terminationMessagePolicy: FallbackToLogsOnError
               volumeMounts:
                 - mountPath: /etc/cloud
                   name: ibmpowervs-config-volume
                   readOnly: true
                 - mountPath: /etc/ibm-secret
                   name: ibm-secret
-              resources:
-                requests:
-                  cpu: 200m
           hostNetwork: true
           volumes:
             - name: ibmpowervs-config-volume
diff --git a/templates/addons/crs.yaml b/templates/addons/crs.yaml
index c05382bce..dd6930bb9 100644
--- a/templates/addons/crs.yaml
+++ b/templates/addons/crs.yaml
@@ -237,15 +237,16 @@ data:
                 - --cloud-provider=ibm
                 - --cloud-config=/etc/cloud/ibm.conf
                 - --use-service-account-credentials=true
+              resources:
+                requests:
+                  cpu: 200m
+              terminationMessagePolicy: FallbackToLogsOnError
               volumeMounts:
                 - mountPath: /etc/cloud
                   name: ibm-config-volume
                   readOnly: true
                 - mountPath: /etc/ibm-secret
                   name: ibm-secret
-              resources:
-                requests:
-                  cpu: 200m
           hostNetwork: true
           volumes:
             - name: ibm-config-volume
diff --git a/templates/cluster-template-powervs-cloud-provider.yaml b/templates/cluster-template-powervs-cloud-provider.yaml
index bbdf772b9..29cbf7ffc 100644
--- a/templates/cluster-template-powervs-cloud-provider.yaml
+++ b/templates/cluster-template-powervs-cloud-provider.yaml
@@ -539,15 +539,16 @@ data:
               env:
                 - name: ENABLE_VPC_PUBLIC_ENDPOINT
                   value: "true"
+              resources:
+                requests:
+                  cpu: 200m
+              terminationMessagePolicy: FallbackToLogsOnError
               volumeMounts:
                 - mountPath: /etc/cloud
                   name: ibmpowervs-config-volume
                   readOnly: true
                 - mountPath: /etc/ibm-secret
                   name: ibm-secret
-              resources:
-                requests:
-                  cpu: 200m
           hostNetwork: true
           volumes:
             - name: ibmpowervs-config-volume
diff --git a/templates/cluster-template-powervs-clusterclass.yaml b/templates/cluster-template-powervs-clusterclass.yaml
index 06da37a06..ccb17d7d1 100644
--- a/templates/cluster-template-powervs-clusterclass.yaml
+++ b/templates/cluster-template-powervs-clusterclass.yaml
@@ -549,15 +549,16 @@ data:
               env:
                 - name: ENABLE_VPC_PUBLIC_ENDPOINT
                   value: "true"
+              resources:
+                requests:
+                  cpu: 200m
+              terminationMessagePolicy: FallbackToLogsOnError
               volumeMounts:
                 - mountPath: /etc/cloud
                   name: ibmpowervs-config-volume
                   readOnly: true
                 - mountPath: /etc/ibm-secret
                   name: ibm-secret
-              resources:
-                requests:
-                  cpu: 200m
           hostNetwork: true
           volumes:
             - name: ibmpowervs-config-volume
diff --git a/templates/cluster-template-powervs-create-infra.yaml b/templates/cluster-template-powervs-create-infra.yaml
index fa178d101..d958227d5 100644
--- a/templates/cluster-template-powervs-create-infra.yaml
+++ b/templates/cluster-template-powervs-create-infra.yaml
@@ -446,6 +446,7 @@ data:
               resources:
                 requests:
                   cpu: 200m
+              terminationMessagePolicy: FallbackToLogsOnError
           hostNetwork: true
           volumes:
             - name: ibmpowervs-config-volume
diff --git a/templates/cluster-template-vpc-clusterclass.yaml b/templates/cluster-template-vpc-clusterclass.yaml
index b95c2daf4..f84966fc8 100644
--- a/templates/cluster-template-vpc-clusterclass.yaml
+++ b/templates/cluster-template-vpc-clusterclass.yaml
@@ -398,15 +398,16 @@ data:
                 - --cloud-provider=ibm
                 - --cloud-config=/etc/cloud/ibm.conf
                 - --use-service-account-credentials=true
+              resources:
+                requests:
+                  cpu: 200m
+              terminationMessagePolicy: FallbackToLogsOnError
               volumeMounts:
                 - mountPath: /etc/cloud
                   name: ibm-config-volume
                   readOnly: true
                 - mountPath: /etc/ibm-secret
                   name: ibm-secret
-              resources:
-                requests:
-                  cpu: 200m
           hostNetwork: true
           volumes:
             - name: ibm-config-volume
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
index baf443204..55c2dc859 100644
--- a/templates/cluster-template.yaml
+++ b/templates/cluster-template.yaml
@@ -387,15 +387,16 @@ data:
                 - --cloud-provider=ibm
                 - --cloud-config=/etc/cloud/ibm.conf
                 - --use-service-account-credentials=true
+              resources:
+                requests:
+                  cpu: 200m
+              terminationMessagePolicy: FallbackToLogsOnError
               volumeMounts:
                 - mountPath: /etc/cloud
                   name: ibm-config-volume
                   readOnly: true
                 - mountPath: /etc/ibm-secret
                   name: ibm-secret
-              resources:
-                requests:
-                  cpu: 200m
           hostNetwork: true
           volumes:
             - name: ibm-config-volume
diff --git a/test/e2e/data/templates/cluster-template-vpc.yaml b/test/e2e/data/templates/cluster-template-vpc.yaml
index a65cd1c1a..02984687e 100644
--- a/test/e2e/data/templates/cluster-template-vpc.yaml
+++ b/test/e2e/data/templates/cluster-template-vpc.yaml
@@ -174,15 +174,16 @@ data:
                 - --cloud-provider=ibm
                 - --cloud-config=/etc/cloud/ibm.conf
                 - --use-service-account-credentials=true
+              resources:
+                requests:
+                  cpu: 200m
+              terminationMessagePolicy: FallbackToLogsOnError
               volumeMounts:
                 - mountPath: /etc/cloud
                   name: ibm-config-volume
                   readOnly: true
                 - mountPath: /etc/ibm-secret
                   name: ibm-secret
-              resources:
-                requests:
-                  cpu: 200m
           hostNetwork: true
           volumes:
             - name: ibm-config-volume