diff --git a/charts/stable/home-assistant/Chart.yaml b/charts/stable/home-assistant/Chart.yaml
index 1ddbbe8ed22..05b8e1a50dc 100644
--- a/charts/stable/home-assistant/Chart.yaml
+++ b/charts/stable/home-assistant/Chart.yaml
@@ -29,4 +29,4 @@ sources:
 - https://github.com/home-assistant/home-assistant
 - https://github.com/cdr/code-server
 type: application
-version: 8.1.0
+version: 8.1.1
diff --git a/charts/stable/home-assistant/SCALE/ix_values.yaml b/charts/stable/home-assistant/SCALE/ix_values.yaml
index ce1404f5e8a..e92dc96979a 100644
--- a/charts/stable/home-assistant/SCALE/ix_values.yaml
+++ b/charts/stable/home-assistant/SCALE/ix_values.yaml
@@ -26,6 +26,12 @@ postgresql:
   enabled: true
   postgresqlUsername: home-assistant
   postgresqlDatabase: home-assistant
+  existingSecret: "dbcreds"
+  persistence:
+    db:
+      storageClass: "SCALE-ZFS"
+    dbbackups:
+      storageClass: "SCALE-ZFS"
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/charts/stable/home-assistant/SCALE/questions.yaml b/charts/stable/home-assistant/SCALE/questions.yaml
index 76f11c249e5..8bbf3ff9a5e 100644
--- a/charts/stable/home-assistant/SCALE/questions.yaml
+++ b/charts/stable/home-assistant/SCALE/questions.yaml
@@ -227,18 +227,6 @@ questions:
     schema:
       type: dict
       attrs:
-        - variable: varrun
-          label: "varrun override for S6 Readonly Root"
-          schema:
-            type: dict
-            hidden: true
-            attrs:
-              - variable: enabled
-                label: ""
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
         - variable: config
           label: "App Config Storage"
           description: "Stores the Application Configuration."
@@ -387,7 +375,7 @@ questions:
           label: "ReadOnly Root Filesystem"
           schema:
             type: boolean
-            default: true
+            default: false
         - variable: allowPrivilegeEscalation
           label: "Allow Privilege Escalation"
           schema:
@@ -397,7 +385,7 @@ questions:
           label: "runAsNonRoot"
           schema:
             type: boolean
-            default: true
+            default: false
 
   - variable: podSecurityContext
     group: "Security and Permissions"
@@ -410,13 +398,13 @@ questions:
           description: "The UserID of the user running the application"
           schema:
             type: int
-            default: 568
+            default: 0
         - variable: runAsGroup
           label: "runAsGroup"
           description: The groupID this App of the user running the application"
           schema:
             type: int
-            default: 568
+            default: 0
         - variable: fsGroup
           label: "fsGroup"
           description: "The group that should own ALL storage."
diff --git a/charts/stable/home-assistant/values.yaml b/charts/stable/home-assistant/values.yaml
index ea5b5c61ad3..d437adb1125 100644
--- a/charts/stable/home-assistant/values.yaml
+++ b/charts/stable/home-assistant/values.yaml
@@ -5,8 +5,16 @@ image:
   pullPolicy: IfNotPresent
   tag: v2021.10.4@sha256:6f5892e307edd0b135f4ccab1ecee70518e0418b26e6264c23c67d1982eece86
 
-env: {}
-    # TZ:
+env:
+  PUID: 568
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+podSecurityContext:
+  runAsUser: 0
+  runAsGroup: 0
 
 service:
   main:
@@ -16,7 +24,7 @@ service:
 
 initContainers:
   init-db:
-    image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+    image: "{{ .Values.alpineImage.repository }}:{{ .Values.alpineImage.tag }}"
     command: ["/config/init/init.sh"]
     volumeMounts:
       - name: init
@@ -51,8 +59,6 @@ persistence:
     type: pvc
     accessMode: ReadWriteOnce
     size: "100Gi"
-  varrun:
-    enabled: true
 
 # -- Enable and configure postgresql database subchart under this key.
 #    For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql)