diff --git a/charts/hub-nfts-solana/Chart.yaml b/charts/hub-nfts-solana/Chart.yaml
index d8cde4a..97bfd05 100644
--- a/charts/hub-nfts-solana/Chart.yaml
+++ b/charts/hub-nfts-solana/Chart.yaml
@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.2
+version: 0.5.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/hub-nfts-solana/templates/deployment.yaml b/charts/hub-nfts-solana/templates/deployment.yaml
index faf56c4..5f7af43 100644
--- a/charts/hub-nfts-solana/templates/deployment.yaml
+++ b/charts/hub-nfts-solana/templates/deployment.yaml
@@ -56,3 +56,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
diff --git a/charts/hub-nfts-solana/templates/indexer.yaml b/charts/hub-nfts-solana/templates/indexer.yaml
index d24c237..2c605ee 100644
--- a/charts/hub-nfts-solana/templates/indexer.yaml
+++ b/charts/hub-nfts-solana/templates/indexer.yaml
@@ -56,4 +56,5 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.indexer.terminationGracePeriodSeconds }}
 {{- end }}
diff --git a/charts/hub-nfts-solana/values.yaml b/charts/hub-nfts-solana/values.yaml
index 7944bdc..a3df04f 100644
--- a/charts/hub-nfts-solana/values.yaml
+++ b/charts/hub-nfts-solana/values.yaml
@@ -18,6 +18,8 @@ indexer:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: "latest"
+
+  terminationGracePeriodSeconds: 180
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
@@ -92,6 +94,8 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+terminationGracePeriodSeconds: 180
+
 networkPolicies:
   enabled: false
   extraEgress: []
diff --git a/charts/hub-nfts/Chart.yaml b/charts/hub-nfts/Chart.yaml
index 608d5db..e0fc02a 100644
--- a/charts/hub-nfts/Chart.yaml
+++ b/charts/hub-nfts/Chart.yaml
@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.10.0
+version: 0.10.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/hub-nfts/templates/deployment.yaml b/charts/hub-nfts/templates/deployment.yaml
index 80a57f0..e5bf024 100644
--- a/charts/hub-nfts/templates/deployment.yaml
+++ b/charts/hub-nfts/templates/deployment.yaml
@@ -76,3 +76,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
diff --git a/charts/hub-nfts/values.yaml b/charts/hub-nfts/values.yaml
index 1f83f26..62ade60 100644
--- a/charts/hub-nfts/values.yaml
+++ b/charts/hub-nfts/values.yaml
@@ -74,6 +74,8 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+terminationGracePeriodSeconds: 180
+
 networkPolicies:
   enabled: false
   extraEgress: []
diff --git a/charts/hub-treasuries/Chart.yaml b/charts/hub-treasuries/Chart.yaml
index 1bbd06d..c64ba41 100644
--- a/charts/hub-treasuries/Chart.yaml
+++ b/charts/hub-treasuries/Chart.yaml
@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.7.0
+version: 0.7.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/hub-treasuries/templates/deployment.yaml b/charts/hub-treasuries/templates/deployment.yaml
index 0c0b752..da062c8 100644
--- a/charts/hub-treasuries/templates/deployment.yaml
+++ b/charts/hub-treasuries/templates/deployment.yaml
@@ -84,3 +84,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
diff --git a/charts/hub-treasuries/values.yaml b/charts/hub-treasuries/values.yaml
index eb1be38..e87f499 100644
--- a/charts/hub-treasuries/values.yaml
+++ b/charts/hub-treasuries/values.yaml
@@ -73,6 +73,8 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+terminationGracePeriodSeconds: 180
+
 networkPolicies:
   enabled: false
   extraEgress: []