diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 2cd5396c..5db1a1a1 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -42,7 +42,7 @@ sources:
 
 dependencies:
   - name: etcd
-    version: 9.7.3
+    version: 12.0.7
     repository: https://charts.bitnami.com/bitnami
     condition: etcd.enabled
   - name: apisix-dashboard
diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml
index e57df0b2..160eff43 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -364,9 +364,9 @@ data:
       {{- if .Values.etcd.enabled }}
         host:                          # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
           {{- if .Values.etcd.fullnameOverride }}
-          - "{{ include "apisix.etcd.auth.scheme" . }}://{{ .Values.etcd.fullnameOverride }}:{{ .Values.etcd.service.port }}"
+          - "{{ include "apisix.etcd.auth.scheme" . }}://{{ .Values.etcd.fullnameOverride }}:{{ .Values.etcd.service.ports.client }}"
           {{- else }}
-          - "{{ include "apisix.etcd.auth.scheme" . }}://{{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }}:{{ .Values.etcd.service.port }}"
+          - "{{ include "apisix.etcd.auth.scheme" . }}://{{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }}:{{ .Values.etcd.service.ports.client }}"
           {{- end}}
       {{- else }}
         host:                          # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
diff --git a/charts/apisix/templates/deployment.yaml b/charts/apisix/templates/deployment.yaml
index 1c4102eb..4159a1fb 100644
--- a/charts/apisix/templates/deployment.yaml
+++ b/charts/apisix/templates/deployment.yaml
@@ -242,9 +242,9 @@ spec:
         - name: wait-etcd
           image: {{ .Values.initContainer.image }}:{{ .Values.initContainer.tag }}
           {{- if .Values.etcd.fullnameOverride }}
-          command: ['sh', '-c', "until nc -z {{ .Values.etcd.fullnameOverride }} {{ .Values.etcd.service.port }}; do echo waiting for etcd `date`; sleep 2; done;"]
+          command: ['sh', '-c', "until nc -z {{ .Values.etcd.fullnameOverride }} {{ .Values.etcd.service.ports.client }}; do echo waiting for etcd `date`; sleep 2; done;"]
           {{ else }}
-          command: ['sh', '-c', "until nc -z {{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }} {{ .Values.etcd.service.port }}; do echo waiting for etcd `date`; sleep 2; done;"]
+          command: ['sh', '-c', "until nc -z {{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }} {{ .Values.etcd.service.ports.client }}; do echo waiting for etcd `date`; sleep 2; done;"]
           {{- end }}
         {{- end }}
         {{- if .Values.extraInitContainers }}
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index abf896db..e63db8a8 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -634,7 +634,8 @@ etcd:
     enabled: false
 
   service:
-    port: 2379
+    ports:
+      client: 2379
 
   replicaCount: 3