diff --git a/Chart.yaml b/Chart.yaml
index 4289e6c7d..ca784872c 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: vault
-version: 0.22.0
+version: 0.23.0
 appVersion: 1.11.3
 kubeVersion: ">= 1.16.0-0"
 description: Official HashiCorp Vault Chart
diff --git a/templates/csi-daemonset.yaml b/templates/csi-daemonset.yaml
index d131aac5f..b1057a785 100644
--- a/templates/csi-daemonset.yaml
+++ b/templates/csi-daemonset.yaml
@@ -56,6 +56,8 @@ spec:
             - name: VAULT_ADDR
             {{- if .Values.global.externalVaultAddr }}
               value: "{{ .Values.global.externalVaultAddr }}"
+            {{- else if .Values.server.ha.apiAddr }}
+              value: "{{ .Values.server.ha.apiAddr }}"
             {{- else }}
               value: {{ include "vault.scheme" . }}://{{ template "vault.fullname" . }}.{{ .Release.Namespace }}.svc:{{ .Values.server.service.port }}
             {{- end }}
diff --git a/templates/injector-deployment.yaml b/templates/injector-deployment.yaml
index f0605599e..3c119711a 100644
--- a/templates/injector-deployment.yaml
+++ b/templates/injector-deployment.yaml
@@ -58,6 +58,8 @@ spec:
               value: "{{ .Values.global.externalVaultAddr }}"
             {{- else if .Values.injector.externalVaultAddr }}
               value: "{{ .Values.injector.externalVaultAddr }}"
+            {{- else if .Values.server.ha.apiAddr }}
+              value: "{{ .Values.server.ha.apiAddr }}"
             {{- else }}
               value: {{ include "vault.scheme" . }}://{{ template "vault.fullname" . }}.{{ .Release.Namespace }}.svc:{{ .Values.server.service.port }}
             {{- end }}