diff --git a/scripts/e2e/greptimedb-cluster.sh b/scripts/e2e/greptimedb-cluster.sh
index c672ebe..61f292c 100755
--- a/scripts/e2e/greptimedb-cluster.sh
+++ b/scripts/e2e/greptimedb-cluster.sh
@@ -52,7 +52,12 @@ function drop_table() {
 }
 
 function deploy_greptimedb_cluster() {
-  helm upgrade --install mycluster greptimedb-cluster -n default
+  # Handle greptimedb-cluster dependencies.
+  helm repo add grafana https://grafana.github.io/helm-charts
+  helm dependency build charts/greptimedb-cluster
+
+  # Deploy greptimedb cluster.
+  helm upgrade --install mycluster charts/greptimedb-cluster -n default
 
   timeout=300
   sleep_interval=5
@@ -76,8 +81,7 @@ function deploy_greptimedb_cluster() {
 }
 
 function deploy_greptimedb_operator() {
-  cd charts
-  helm upgrade --install greptimedb-operator greptimedb-operator -n default
+  helm upgrade --install greptimedb-operator charts/greptimedb-operator -n default
 
   # Wait for greptimedb operator to be ready
   kubectl rollout status --timeout=60s deployment/greptimedb-operator -n default
diff --git a/scripts/release/release-charts-to-acr.sh b/scripts/release/release-charts-to-acr.sh
index a3279e7..7d2d3d4 100755
--- a/scripts/release/release-charts-to-acr.sh
+++ b/scripts/release/release-charts-to-acr.sh
@@ -22,7 +22,7 @@ for dir in "$CHARTS_DIR"/*; do
     helm package "$dir" --destination "$dir"
 
     # Get the packaged chart file path.
-    packaged_file=$(find "$dir" -type f -name "*.tgz" ! -name "grafana-*.tgz")
+    packaged_file=$(find "$dir" -type f -name "${chart_name}-*.tgz" -print -quit)
 
     echo "Package $chart_name to $packaged_file and push to oci://$OCI_REGISTRY_URL/$OCI_NAMESPACE/$chart_name ..."