Cleanup devicemounts a bit (#363)

dev/phpmyadmin/1.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

docs/development/app development/questions-yaml.md

@@ -91,8 +91,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage and Devices"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "WARNING"

incubator/bazarr/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/calibre-web/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/deluge/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/freshrss/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/gaps/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/grocy/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/heimdall/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/lazylibrarian/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/lychee/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/navidrome/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/node-red/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/nzbget/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/nzbhydra/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/organizr/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/qbittorrent/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/readarr/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/sabnzbd/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/truecommand/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/tvheadend/4.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

incubator/unifi/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/bitwarden/1.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/collabora-online/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/emby/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/esphome/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/handbrake/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"
@@ -402,6 +402,41 @@ questions:
                 schema:
                   type: hostpath
                   required: true
+  - variable: deviceMounts
+    label: "Mount Devices"
+    group: "Resources and Devices"
+    schema:
+      type: list
+      default: []
+      items:
+        - variable: deviceMount
+          label: "Custom Storage"
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enabled"
+                schema:
+                  type: boolean
+                  default: true
+                  required: true
+                  hidden: true
+                  editable: false
+              - variable: emptyDir
+                label: "emptyDir"
+                schema:
+                  type: boolean
+                  default: false
+                  hidden: true
+                  editable: false
+              - variable: devicePath
+                label: "Device Path"
+                description: "Path to the device to mount inside the container"
+                schema:
+                  type: path
+                  required: true
+                  default: "/dev/ttyACM0"
+                  editable: true
   - variable: ingress
     label: ""
     group: "Reverse Proxy Configuration"

stable/home-assistant/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"
@@ -290,101 +290,40 @@ questions:
                   type: hostpath
                   required: true
   - variable: deviceMounts
-    group: "Resource Reservation"
+    label: "Mount Devices"
-    label: "Mount USB devices"
+    group: "Resources and Devices"
     schema:
-      type: dict
+      type: list
-      attrs:
+      default: []
-        # Z-Wave device -----------------
+      items:
-        - variable: zwave
+        - variable: deviceMount
-          label: "USB Z-Wave Device"
+          label: "Custom Storage"
           schema:
             type: dict
             attrs:
               - variable: enabled
                 label: "Enabled"
-                schema:
-                  type: boolean
-                  default: false
-                  required: false
-                  hidden: false
-                  editable: true
-              - variable: hostPathEnabled
-                label: "Enable Host Path"
                 schema:
                   type: boolean
                   default: true
+                  required: true
                   hidden: true
-              - variable: setPermissions
+                  editable: false
-                label: "Automatic Permissions"
-                schema:
-                  type: boolean
-                  default: false
-                  hidden: true
               - variable: emptyDir
-                label: "Empty Dir"
+                label: "emptyDir"
                 schema:
                   type: boolean
                   default: false
                   hidden: true
-              - variable: mountPath
+                  editable: false
-                label: "Path to mount Z-Wave device inside the container"
+              - variable: devicePath
-                description: "Preferably the same as the path to the device path on the host"
+                label: "Device Path"
+                description: "Path to the device to mount inside the container"
                 schema:
                   type: path
-                  default: "/dev/ttyACM0"
                   required: true
-              - variable: hostPath
-                label: "Path to Z-Wave device on host"
-                schema:
-                  type: path
                   default: "/dev/ttyACM0"
-                  required: true
-        # Z-Wave device -----------------
-        - variable: zwave
-          label: "USB zigbee Device"
-          schema:
-            type: dict
-            attrs:
-              - variable: enabled
-                label: "Enabled"
-                schema:
-                  type: boolean
-                  default: false
-                  required: false
-                  hidden: false
                   editable: true
-              - variable: hostPathEnabled
-                label: "Enable Host Path"
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
-              - variable: setPermissions
-                label: "Automatic Permissions"
-                schema:
-                  type: boolean
-                  default: false
-                  hidden: true
-              - variable: emptyDir
-                label: "Empty Dir"
-                schema:
-                  type: boolean
-                  default: false
-                  hidden: true
-              - variable: mountPath
-                label: "Path to mount zigbee device inside the container"
-                description: "Preferably the same as the path to the device path on the host"
-                schema:
-                  type: path
-                  default: "/dev/ttyACM0"
-                  required: true
-              - variable: hostPath
-                label: "Path to zigbee device on host"
-                schema:
-                  type: path
-                  default: "/dev/ttyACM0"
-                  required: true
   - variable: ingress
     label: ""
     group: "Reverse Proxy Configuration"

stable/jackett/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/jellyfin/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/kms/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/lidarr/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/ombi/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/plex/2.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/radarr/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/sonarr/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/syncthing/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/tautulli/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/traefik/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/transmission/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"

stable/zwavejs2mqtt/3.1.1/questions.yaml

@@ -9,8 +9,8 @@ groups:
     description: "Configure / service for container"
   - name: "Storage"
     description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Resource Reservation"
+  - name: "Resources and Devices"
-    description: "Specify resources to be allocated to workload"
+    description: "Specify resources/devices to be allocated to workload"
   - name: "Reverse Proxy Configuration"
     description: "Reverse Proxy configuration"
   - name: "Advanced"
@@ -318,57 +318,40 @@ questions:
                   type: hostpath
                   required: true
   - variable: deviceMounts
-    group: "Resource Reservation"
+    label: "Mount Devices"
-    label: "USB devices"
+    group: "Resources and Devices"
     schema:
-      type: dict
+      type: list
-      attrs:
+      default: []
-        # Config ------------------------
+      items:
-        # Z-Wave device -----------------
+        - variable: deviceMount
-        - variable: zwave
+          label: "Custom Storage"
-          label: "USB Z-Wave Device"
           schema:
             type: dict
             attrs:
-              - variable: hostPathEnabled
-                label: "Enable Host Path"
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
               - variable: enabled
                 label: "Enabled"
                 schema:
                   type: boolean
-                  default: false
+                  default: true
-                  required: false
+                  required: true
-                  hidden: false
-                  editable: true
-              - variable: setPermissions
-                label: "Automatic Permissions"
-                schema:
-                  type: boolean
-                  default: false
                   hidden: true
+                  editable: false
               - variable: emptyDir
-                label: "Empty Dir"
+                label: "emptyDir"
                 schema:
                   type: boolean
                   default: false
                   hidden: true
-              - variable: mountPath
+                  editable: false
-                label: "Path to mount Z-Wave device inside the container"
+              - variable: devicePath
-                description: "Preferably the same as the path to the device path on the host"
+                label: "Device Path"
+                description: "Path to the device to mount inside the container"
                 schema:
                   type: path
-                  default: "/dev/ttyACM0"
                   required: true
-              - variable: hostPath
-                label: "Path to Z-Wave device on host"
-                schema:
-                  type: path
                   default: "/dev/ttyACM0"
-                  required: true
+                  editable: true
   - variable: ingress
     label: ""
     group: "Reverse Proxy Configuration"