diff --git a/README.md b/README.md
index 8d520319..db37d009 100644
--- a/README.md
+++ b/README.md
@@ -35,32 +35,33 @@ To uninstall the chart:
 
 ### Deployment Paramaters
 
-| Name                                | Description                                                                                                                                | Value          |
-|-------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------|----------------|
-| deployment.enabled                  | Enable deployment on helm chart deployments                                                                                                | `true`         |
-| deployment.strategy                 | Strategy for updating deployments                                                                                                          | `RollingUpdate` |
-| deployment.reloadOnChange           | Reload deployment if configMap/secret mounted are updated                                                                                  | `true`         |
-| deployment.nodeSelector             | Select node to deploy this application                                                                                                     | `{}`           |
-| deployment.hostAliases              | Adding entries to a Pod's /etc/hosts file provides Pod-level override of hostname resolution when DNS and other options are not applicable | `[]`           |
-| deployment.additionalLabels         | Additional labels for Deployment                                                                                                           | `{}`           |
-| deployment.podLabels                | Additional label added on pod which is used in Service's Label Selector                                                                    | {}             |
-| deployment.annotations              | Annotations on deployments                                                                                                                 | `{}`           |
-| deployment.additionalPodAnnotations | Additional Pod Annotations added on pod created by this Deployment                                                                         | `{}`           |
-| deployment.replicas                 | Replicas to be created                                                                                                                     | ``             |
-| deployment.imagePullSecrets         | Secrets used to pull image                                                                                                                 | `""`           |
-| deployment.env                      | Environment variables to be passed to the app container                                                                                    | `{}`           |
-| deployment.volumes                  | Volumes to be added to the pod                                                                                                             | `{}`           |
-| deployment.volumeMounts             | Mount path for Volumes                                                                                                                     | `{}`           |
-| deployment.revisionHistoryLimit     | The number of old history to retain to allow rollback                                                                                      | `2`            |
-| deployment.command                  | Command for primary container of deployment                                                                                                | `[]`           |
-| deployment.args                     | Arg for primary container of deployment                                                                                                    | `[]`           |
-| deployment.tolerations              | Taint tolerations for nodes                                                                                                                | `[]`           |
-| deployment.affinity                 | Affinity for pod/node                                                                                                                      | `[]`           |
-| deployment.topologySpreadConstraints| Topology spread constraints definitions                                           | `[]`           |
-| deployment.ports                    | Ports for primary container                                                                                                                | `[]`           |
-| deployment.securityContext          | Security Context for the pod                                                                                                               | `{}`           |
-| deployment.additionalContainers     | Add additional containers besides init and app containers                                                                                  | `[]`           |
-| deployment.containerSecurityContext | Add security context at container level                                                                                                    | `{}`           |
+| Name                                     | Description                                                                                                                                | Value          |
+|------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------|----------------|
+| deployment.enabled                       | Enable deployment on helm chart deployments                                                                                                | `true`         |
+| deployment.strategy                      | Strategy for updating deployments                                                                                                          | `RollingUpdate` |
+| deployment.reloadOnChange                | Reload deployment if configMap/secret mounted are updated                                                                                  | `true`         |
+| deployment.nodeSelector                  | Select node to deploy this application                                                                                                     | `{}`           |
+| deployment.hostAliases                   | Adding entries to a Pod's /etc/hosts file provides Pod-level override of hostname resolution when DNS and other options are not applicable | `[]`           |
+| deployment.additionalLabels              | Additional labels for Deployment                                                                                                           | `{}`           |
+| deployment.podLabels                     | Additional label added on pod which is used in Service's Label Selector                                                                    | {}             |
+| deployment.annotations                   | Annotations on deployments                                                                                                                 | `{}`           |
+| deployment.additionalPodAnnotations      | Additional Pod Annotations added on pod created by this Deployment                                                                         | `{}`           |
+| deployment.replicas                      | Replicas to be created                                                                                                                     | ``             |
+| deployment.imagePullSecrets              | Secrets used to pull image                                                                                                                 | `""`           |
+| deployment.env                           | Environment variables to be passed to the app container                                                                                    | `{}`           |
+| deployment.volumes                       | Volumes to be added to the pod                                                                                                             | `{}`           |
+| deployment.volumeMounts                  | Mount path for Volumes                                                                                                                     | `{}`           |
+| deployment.revisionHistoryLimit          | The number of old history to retain to allow rollback                                                                                      | `2`            |
+| deployment.command                       | Command for primary container of deployment                                                                                                | `[]`           |
+| deployment.args                          | Arg for primary container of deployment                                                                                                    | `[]`           |
+| deployment.tolerations                   | Taint tolerations for nodes                                                                                                                | `[]`           |
+| deployment.affinity                      | Affinity for pod/node                                                                                                                      | `[]`           |
+| deployment.topologySpreadConstraints     | Topology spread constraints definitions                                                                                                    | `[]`           |
+| deployment.ports                         | Ports for primary container                                                                                                                | `[]`           |
+| deployment.securityContext               | Security Context for the pod                                                                                                               | `{}`           |
+| deployment.additionalContainers          | Add additional containers besides init and app containers                                                                                  | `[]`           |
+| deployment.containerSecurityContext      | Add security context at container level                                                                                                    | `{}`           |
+| deployment.terminationGracePeriodSeconds | Graceful termination timeout                                                                                                               | ``           |
 
 #### Deployment Resources Parameters
 
diff --git a/application/templates/deployment.yaml b/application/templates/deployment.yaml
index efd9a7e5..270fb172 100644
--- a/application/templates/deployment.yaml
+++ b/application/templates/deployment.yaml
@@ -299,4 +299,5 @@ spec:
       serviceAccountName: {{ template "application.name" $ }}
       {{- end }}
       {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.deployment.terminationGracePeriodSeconds }}
 {{- end }}
diff --git a/application/values-test.yaml b/application/values-test.yaml
index 3769cb7e..80013c92 100644
--- a/application/values-test.yaml
+++ b/application/values-test.yaml
@@ -217,6 +217,9 @@ deployment:
     name: https
     protocol: TCP
 
+  # Graceful termination timeout
+  terminationGracePeriodSeconds: 120
+
 # Add Storage volumes to the pods
 persistence:
   enabled: true
diff --git a/application/values.yaml b/application/values.yaml
index 00c40bc0..156c1541 100644
--- a/application/values.yaml
+++ b/application/values.yaml
@@ -285,6 +285,9 @@ deployment:
   #  name: https
   #  protocol: TCP
 
+  # Graceful termination timeout
+  terminationGracePeriodSeconds:
+
 ##########################################################
 # Add Storage volumes to the pods
 ##########################################################