diff --git a/charts/headscale/templates/config.yaml b/charts/headscale/templates/config.yaml
index 3604698..ac0a08c 100644
--- a/charts/headscale/templates/config.yaml
+++ b/charts/headscale/templates/config.yaml
@@ -264,7 +264,7 @@
         # Unix socket used for the CLI to connect without authentication
         # Note: for production you will want to set this to something like:
         # unix_socket: /var/run/headscale.sock
-        unix_socket: ./headscale.sock
+        unix_socket: /headscale-api/headscale.sock
         unix_socket_permission: "0770"
         #
         # headscale supports experimental OpenID connect support,
diff --git a/charts/headscale/templates/headscale.yaml b/charts/headscale/templates/headscale.yaml
index 4dd851b..6b38345 100644
--- a/charts/headscale/templates/headscale.yaml
+++ b/charts/headscale/templates/headscale.yaml
@@ -91,6 +91,8 @@
       - name: config
         configMap:
           name: config
+      - name: api-socket
+        emptyDir: {}
       containers:
       - name: headscale
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
@@ -113,6 +115,8 @@
         - name: config
           mountPath: /headscale/config
           readOnly: true
+        - mountPath: /headscale-api
+          name: api-socket
       - name: headscale-api
         image: {{ .Values.api.image.repository }}:{{ .Values.api.image.tag }}
         imagePullPolicy: {{ .Values.api.image.pullPolicy }}
@@ -131,3 +135,5 @@
         - name: config
           mountPath: /headscale/config
           readOnly: true
+        - mountPath: /headscale-api
+          name: api-socket