diff --git a/charts/risingwave/Chart.yaml b/charts/risingwave/Chart.yaml
index bc29994..3c3e4bb 100644
--- a/charts/risingwave/Chart.yaml
+++ b/charts/risingwave/Chart.yaml
@@ -19,13 +19,13 @@ 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.1.54
+version: 0.1.55
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: v1.7.3
+appVersion: v1.8.0
 
 dependencies:
 - name: common
diff --git a/charts/risingwave/templates/compute-sts.yaml b/charts/risingwave/templates/compute-sts.yaml
index ef2022a..2844a84 100644
--- a/charts/risingwave/templates/compute-sts.yaml
+++ b/charts/risingwave/templates/compute-sts.yaml
@@ -121,6 +121,15 @@ spec:
         command:
         - /risingwave/bin/risingwave
         - compute-node
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - bash
+              - -c
+              - >-
+                /risingwave/bin/risingwave ctl meta unregister-workers --yes \
+                  --workers ${POD_NAME}.{{ include "risingwave.computeHeadlessServiceName" . }}.{{.Release.Namespace}}.svc:{{ .Values.ports.compute.svc }}
         {{- end }}
         ports:
         - containerPort: {{ .Values.ports.compute.svc }}
diff --git a/charts/risingwave/values.yaml b/charts/risingwave/values.yaml
index e6a8e09..e50a9b8 100644
--- a/charts/risingwave/values.yaml
+++ b/charts/risingwave/values.yaml
@@ -128,7 +128,7 @@ diagnosticMode:
 image:
   registry:
   repository: risingwavelabs/risingwave
-  tag: v1.7.3
+  tag: v1.8.0
   digest: ""
   ## @param image.pullPolicy RisingWave image pull policy
   ## Specify a imagePullPolicy
@@ -1009,9 +1009,9 @@ computeComponent:
   affinity: { }
 
   ## @param computeComponent.terminationGracePeriodSeconds Termination grace period in seconds.
-  ## Defaults to 1 seconds.
+  ## Defaults to 10 seconds.
   ##
-  terminationGracePeriodSeconds: 1
+  terminationGracePeriodSeconds: 10
 
   ## @param computeComponent.schedulerName Name of an alternate scheduler.
   ## Ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/