diff --git a/charts/common/templates/_deploymentHelpers.tpl b/charts/common/templates/_deploymentHelpers.tpl
index 5717d5240..508475bfc 100644
--- a/charts/common/templates/_deploymentHelpers.tpl
+++ b/charts/common/templates/_deploymentHelpers.tpl
@@ -122,4 +122,7 @@ securityContext:
     type: RuntimeDefault
 serviceAccountName: {{ .Release.Name }}
 automountServiceAccountToken: {{ not (eq (.Values.security).mountServiceAccountToken false) }}
+{{- end }}
+{{- define "common.terminationGracePeriodSeconds" -}}
+{{ .Values.terminationGracePeriodSeconds | default 10 }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/extension-manager-operator/charts/common-0.1.5.tgz b/charts/extension-manager-operator/charts/common-0.1.5.tgz
index 797df6fe5..fa4c1e75b 100644
Binary files a/charts/extension-manager-operator/charts/common-0.1.5.tgz and b/charts/extension-manager-operator/charts/common-0.1.5.tgz differ
diff --git a/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz b/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz
index e93392fc8..d33ec8679 100644
Binary files a/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz and b/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz differ
diff --git a/charts/extension-manager-operator/templates/deployment.yaml b/charts/extension-manager-operator/templates/deployment.yaml
index 90acae3f9..0bf2fa5b6 100644
--- a/charts/extension-manager-operator/templates/deployment.yaml
+++ b/charts/extension-manager-operator/templates/deployment.yaml
@@ -47,7 +47,4 @@ spec:
             requests:
               cpu: {{ .Values.deployment.resources.requests.cpu }}
               memory: {{ .Values.deployment.resources.requests.memory }}
-      terminationGracePeriodSeconds: 10
-
-
-
+      terminationGracePeriodSeconds: {{ include "common.terminationGracePeriodSeconds" .}}