diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml
index da5a473..7879b7a 100644
--- a/charts/retool/Chart.yaml
+++ b/charts/retool/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 6.10.0
+version: 6.10.1
 maintainers:
   - name: Retool Engineering
     email: engineering+helm@retool.com
diff --git a/charts/retool/templates/deployment_backend.yaml b/charts/retool/templates/deployment_backend.yaml
index 66c39da..57206e5 100644
--- a/charts/retool/templates/deployment_backend.yaml
+++ b/charts/retool/templates/deployment_backend.yaml
@@ -44,6 +44,7 @@ spec:
 {{ toYaml .Values.ui.labels | indent 8 }}
 {{- end }}
     spec:
+      terminationGracePeriodSeconds: {{ .Values.backend.terminationGracePeriodSeconds | default 136 }}
       serviceAccountName: {{ template "retool.serviceAccountName" . }}
       {{- if .Values.priorityClassName }}
       priorityClassName: "{{ .Values.priorityClassName }}"
diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index 3705d39..1c925d2 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -384,6 +384,11 @@ backend:
   # Labels for backend pods
   labels: {}
 
+  # Make backend pods wait the specified time before kubernetes will forcibly kill them when they need to be rescheduled
+  # By default this is a 2 minutes + 15 seconds + 1 second (136) grace period to allow outstanding queries to complete
+  # Change this to 10 minutes 15 seconds + 1 second (616) if you are using long-running queries with a 10 minute timeout
+  terminationGracePeriodSeconds: 136
+
 ui:
   # Annotations for ui pods
   annotations: {}
diff --git a/values.yaml b/values.yaml
index 3705d39..1c925d2 100644
--- a/values.yaml
+++ b/values.yaml
@@ -384,6 +384,11 @@ backend:
   # Labels for backend pods
   labels: {}
 
+  # Make backend pods wait the specified time before kubernetes will forcibly kill them when they need to be rescheduled
+  # By default this is a 2 minutes + 15 seconds + 1 second (136) grace period to allow outstanding queries to complete
+  # Change this to 10 minutes 15 seconds + 1 second (616) if you are using long-running queries with a 10 minute timeout
+  terminationGracePeriodSeconds: 136
+
 ui:
   # Annotations for ui pods
   annotations: {}