diff --git a/charts/apisix/templates/deployment.yaml b/charts/apisix/templates/deployment.yaml
index acda6be7..39898385 100644
--- a/charts/apisix/templates/deployment.yaml
+++ b/charts/apisix/templates/deployment.yaml
@@ -92,7 +92,7 @@ spec:
                   key: {{ include "apisix.admin.credentials.secretViewerKey" . }}
           {{- end }}
 
-          {{- if or (and .Values.etcd.enabled .Values.etcd.auth.rbac.create) (and (not .Values.etcd.enabled) .Values.externalEtcd.user) }}
+          {{- if and (or (and .Values.etcd.enabled .Values.etcd.auth.rbac.create) (and (not .Values.etcd.enabled) .Values.externalEtcd.user)) (or (and .Values.apisix.deployment.role_traditional (eq .Values.apisix.deployment.role_traditional.config_provider "etcd")) (and (not .Values.apisix.deployment.role_traditional) (or (and .Values.apisix.deployment.role_data_plane (eq .Values.apisix.deployment.role_data_plane.config_provider "etcd")) (and .Values.apisix.deployment.role_control_plane (eq .Values.apisix.deployment.role_control_plane.config_provider "etcd"))))) }}
             - name: APISIX_ETCD_PASSWORD
               valueFrom:
                 secretKeyRef:
diff --git a/charts/apisix/templates/etcd-secret.yaml b/charts/apisix/templates/etcd-secret.yaml
index ffc15d88..4550a111 100644
--- a/charts/apisix/templates/etcd-secret.yaml
+++ b/charts/apisix/templates/etcd-secret.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.externalEtcd.user (and (not .Values.etcd.enabled) (not .Values.externalEtcd.existingSecret)) }}
+{{- if and (or (and .Values.etcd.enabled .Values.etcd.auth.rbac.create) (and (not .Values.etcd.enabled) .Values.externalEtcd.user)) (or (and .Values.apisix.deployment.role_traditional (eq .Values.apisix.deployment.role_traditional.config_provider "etcd")) (and .Values.apisix.deployment.role_data_plane (eq .Values.apisix.deployment.role_data_plane.config_provider "etcd")) (and .Values.apisix.deployment.role_control_plane (eq .Values.apisix.deployment.role_control_plane.config_provider "etcd"))) }}
 apiVersion: v1
 kind: Secret
 metadata: