diff --git a/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2
index d818b52d..d43e8674 100644
--- a/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2
+++ b/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2
@@ -85,6 +85,7 @@ commands:
           roleConfig:
             listenerClass: external-unstable
           config:
+            gracefulShutdownTimeout: 10s
             logging:
               enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
           roleGroups:
@@ -102,6 +103,7 @@ commands:
               host: airflow-redis-master
               credentialsSecretName: airflow-redis-credentials
           config:
+            gracefulShutdownTimeout: 10s
             logging:
               enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
           roleGroups:
diff --git a/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2
index 9fddf14b..3fa90bcc 100644
--- a/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2
+++ b/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2
@@ -103,6 +103,7 @@ spec:
     roleConfig:
       listenerClass: external-unstable
     config:
+      gracefulShutdownTimeout: 10s
       resources:
         cpu:
           min: 1000m
@@ -172,6 +173,7 @@ spec:
         host: airflow-redis-master
         credentialsSecretName: airflow-redis-credentials
     config:
+      gracefulShutdownTimeout: 10s
       resources:
         cpu:
           min: 1000m
@@ -225,6 +227,7 @@ spec:
 {% elif test_scenario['values']['executor'] == 'kubernetes' %}
   kubernetesExecutors:
     config:
+      gracefulShutdownTimeout: 10s
       resources:
         cpu:
           min: 50m
@@ -264,6 +267,7 @@ spec:
 {% endif %}
   schedulers:
     config:
+      gracefulShutdownTimeout: 10s
       resources:
         cpu:
           min: 1000m
diff --git a/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2
index b4fb90d3..d5faa807 100644
--- a/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2
+++ b/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2
@@ -105,6 +105,7 @@ spec:
     roleConfig:
       listenerClass: external-unstable
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
@@ -124,6 +125,7 @@ spec:
         host: airflow-redis-master
         credentialsSecretName: airflow-redis-credentials
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
diff --git a/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2
index 3ea3d9a3..729117c6 100644
--- a/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2
+++ b/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2
@@ -123,6 +123,7 @@ spec:
     roleConfig:
       listenerClass: external-unstable
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
@@ -142,6 +143,7 @@ spec:
         host: airflow-redis-master
         credentialsSecretName: airflow-redis-credentials
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
diff --git a/tests/templates/kuttl/smoke/40-assert.yaml.j2 b/tests/templates/kuttl/smoke/40-assert.yaml.j2
index 844186da..015e283a 100644
--- a/tests/templates/kuttl/smoke/40-assert.yaml.j2
+++ b/tests/templates/kuttl/smoke/40-assert.yaml.j2
@@ -22,7 +22,7 @@ metadata:
 spec:
   template:
     spec:
-      terminationGracePeriodSeconds: 120
+      terminationGracePeriodSeconds: 10
 status:
   readyReplicas: 1
   replicas: 1
@@ -37,7 +37,7 @@ metadata:
 spec:
   template:
     spec:
-      terminationGracePeriodSeconds: 300
+      terminationGracePeriodSeconds: 10
 status:
   readyReplicas: 2
   replicas: 2
@@ -52,7 +52,7 @@ metadata:
 spec:
   template:
     spec:
-      terminationGracePeriodSeconds: 120
+      terminationGracePeriodSeconds: 10
 status:
   readyReplicas: 1
   replicas: 1
@@ -66,7 +66,7 @@ metadata:
 spec:
   template:
     spec:
-      terminationGracePeriodSeconds: 120
+      terminationGracePeriodSeconds: 10
 status:
   readyReplicas: 1
   replicas: 1
@@ -80,7 +80,7 @@ metadata:
 spec:
   template:
     spec:
-      terminationGracePeriodSeconds: 120
+      terminationGracePeriodSeconds: 10
 status:
   readyReplicas: 1
   replicas: 1
diff --git a/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2
index 2b4852f7..85dff45e 100644
--- a/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2
+++ b/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2
@@ -62,6 +62,7 @@ spec:
     roleConfig:
       listenerClass: external-unstable
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     configOverrides:
@@ -90,6 +91,7 @@ spec:
         host: airflow-redis-master
         credentialsSecretName: airflow-redis-credentials
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
@@ -103,6 +105,7 @@ spec:
 {% endif %}
   schedulers:
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
@@ -110,6 +113,7 @@ spec:
         replicas: 1
   dagProcessors:
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
@@ -117,6 +121,7 @@ spec:
         replicas: 1
   triggerers:
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
diff --git a/tests/templates/kuttl/versioning/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/versioning/30-install-airflow-cluster.yaml.j2
index 5ca2c1b9..79dca009 100644
--- a/tests/templates/kuttl/versioning/30-install-airflow-cluster.yaml.j2
+++ b/tests/templates/kuttl/versioning/30-install-airflow-cluster.yaml.j2
@@ -70,6 +70,7 @@ spec:
     roleConfig:
       listenerClass: external-unstable
     config:
+      gracefulShutdownTimeout: 10s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups: