diff --git a/charts/daemonset-app/Chart.yaml b/charts/daemonset-app/Chart.yaml
index 3c240c4c..48b47c49 100644
--- a/charts/daemonset-app/Chart.yaml
+++ b/charts/daemonset-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: daemonset-app
 description: Default DaemonSet Helm Chart
 type: application
-version: 0.15.5
+version: 0.16.0
 appVersion: latest
 maintainers:
   - name: diranged
diff --git a/charts/daemonset-app/README.md b/charts/daemonset-app/README.md
index 57deefc4..2bfa15fc 100644
--- a/charts/daemonset-app/README.md
+++ b/charts/daemonset-app/README.md
@@ -2,7 +2,7 @@
 
 Default DaemonSet Helm Chart
 
-![Version: 0.15.5](https://img.shields.io/badge/Version-0.15.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 [statefulsets]: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
 [hpa]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
@@ -13,6 +13,13 @@ ServiceAccounts, Services, etc.
 
 ## Upgrade Notes
 
+### 1.15.x -> 1.16.x
+
+**NEW: Templated Termination Grace Period**
+
+`terminationGracePeriodSeconds` now supports template variables. This allows
+one to compute the termination grace period based on additional criteria.
+
 ### 0.13.0 -> 0.14.x
 
 **BREAKING: Bugfix removing the default readiness and liveness probes **
diff --git a/charts/daemonset-app/README.md.gotmpl b/charts/daemonset-app/README.md.gotmpl
index 91b92760..ac043d82 100644
--- a/charts/daemonset-app/README.md.gotmpl
+++ b/charts/daemonset-app/README.md.gotmpl
@@ -12,6 +12,13 @@ ServiceAccounts, Services, etc.
 
 ## Upgrade Notes
 
+### 1.15.x -> 1.16.x
+
+**NEW: Templated Termination Grace Period**
+
+`terminationGracePeriodSeconds` now supports template variables. This allows
+one to compute the termination grace period based on additional criteria.
+
 ### 0.13.0 -> 0.14.x
 
 **BREAKING: Bugfix removing the default readiness and liveness probes **
diff --git a/charts/daemonset-app/templates/daemonset.yaml b/charts/daemonset-app/templates/daemonset.yaml
index 823f9f59..bea2d3ae 100644
--- a/charts/daemonset-app/templates/daemonset.yaml
+++ b/charts/daemonset-app/templates/daemonset.yaml
@@ -58,7 +58,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ include "nd-common.serviceAccountName" . }}
       {{- with .Values.terminationGracePeriodSeconds }}
-      terminationGracePeriodSeconds: {{ . }}
+      terminationGracePeriodSeconds: {{ tpl (toString . ) $ }}
       {{- end }}
       {{- if or .Values.volumes .Values.volumesString }}
       volumes:
diff --git a/charts/rollout-app/Chart.yaml b/charts/rollout-app/Chart.yaml
index 7e4ee743..26cd80f6 100644
--- a/charts/rollout-app/Chart.yaml
+++ b/charts/rollout-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: rollout-app
 description: Argo Rollout-based Application Helm Chart
 type: application
-version: 1.1.1
+version: 1.2.0
 appVersion: latest
 maintainers:
   - name: diranged
diff --git a/charts/rollout-app/README.md b/charts/rollout-app/README.md
index baa368ff..32d93080 100644
--- a/charts/rollout-app/README.md
+++ b/charts/rollout-app/README.md
@@ -2,7 +2,7 @@
 
 Argo Rollout-based Application Helm Chart
 
-![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 [analysistemplate]: https://argoproj.github.io/argo-rollouts/features/analysis/?query=AnalysisTemplate#background-analysis
 [argo_rollouts]: https://argoproj.github.io/argo-rollouts/
@@ -18,6 +18,13 @@ how these work, and the various custom resource definitions.
 
 ## Upgrade Notes
 
+### 1.1.x -> 1.2.x
+
+**NEW: Templated Termination Grace Period**
+
+`terminationGracePeriodSeconds` now supports template variables. This allows
+one to compute the termination grace period based on additional criteria.
+
 ### 0.7.x -> 1.0.x
 
 **BREAKING: Istio Alerts have changed**
diff --git a/charts/rollout-app/README.md.gotmpl b/charts/rollout-app/README.md.gotmpl
index a7fef8ad..21611bc3 100644
--- a/charts/rollout-app/README.md.gotmpl
+++ b/charts/rollout-app/README.md.gotmpl
@@ -17,6 +17,13 @@ how these work, and the various custom resource definitions.
 
 ## Upgrade Notes
 
+### 1.1.x -> 1.2.x
+
+**NEW: Templated Termination Grace Period**
+
+`terminationGracePeriodSeconds` now supports template variables. This allows
+one to compute the termination grace period based on additional criteria.
+
 ### 0.7.x -> 1.0.x
 
 **BREAKING: Istio Alerts have changed**
diff --git a/charts/rollout-app/templates/rollout.yaml b/charts/rollout-app/templates/rollout.yaml
index 784c12f5..97deefb8 100644
--- a/charts/rollout-app/templates/rollout.yaml
+++ b/charts/rollout-app/templates/rollout.yaml
@@ -168,7 +168,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ include "nd-common.serviceAccountName" . }}
       {{- with .Values.terminationGracePeriodSeconds }}
-      terminationGracePeriodSeconds: {{ . }}
+      terminationGracePeriodSeconds: {{ tpl (toString . ) $ }}
       {{- end }}
       {{- if or .Values.volumes .Values.volumesString }}
       volumes:
diff --git a/charts/simple-app/Chart.yaml b/charts/simple-app/Chart.yaml
index 59476811..7eae076e 100644
--- a/charts/simple-app/Chart.yaml
+++ b/charts/simple-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: simple-app
 description: Default Microservice Helm Chart
 type: application
-version: 1.9.0
+version: 1.10.0
 appVersion: latest
 maintainers:
   - name: diranged
diff --git a/charts/simple-app/README.md b/charts/simple-app/README.md
index a7d33b6a..3077eb07 100644
--- a/charts/simple-app/README.md
+++ b/charts/simple-app/README.md
@@ -2,7 +2,7 @@
 
 Default Microservice Helm Chart
 
-![Version: 1.9.0](https://img.shields.io/badge/Version-1.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 [deployments]: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/
 [hpa]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
@@ -13,6 +13,13 @@ defaults for you like the Kubernetes [Horizontal Pod Autoscaler][hpa].
 
 ## Upgrade Notes
 
+### 1.9.x -> 1.10.x
+
+**NEW: Templated Termination Grace Period**
+
+`terminationGracePeriodSeconds` now supports template variables. This allows
+one to compute the termination grace period based on additional criteria.
+
 ### 1.8.x -> 1.9.x
 
 `readinessProbe` is now only required when `virtualService.enabled` is `true`. This
diff --git a/charts/simple-app/README.md.gotmpl b/charts/simple-app/README.md.gotmpl
index 509afcdd..a9e35d15 100644
--- a/charts/simple-app/README.md.gotmpl
+++ b/charts/simple-app/README.md.gotmpl
@@ -12,6 +12,13 @@ defaults for you like the Kubernetes [Horizontal Pod Autoscaler][hpa].
 
 ## Upgrade Notes
 
+### 1.9.x -> 1.10.x
+
+**NEW: Templated Termination Grace Period**
+
+`terminationGracePeriodSeconds` now supports template variables. This allows
+one to compute the termination grace period based on additional criteria.
+
 ### 1.8.x -> 1.9.x
 
 `readinessProbe` is now only required when `virtualService.enabled` is `true`. This
diff --git a/charts/simple-app/templates/deployment.yaml b/charts/simple-app/templates/deployment.yaml
index 1cbd4006..be538066 100644
--- a/charts/simple-app/templates/deployment.yaml
+++ b/charts/simple-app/templates/deployment.yaml
@@ -139,7 +139,7 @@ spec:
         {{- toYaml $.Values.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ include "nd-common.serviceAccountName" $ }}
       {{- with $.Values.terminationGracePeriodSeconds }}
-      terminationGracePeriodSeconds: {{ . }}
+      terminationGracePeriodSeconds: {{ tpl ( toString . ) $ }}
       {{- end }}
       {{- if or $.Values.volumes $.Values.volumesString }}
       volumes:
diff --git a/charts/stateful-app/Chart.yaml b/charts/stateful-app/Chart.yaml
index 246122b9..4104dbcb 100644
--- a/charts/stateful-app/Chart.yaml
+++ b/charts/stateful-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: stateful-app
 description: Default StatefulSet Helm Chart
 type: application
-version: 1.1.1
+version: 1.2.0
 appVersion: latest
 maintainers:
   - name: diranged
diff --git a/charts/stateful-app/README.md b/charts/stateful-app/README.md
index 69048056..a22a3161 100644
--- a/charts/stateful-app/README.md
+++ b/charts/stateful-app/README.md
@@ -2,7 +2,7 @@
 
 Default StatefulSet Helm Chart
 
-![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 [statefulsets]: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
 [hpa]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
@@ -13,6 +13,13 @@ ServiceAccounts, Services, etc.
 
 ## Upgrade Notes
 
+### 1.1.x -> 1.2.x
+
+**NEW: Templated Termination Grace Period**
+
+`terminationGracePeriodSeconds` now supports template variables. This allows
+one to compute the termination grace period based on additional criteria.
+
 ### 0.16.x -> 1.0.x
 
 **BREAKING: Istio Alerts have changed**
diff --git a/charts/stateful-app/README.md.gotmpl b/charts/stateful-app/README.md.gotmpl
index 1a4b0ba2..dbbde04e 100644
--- a/charts/stateful-app/README.md.gotmpl
+++ b/charts/stateful-app/README.md.gotmpl
@@ -12,6 +12,13 @@ ServiceAccounts, Services, etc.
 
 ## Upgrade Notes
 
+### 1.1.x -> 1.2.x
+
+**NEW: Templated Termination Grace Period**
+
+`terminationGracePeriodSeconds` now supports template variables. This allows
+one to compute the termination grace period based on additional criteria.
+
 ### 0.16.x -> 1.0.x
 
 **BREAKING: Istio Alerts have changed**
diff --git a/charts/stateful-app/templates/statefulset.yaml b/charts/stateful-app/templates/statefulset.yaml
index c73ba71a..ee267272 100644
--- a/charts/stateful-app/templates/statefulset.yaml
+++ b/charts/stateful-app/templates/statefulset.yaml
@@ -75,7 +75,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ include "nd-common.serviceAccountName" . }}
       {{- with .Values.terminationGracePeriodSeconds }}
-      terminationGracePeriodSeconds: {{ . }}
+      terminationGracePeriodSeconds: {{ tpl (toString . ) $ }}
       {{- end }}
       {{- if or .Values.volumes .Values.volumesString }}
       volumes: