diff --git a/apps/home-assistant/deployment.yaml b/apps/home-assistant/deployment.yaml
index 94da0da..1ebf6ed 100644
--- a/apps/home-assistant/deployment.yaml
+++ b/apps/home-assistant/deployment.yaml
@@ -9,17 +9,24 @@ spec:
       app: home-assistant
   template:
     spec:
-      volumes:
-        - name: home-assistant-config
-          hostPath:
-            path: "/disk/etc/home-assistant"
       containers:
         - image: homeassistant/home-assistant
           imagePullPolicy: Always
           name: home-assistant
-          volumeMounts:
-            - mountPath: "/config"
-              name: home-assistant-config
           ports:
             - name: web
-              containerPort: 8123
\ No newline at end of file
+              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/home-assistant/kustomization.yaml b/apps/home-assistant/kustomization.yaml
index 9db6b96..e32bd9b 100644
--- a/apps/home-assistant/kustomization.yaml
+++ b/apps/home-assistant/kustomization.yaml
@@ -5,6 +5,8 @@ commonLabels:
   app: home-assistant
 
 resources:
+  - pv-hass-config.yaml
+  - pvc-hass-config.yaml
   - service.yaml
   - deployment.yaml
   - ingress.yaml
diff --git a/apps/home-assistant/pv-hass-config.yaml b/apps/home-assistant/pv-hass-config.yaml
new file mode 100644
index 0000000..63b84ee
--- /dev/null
+++ b/apps/home-assistant/pv-hass-config.yaml
@@ -0,0 +1,22 @@
+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/home-assistant/pvc-hass-config.yaml b/apps/home-assistant/pvc-hass-config.yaml
new file mode 100644
index 0000000..099e227
--- /dev/null
+++ b/apps/home-assistant/pvc-hass-config.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: hass-config-pvc
+spec:
+  storageClassName: hass-config-sc
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 16Gi