diff --git a/charts/dodo-app/templates/install.yaml b/charts/dodo-app/templates/install.yaml
index 58c920c..bc5f0b4 100644
--- a/charts/dodo-app/templates/install.yaml
+++ b/charts/dodo-app/templates/install.yaml
@@ -130,6 +130,7 @@
         - --networks={{ .Values.allowedNetworks }}
         - --external={{ .Values.external }}
         - --fetch-users-addr={{ .Values.fetchUsersAddr }}
+        - --headscale-api-addr={{ .Values.headscaleAPIAddr }}
         volumeMounts:
         - name: ssh-key
           readOnly: true
diff --git a/charts/dodo-app/values.yaml b/charts/dodo-app/values.yaml
index b1d57c4..ba822a2 100644
--- a/charts/dodo-app/values.yaml
+++ b/charts/dodo-app/values.yaml
@@ -17,3 +17,4 @@
 allowedNetworks: ""
 external: false
 fetchUsersAddr: ""
+headscaleAPIAddr: ""
diff --git a/charts/fluxcd-reconciler/templates/install.yaml b/charts/fluxcd-reconciler/templates/install.yaml
index 29ce6ef..1ee3e95 100644
--- a/charts/fluxcd-reconciler/templates/install.yaml
+++ b/charts/fluxcd-reconciler/templates/install.yaml
@@ -10,7 +10,7 @@
   name: fluxcd-reconciler
 rules: # TODO(gio): restrict to ns create and dnszone get
 - apiGroups:
-  - "source.toolkit.fluxcd.io/v1"
+  - "source.toolkit.fluxcd.io"
   resources:
   - "gitrepositories"
   verbs:
@@ -62,12 +62,12 @@
     matchLabels:
       app: fluxcd-reconciler
   replicas: 1
-  serviceAccountName: fluxcd-reconciler
   template:
     metadata:
       labels:
         app: fluxcd-reconciler
     spec:
+      serviceAccountName: fluxcd-reconciler
       containers:
       - name: fluxcd-reconciler
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
diff --git a/charts/headscale/Chart.yaml b/charts/headscale/Chart.yaml
index f1688de..316a1f8 100644
--- a/charts/headscale/Chart.yaml
+++ b/charts/headscale/Chart.yaml
@@ -2,5 +2,5 @@
 name: headscale
 description: A Helm chart to run Headscale on PCloud
 type: application
-version: 0.0.1
-appVersion: "0.0.1"
+version: 0.0.4
+appVersion: "0.0.4"
diff --git a/charts/headscale/templates/headscale.yaml b/charts/headscale/templates/headscale.yaml
index d483854..8f1af28 100644
--- a/charts/headscale/templates/headscale.yaml
+++ b/charts/headscale/templates/headscale.yaml
@@ -166,6 +166,13 @@
           readOnly: true
         - mountPath: /headscale-api
           name: api-socket
+        livenessProbe:
+          exec:
+            command:
+              - cat
+              - /headscale/acls/config.hujson-reload
+            initialDelaySeconds: 60
+            periodSeconds: 5
       - name: headscale-api
         image: {{ .Values.api.image.repository }}:{{ .Values.api.image.tag }}
         imagePullPolicy: {{ .Values.api.image.pullPolicy }}
@@ -179,6 +186,15 @@
         - --config=/headscale/config/config.yaml
         - --ip-subnet={{ .Values.api.ipSubnet }}
         - --acls=/headscale/acls/config.hujson
+        - --self={{ .Values.api.self }}
+        - --fetch-users-addr={{ .Values.api.fetchUsersAddr }}
+        livenessProbe:
+          exec:
+            command:
+              - cat
+              - /headscale/acls/config.hujson-reload
+            initialDelaySeconds: 60
+            periodSeconds: 5
         volumeMounts:
         - name: data
           mountPath: /headscale/data
diff --git a/charts/headscale/values.yaml b/charts/headscale/values.yaml
index 18d7b57..0237ba5 100644
--- a/charts/headscale/values.yaml
+++ b/charts/headscale/values.yaml
@@ -19,6 +19,8 @@
     repository: giolekva/headscale-api
     tag: latest
     pullPolicy: Always
+  self: ""
+  fetchUsersAddr: ""
 ui:
   enabled: false
   image: