diff --git a/charts/spire-ha-agent/Chart.yaml b/charts/spire-ha-agent/Chart.yaml
index 26e5c9c..fa3efca 100644
--- a/charts/spire-ha-agent/Chart.yaml
+++ b/charts/spire-ha-agent/Chart.yaml
@@ -3,7 +3,7 @@ name: spire-ha-agent
 description: A Helm chart to install the SPIRE HA agent.
 type: application
 version: 0.1.0
-appVersion: "0.0.13"
+appVersion: "0.0.17"
 keywords: ["spiffe", "spire-ha-agent"]
 home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire-ha-agent
 sources:
diff --git a/charts/spire-ha-agent/templates/daemonset.yaml b/charts/spire-ha-agent/templates/daemonset.yaml
index 23a5d2e..b693d78 100644
--- a/charts/spire-ha-agent/templates/daemonset.yaml
+++ b/charts/spire-ha-agent/templates/daemonset.yaml
@@ -126,9 +126,18 @@ spec:
             runAsGroup: 0
         #{- $mainSecurityContext | toYaml | nindent 12 }}
           env:
+            - name: SPIRE_HA_AGENT_SOCK
+              value: /tmp/spire-ha-agent/public/spire-agent.sock
           {{- if .Values.singleSocket }}
             - name: SPIRE_HA_AGENT_SINGLE
               value: enabled
+            - name: SPIRE_HA_AGENT_SOCKET
+              value: unix:///var/run/spire/agent/sockets/a/csi.spiffe.io/admin/admin.sock
+          {{- else }}
+            - name: SPIRE_HA_AGENT_SOCKET_A
+              value: unix:///var/run/spire/agent/sockets/a/csi.spiffe.io/admin/admin.sock
+            - name: SPIRE_HA_AGENT_SOCKET_B
+              value: unix:///var/run/spire/agent/sockets/b/csi.spiffe.io/admin/admin.sock
           {{- end }}
           {{- if .Values.vsock }}
             - name: SPIRE_HA_AGENT_VSOCK
@@ -153,10 +162,10 @@ spec:
               readOnly: false
             {{- end }}
             - name: spire-ha-admin-socket-dir-upstream-a
-              mountPath: /var/run/spire/agent/sockets/a/private
+              mountPath: /var/run/spire/agent/sockets/a/csi.spiffe.io/admin
             {{- if not .Values.singleSocket }}
             - name: spire-ha-admin-socket-dir-upstream-b
-              mountPath: /var/run/spire/agent/sockets/b/private
+              mountPath: /var/run/spire/agent/sockets/b/csi.spiffe.io/admin
             {{- end }}
             - name: dev
               mountPath: /dev