diff --git a/README.md b/README.md
index ed890fa..a4a8348 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [Databend](https://github.com/datafuselabs/databend) -- the open source Elastic and Scalable Modern Cloud Data Warehouse.
 
-Databend Helm charts provide the installation of [Databend](https://github.com/datafuselabs/databend) components for kubernates.
+Databend Helm charts provide the installation of [Databend](https://github.com/datafuselabs/databend) components for kubernetes.
 
 ### Charts
 - [Databend Meta Helm Chart](charts/databend-meta)
diff --git a/charts/databend-meta/README.md b/charts/databend-meta/README.md
index 42419b1..a0c427e 100644
--- a/charts/databend-meta/README.md
+++ b/charts/databend-meta/README.md
@@ -15,7 +15,7 @@ helm install my-release databend/databend-meta --namespace databend --create-nam
 
 Note that for a production cluster, you will likely want to override the following parameters in [values.yaml](values.yaml) with your own values.
 
-- `resources.requests.memory` and `resources.limit.memory` allocate memory resource to query pods in your cluser.
+- `resources.requests.memory` and `resources.limit.memory` allocate memory resource to query pods in your cluster.
 - `replicaCount` defaults to `1`, We strongly recommend that you set to `3` for HA.
 - `persistence.size` defaults to `10Gi` of disk space per pod, which you may increase or decrease for your use case.
 - `persistence.storageClass` uses the default storage class for your environment.
diff --git a/charts/databend-query/README.md b/charts/databend-query/README.md
index a448cb9..70b138b 100644
--- a/charts/databend-query/README.md
+++ b/charts/databend-query/README.md
@@ -15,7 +15,7 @@ helm install my-release databend/databend-query --namespace databend --create-na
 
 Note that for a production cluster, you will likely want to override the following parameters in [values.yaml](values.yaml) with your own values.
 
-- `resources.requests.memory` and `resources.limit.memory` allocate memory resource to query pods in your cluser.
+- `resources.requests.memory` and `resources.limit.memory` allocate memory resource to query pods in your cluster.
 - `config.meta.address` indicates the grpc address of a [Databend Meta](../databend-meta) service.
 - `config.storage.type` defaults to `fs` for testing only, `s3` is recommended in production.
 - `config.storage.s3.accessKeyId` and `config.storage.s3.secretAccessKey` should be set when using `s3` storage, `config.storage.s3.endpointUrl` defaults to `https://s3.amazonaws.com`.
diff --git a/charts/databend-query/templates/statefulset.yaml b/charts/databend-query/templates/statefulset.yaml
index 26cd94d..97f46a2 100644
--- a/charts/databend-query/templates/statefulset.yaml
+++ b/charts/databend-query/templates/statefulset.yaml
@@ -74,23 +74,27 @@ spec:
                 fieldRef:
                   fieldPath: status.podIP
             - name: QUERY_METRIC_API_ADDRESS
-              value: "$(POD_IP):7070"
+              value: "$(POD_IP):{{ .Values.service.ports.metric | default 7070 }}"
             - name: QUERY_ADMIN_API_ADDRESS
-              value: "$(POD_IP):8080"
+              value: "$(POD_IP):{{ .Values.service.ports.admin | default 8080 }}"
             - name: QUERY_FLIGHT_API_ADDRESS
-              value: "$(POD_IP):9090"
+              value: "$(POD_IP):{{ .Values.service.ports.flight | default 9090 }}"
+            - name: QUERY_HTTP_HANDLER_HOST
+              value: 0.0.0.0
+            - name: QUERY_HTTP_HANDLER_PORT
+              value: {{ .Values.service.ports.http | default 8000 | quote }}
+            - name: QUERY_FLIGHT_SQL_HANDLER_HOST
+              value: 0.0.0.0
+            - name: QUERY_FLIGHT_SQL_HANDLER_PORT
+              value: {{ .Values.service.ports.flightsql | default 8900 | quote }}
             - name: QUERY_MYSQL_HANDLER_HOST
               value: 0.0.0.0
             - name: QUERY_MYSQL_HANDLER_PORT
-              value: "3307"
+              value: {{ .Values.service.ports.mysql | default 3307 | quote }}
             - name: QUERY_CLICKHOUSE_HTTP_HANDLER_HOST
               value: 0.0.0.0
             - name: QUERY_CLICKHOUSE_HTTP_HANDLER_PORT
-              value: "8124"
-            - name: QUERY_HTTP_HANDLER_HOST
-              value: 0.0.0.0
-            - name: QUERY_HTTP_HANDLER_PORT
-              value: "8000"
+              value: {{ .Values.service.ports.ckhttp |default 8124 | quote }}
           volumeMounts:
             - name: config
               # Note: subPath volume mount will not receive ConfigMap update.
diff --git a/charts/databend-query/values.yaml b/charts/databend-query/values.yaml
index b3bd303..ce9954c 100644
--- a/charts/databend-query/values.yaml
+++ b/charts/databend-query/values.yaml
@@ -31,7 +31,7 @@ service:
     flight: 9090
 
     http: 8000
-    flight-sql: 8900
+    flightsql: 8900
     mysql: 3307
     ckhttp: 8124