diff --git a/apps/utility/application-set.yaml b/apps/utility/application-set.yaml
deleted file mode 100644
index 09251db..0000000
--- a/apps/utility/application-set.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: utility
-  namespace: argocd
-  labels:
-    dev.stonegarden: utility
-spec:
-  generators:
-    - git:
-        repoURL: https://github.com/vehagn/homelab
-        revision: HEAD
-        directories:
-          - path: apps/utility/*
-  template:
-    metadata:
-      name: '{{ path.basename }}'
-      labels:
-        dev.stonegarden: utility
-      finalizers:
-        - resources-finalizer.argocd.argoproj.io
-    spec:
-      project: utility
-      source:
-        plugin:
-          name: kustomize-build-with-helm
-        repoURL: https://github.com/vehagn/homelab
-        targetRevision: HEAD
-        path: '{{ path }}'
-      destination:
-        name: in-cluster
-        namespace: '{{ path.basename }}'
-      syncPolicy:
-        automated:
-          selfHeal: true
-          prune: true
-        syncOptions:
-          - CreateNamespace=true
diff --git a/apps/utility/home-assistant.yaml b/apps/utility/home-assistant.yaml
new file mode 100644
index 0000000..9d198ae
--- /dev/null
+++ b/apps/utility/home-assistant.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: home-assistant
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+  labels:
+    dev.stonegarden: home-assistant
+spec:
+  project: utility
+  source:
+    repoURL: https://github.com/vehagn/home-assistant
+    path: deployment
+    targetRevision: HEAD
+  destination:
+    namespace: home-assistant
+    name: in-cluster
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true
+    syncOptions:
+      - CreateNamespace=true
+
diff --git a/apps/utility/home-assistant/deployment.yaml b/apps/utility/home-assistant/deployment.yaml
deleted file mode 100644
index 68bd75f..0000000
--- a/apps/utility/home-assistant/deployment.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: home-assistant
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: home-assistant
-  template:
-    spec:
-      containers:
-        - image: ghcr.io/home-assistant/home-assistant:2023.12.4
-          imagePullPolicy: Always
-          name: home-assistant
-          ports:
-            - name: web
-              containerPort: 8123
-          resources:
-            requests:
-              cpu: 100m
-              memory: 512Mi
-            limits:
-              cpu: 1000m
-              memory: 2Gi
-          volumeMounts:
-            - name: config
-              mountPath: /config
-      volumes:
-        - name: config
-          persistentVolumeClaim:
-            claimName: hass-config-pvc
\ No newline at end of file
diff --git a/apps/utility/home-assistant/http-route.yaml b/apps/utility/home-assistant/http-route.yaml
deleted file mode 100644
index 4efcea7..0000000
--- a/apps/utility/home-assistant/http-route.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: hass-http-route
-spec:
-  parentRefs:
-    - name: cilium-gateway
-      namespace: gateway
-  hostnames:
-    - "hass.stonegarden.dev"
-  rules:
-    - matches:
-        - path:
-            type: PathPrefix
-            value: /
-      backendRefs:
-        - name: home-assistant
-          port: 8123
\ No newline at end of file
diff --git a/apps/utility/home-assistant/kustomization.yaml b/apps/utility/home-assistant/kustomization.yaml
deleted file mode 100644
index 1c7d9ce..0000000
--- a/apps/utility/home-assistant/kustomization.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: home-assistant
-commonLabels:
-  app: home-assistant
-
-resources:
-  - pv-hass-config.yaml
-  - pvc-hass-config.yaml
-  - service.yaml
-  - deployment.yaml
-  - http-route.yaml
diff --git a/apps/utility/home-assistant/pv-hass-config.yaml b/apps/utility/home-assistant/pv-hass-config.yaml
deleted file mode 100644
index 63b84ee..0000000
--- a/apps/utility/home-assistant/pv-hass-config.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: hass-config-pv
-spec:
-  capacity:
-    storage: 16Gi
-  volumeMode: Filesystem
-  accessModes:
-    - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: hass-config-sc
-  local:
-    path: /disk/etc/home-assistant
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: kubernetes.io/hostname
-              operator: In
-              values:
-                - gauss
\ No newline at end of file
diff --git a/apps/utility/home-assistant/pvc-hass-config.yaml b/apps/utility/home-assistant/pvc-hass-config.yaml
deleted file mode 100644
index 099e227..0000000
--- a/apps/utility/home-assistant/pvc-hass-config.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: hass-config-pvc
-spec:
-  storageClassName: hass-config-sc
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 16Gi
diff --git a/apps/utility/home-assistant/service.yaml b/apps/utility/home-assistant/service.yaml
deleted file mode 100644
index 78c48c3..0000000
--- a/apps/utility/home-assistant/service.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: home-assistant
-spec:
-  type: ClusterIP
-  ports:
-    - name: web
-      port: 8123
-  selector:
-    app: home-assistant
diff --git a/apps/utility/kustomization.yaml b/apps/utility/kustomization.yaml
index 7d5929f..a501af0 100644
--- a/apps/utility/kustomization.yaml
+++ b/apps/utility/kustomization.yaml
@@ -7,4 +7,4 @@ commonLabels:
 
 resources:
   - project.yaml
-  - application-set.yaml
+  - home-assistant.yaml