diff --git a/charts/aspnetcore/Chart.yaml b/charts/aspnetcore/Chart.yaml
index d15ef03..6e2b392 100644
--- a/charts/aspnetcore/Chart.yaml
+++ b/charts/aspnetcore/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: aspnetcore
 description: A generic Helm chart for ASP.NET Core services
-version: 2.1.1
+version: 2.2.0
 home: https://github.com/gsoft-inc/gsoft-helm-charts
 sources:
   - https://github.com/gsoft-inc/gsoft-helm-charts
diff --git a/charts/aspnetcore/templates/deployment.yaml b/charts/aspnetcore/templates/deployment.yaml
index ac13ecf..33a522d 100644
--- a/charts/aspnetcore/templates/deployment.yaml
+++ b/charts/aspnetcore/templates/deployment.yaml
@@ -35,6 +35,7 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ include "aspnetcore.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       containers:
         - name: {{ .Chart.Name }}-container
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/charts/aspnetcore/values.yaml b/charts/aspnetcore/values.yaml
index eead58d..4d60e91 100644
--- a/charts/aspnetcore/values.yaml
+++ b/charts/aspnetcore/values.yaml
@@ -3,6 +3,9 @@
 ## We set this to 2 by default because the PodDisruptionBudget is set to minimum 1 running replica and having only one replica creates a deadlock while draining nodes during cluster upgrades
 replicaCount: 2
 
+## @param service.terminationGracePeriodSeconds The duration in seconds the pod needs to terminate gracefully
+terminationGracePeriodSeconds: 30
+
 ## @param environment The ASP.NET Core environment name (DOTNET_ENVIRONMENT)
 ##
 environment: Development
@@ -31,7 +34,6 @@ image:
 ## @param service.name Name of the service, automatically generated from the release name if not specified
 ## @param service.port ASP.NET Core service HTTP port
 ## @param service.annotations Additional custom annotations for ASP.NET Core service
-##
 service:
   name: ""
   port: 80