diff --git a/kubernetes/apps/default/appdaemon/app/externalsecret.yaml b/kubernetes/apps/default/appdaemon/app/externalsecret.yaml
index d452524834..6565ac81c3 100644
--- a/kubernetes/apps/default/appdaemon/app/externalsecret.yaml
+++ b/kubernetes/apps/default/appdaemon/app/externalsecret.yaml
@@ -2,14 +2,14 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: &app appdaemon
+  name: appdaemon
   namespace: default
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
     name: onepassword-connect
   target:
-    name: *app
+    name: appdaemon-secret
     creationPolicy: Owner
     template:
       engineVersion: v2
diff --git a/kubernetes/apps/default/appdaemon/app/helmrelease.yaml b/kubernetes/apps/default/appdaemon/app/helmrelease.yaml
index 70117a3b05..42f02e7048 100644
--- a/kubernetes/apps/default/appdaemon/app/helmrelease.yaml
+++ b/kubernetes/apps/default/appdaemon/app/helmrelease.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.5.1
+      version: 2.0.2
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
@@ -26,30 +26,55 @@ spec:
   uninstall:
     keepHistory: false
   values:
-    controller:
-      type: statefulset
-      annotations:
-        reloader.stakater.com/auto: "true"
+    controllers:
+      main:
+        type: statefulset
+        annotations:
+          reloader.stakater.com/auto: "true"
+
+        containers:
+          main:
+            image:
+              repository: ghcr.io/mchestr/appdaemon
+              tag: 4.4.2
+            env:
+              TZ: ${TZ}
+              DASH_URL: http://$HOSTNAME:5050
+              HA_URL: http://home-assistant.default.svc.cluster.local:8123
+          code-server:
+            image:
+              repository: ghcr.io/coder/code-server
+              tag: 4.17.1
+            args:
+              - --auth
+              - "none"
+              - --user-data-dir
+              - /config/.vscode
+              - --extensions-dir
+              - /config/.vscode
+              - /config
 
-    image:
-      repository: ghcr.io/mchestr/appdaemon
-      tag: 4.4.2
 
-    env:
-      TZ: ${TZ}
-      DASH_URL: http://$HOSTNAME:5050
-      HA_URL: http://home-assistant:8123
+        statefulset:
+          volumeClaimTemplates:
+            - name: config
+              mountPath: /config
+              accessMode: ReadWriteOnce
+              size: 1Gi
+              storageClass: ceph-block
 
     service:
       main:
         ports:
           http:
             port: 5050
+          code-server:
+            port: 8080
 
     ingress:
       main:
         enabled: true
-        ingressClassName: internal
+        className: internal
         annotations:
           auth.home.arpa/enabled: "true"
           gethomepage.dev/enabled: "true"
@@ -61,68 +86,37 @@ spec:
             paths:
               - path: /
                 pathType: Prefix
+                service:
+                  name: main
+                  port: http
+          - host: "{{ .Release.Name }}-code.chestr.dev"
+            paths:
+              - path: /
+                pathType: Prefix
+                service:
+                  name: main
+                  port: code-server
         tls:
           - hosts:
               - *host
 
     persistence:
-      config:
-        enabled: true
-        existingClaim: appdaemon-config-v1
-        mountPath: /conf
       secrets:
         enabled: true
         type: secret
-        name: *app
-        mountPath: /conf/secrets.yaml
+        name: appdaemon-secret
         subPath: secrets.yaml
+        globalMounts:
+          - path: /conf/secrets.yaml
 
-    addons:
-      codeserver:
-        enabled: true
-        image:
-          repository: ghcr.io/coder/code-server
-          tag: 4.17.1
-
-        workingDir: /config
-
-        git:
-          deployKeySecret: appdaemon-deploykey
-
-        args:
-          - --auth
-          - "none"
-          - --user-data-dir
-          - /config/.vscode
-          - --extensions-dir
-          - /config/.vscode
-          - /config
+    # addons:
+    #   codeserver:
 
-        ingress:
-          enabled: true
-          ingressClassName: internal
-          annotations:
-            auth.home.arpa/enabled: "true"
-            gethomepage.dev/enabled: "true"
-            gethomepage.dev/group: Automation
-            gethomepage.dev/name: AppDaemon Code
-            gethomepage.dev/icon: vscode.png
-          hosts:
-            - host: &code-host "{{ .Release.Name }}-code.chestr.dev"
-              paths:
-                - path: /
-                  pathType: Prefix
-          tls:
-            - hosts:
-                - *code-host
+        # workingDir: /config
 
-        volumeMounts:
-          - name: config
-            mountPath: /config
+        # git:
+        #   deployKeySecret: appdaemon-deploykey
 
-    volumeClaimTemplates:
-      - name: config
-        mountPath: /config
-        accessMode: ReadWriteOnce
-        size: 1Gi
-        storageClass: ceph-block
+        # volumeMounts:
+        #   - name: config
+        #     mountPath: /config
diff --git a/kubernetes/apps/default/appdaemon/ks.yaml b/kubernetes/apps/default/appdaemon/ks.yaml
index d58875a3ac..f087720195 100644
--- a/kubernetes/apps/default/appdaemon/ks.yaml
+++ b/kubernetes/apps/default/appdaemon/ks.yaml
@@ -2,7 +2,7 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-appdaemon-app
+  name: cluster-apps-appdaemon
   namespace: flux-system
   labels:
     substitution.flux.home.arpa/enabled: 'true'