diff --git a/community/n8n/1.1.5/Chart.lock b/community/n8n/1.1.5/Chart.lock
deleted file mode 100644
index 5a15d1e7f2..0000000000
--- a/community/n8n/1.1.5/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../common
-  version: 1.2.2
-digest: sha256:fb077cb81f6acecd5c9e6adc22a18e156f780cd78f27198cdb47810f95364b56
-generated: "2023-11-09T09:51:19.219838302+02:00"
diff --git a/community/n8n/1.1.5/charts/common-1.2.2.tgz b/community/n8n/1.1.5/charts/common-1.2.2.tgz
deleted file mode 100644
index 50c4f3a34e..0000000000
Binary files a/community/n8n/1.1.5/charts/common-1.2.2.tgz and /dev/null differ
diff --git a/community/n8n/1.1.5/ci/basic-values.yaml b/community/n8n/1.1.5/ci/basic-values.yaml
deleted file mode 100644
index 460cb092f0..0000000000
--- a/community/n8n/1.1.5/ci/basic-values.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-n8nNetwork:
-  webPort: 31000
-
-n8nStorage:
-  data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
-  pgData:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/pgData
-  pgBackup:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/pgBackup
diff --git a/community/n8n/1.2.0/Chart.lock b/community/n8n/1.2.0/Chart.lock
new file mode 100644
index 0000000000..b4dfbe62ac
--- /dev/null
+++ b/community/n8n/1.2.0/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../common
+  version: 1.2.3
+digest: sha256:e6ff49b06bf5d4d159e505ae6d153f36cd46170bb519caf90462cd5caebfd0fb
+generated: "2023-11-16T16:25:53.605881271+02:00"
diff --git a/community/n8n/1.1.5/Chart.yaml b/community/n8n/1.2.0/Chart.yaml
similarity index 91%
rename from community/n8n/1.1.5/Chart.yaml
rename to community/n8n/1.2.0/Chart.yaml
index fd349b0c50..805d7dc93c 100644
--- a/community/n8n/1.1.5/Chart.yaml
+++ b/community/n8n/1.2.0/Chart.yaml
@@ -3,9 +3,9 @@ description: n8n is an extendable workflow automation tool.
 annotations:
   title: n8n
 type: application
-version: 1.1.5
+version: 1.2.0
 apiVersion: v2
-appVersion: 1.16.0
+appVersion: 1.17.0
 kubeVersion: '>=1.16.0-0'
 maintainers:
   - name: truenas
@@ -14,7 +14,7 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../../../common
-    version: 1.2.2
+    version: 1.2.3
 home: https://n8n.io/
 icon: https://media.sys.truenas.net/apps/n8n/icons/icon.png
 sources:
diff --git a/community/n8n/1.1.5/README.md b/community/n8n/1.2.0/README.md
similarity index 100%
rename from community/n8n/1.1.5/README.md
rename to community/n8n/1.2.0/README.md
diff --git a/community/n8n/1.1.5/app-readme.md b/community/n8n/1.2.0/app-readme.md
similarity index 100%
rename from community/n8n/1.1.5/app-readme.md
rename to community/n8n/1.2.0/app-readme.md
diff --git a/community/n8n/1.2.0/charts/common-1.2.3.tgz b/community/n8n/1.2.0/charts/common-1.2.3.tgz
new file mode 100644
index 0000000000..420fb63297
Binary files /dev/null and b/community/n8n/1.2.0/charts/common-1.2.3.tgz differ
diff --git a/community/n8n/1.2.0/ci/basic-values.yaml b/community/n8n/1.2.0/ci/basic-values.yaml
new file mode 100644
index 0000000000..7ffd89232d
--- /dev/null
+++ b/community/n8n/1.2.0/ci/basic-values.yaml
@@ -0,0 +1,10 @@
+n8nNetwork:
+  webPort: 31000
+
+n8nStorage:
+  data:
+    type: pvc
+  pgData:
+    type: pvc
+  pgBackup:
+    type: emptyDir
diff --git a/community/n8n/1.1.5/ci/https-values.yaml b/community/n8n/1.2.0/ci/https-values.yaml
similarity index 96%
rename from community/n8n/1.1.5/ci/https-values.yaml
rename to community/n8n/1.2.0/ci/https-values.yaml
index c2fedfe6b7..0be40a3963 100644
--- a/community/n8n/1.1.5/ci/https-values.yaml
+++ b/community/n8n/1.2.0/ci/https-values.yaml
@@ -1,13 +1,10 @@
 n8nStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
   pgData:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/pgData
+    type: pvc
   pgBackup:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/pgBackup
+    type: emptyDir
 
 n8nConfig:
   webHost: localhost
diff --git a/community/n8n/1.1.5/ix_values.yaml b/community/n8n/1.2.0/ix_values.yaml
similarity index 85%
rename from community/n8n/1.1.5/ix_values.yaml
rename to community/n8n/1.2.0/ix_values.yaml
index bf611886c2..aff2871d19 100644
--- a/community/n8n/1.1.5/ix_values.yaml
+++ b/community/n8n/1.2.0/ix_values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: n8nio/n8n
   pullPolicy: IfNotPresent
-  tag: 1.16.0
+  tag: 1.17.0
 
 resources:
   limits:
@@ -24,13 +24,16 @@ n8nNetwork:
 n8nStorage:
   data:
     type: ixVolume
-    datasetName: data
+    ixVolumeConfig:
+      datasetName: data
   pgData:
     type: ixVolume
-    hostPath: pgData
+    ixVolumeConfig:
+      datasetName: pgData
   pgBackup:
     type: ixVolume
-    hostPath: pgBackup
+    ixVolumeConfig:
+      datasetName: pgBackup
   additionalStorages: []
 
 notes:
diff --git a/community/n8n/1.1.5/metadata.yaml b/community/n8n/1.2.0/metadata.yaml
similarity index 100%
rename from community/n8n/1.1.5/metadata.yaml
rename to community/n8n/1.2.0/metadata.yaml
diff --git a/community/n8n/1.2.0/migrations/migrate b/community/n8n/1.2.0/migrations/migrate
new file mode 100755
index 0000000000..e60e3c0e20
--- /dev/null
+++ b/community/n8n/1.2.0/migrations/migrate
@@ -0,0 +1,76 @@
+#!/usr/bin/python3
+import json
+import os
+import sys
+
+
+def storage_migrate(storage):
+    delete_keys = []
+    if storage['type'] == 'hostPath':
+        # Check if the key exists, if not we have already migrated
+        if not storage.get('hostPath'):
+            return storage
+
+        storage['hostPathConfig'] = {'hostPath': storage['hostPath']}
+        delete_keys.append('hostPath')
+
+    elif storage['type'] == 'ixVolume':
+        # Fixes an invalid key carried from values.yaml
+        storage.pop('hostPath', None)
+
+        # Check if the key exists, if not we have already migrated
+        if not storage.get('datasetName'):
+            return storage
+
+        storage['ixVolumeConfig'] = {'datasetName': storage['datasetName']}
+        delete_keys.append('datasetName')
+
+    elif storage['type'] == 'smb-pv-pvc':
+        # Check if the key exists, if not we have already migrated
+        if not storage.get('server'):
+            return storage
+
+        storage['smbConfig'] = {
+            'server': storage['server'],
+            'share': storage['share'],
+            'domain': storage['domain'],
+            'username': storage['username'],
+            'password': storage['password'],
+            'size': storage['size'],
+        }
+        delete_keys.extend(['server', 'share', 'domain', 'username', 'password', 'size'])
+
+    for key in delete_keys:
+        storage.pop(key, None)
+
+    return storage
+
+
+def migrate(values):
+    storage_key = 'n8nStorage'
+    storages = ['data', 'pgData', 'pgBackup']
+
+    for storage in storages:
+        check_val = values.get(storage_key, {}).get(storage, {})
+        if not isinstance(check_val, dict) or not check_val:
+            raise Exception(f'Storage section {storage} is malformed')
+
+        values[storage_key][storage] = storage_migrate(check_val)
+
+    additionalStorages = values.get(storage_key, {}).get('additionalStorages', [])
+    for idx, storage in enumerate(additionalStorages):
+        if not isinstance(storage, dict) or not storage:
+            raise Exception(f'Item {idx} in additionalStorages is malformed')
+
+        values[storage_key]['additionalStorages'][idx] = storage_migrate(storage)
+
+    return values
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        exit(1)
+
+    if os.path.exists(sys.argv[1]):
+        with open(sys.argv[1], 'r') as f:
+            print(json.dumps(migrate(json.loads(f.read()))))
diff --git a/community/n8n/1.1.5/questions.yaml b/community/n8n/1.2.0/questions.yaml
similarity index 50%
rename from community/n8n/1.1.5/questions.yaml
rename to community/n8n/1.2.0/questions.yaml
index c255b741d0..b89b0de481 100644
--- a/community/n8n/1.1.5/questions.yaml
+++ b/community/n8n/1.2.0/questions.yaml
@@ -145,24 +145,65 @@ questions:
                       description: Host Path (Path that already exists on the system)
                     - value: ixVolume
                       description: ixVolume (Dataset created automatically by the system)
-              - variable: datasetName
-                label: Dataset Name
+              - variable: ixVolumeConfig
+                label: ixVolume Configuration
+                description: The configuration for the ixVolume dataset.
                 schema:
-                  type: string
+                  type: dict
                   show_if: [["type", "=", "ixVolume"]]
-                  required: true
-                  hidden: true
-                  immutable: true
-                  default: data
                   $ref:
                     - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: datasetName
+                      label: Dataset Name
+                      description: The name of the dataset to use for storage.
+                      schema:
+                        type: string
+                        required: true
+                        immutable: true
+                        hidden: true
+                        default: "data"
+                    - variable: aclEntries
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+              - variable: hostPathConfig
+                label: hostPathConfig
                 schema:
-                  type: hostpath
+                  type: dict
                   show_if: [["type", "=", "hostPath"]]
-                  immutable: true
-                  required: true
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: acl
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+                        $ref:
+                          - "normalize/acl"
+                    - variable: hostPath
+                      label: Host Path
+                      description: The host path to use for storage.
+                      schema:
+                        type: hostpath
+                        show_if: [["aclEnable", "=", false]]
+                        immutable: true
+                        required: true
+
         - variable: pgData
           label: n8n Postgres Data Storage
           description: The path to store n8n Postgres Data.
@@ -184,24 +225,73 @@ questions:
                       description: Host Path (Path that already exists on the system)
                     - value: ixVolume
                       description: ixVolume (Dataset created automatically by the system)
-              - variable: datasetName
-                label: Dataset Name
+              - variable: ixVolumeConfig
+                label: ixVolume Configuration
+                description: The configuration for the ixVolume dataset.
                 schema:
-                  type: string
-                  show_if: [["type", "=", "ixVolume"]]
-                  required: true
+                  type: dict
+                  # Nothing to show for the user
                   hidden: true
-                  immutable: true
-                  default: pgData
+                  show_if: [["type", "=", "ixVolume"]]
                   $ref:
                     - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # Postgres does a CHMOD at startup
+                        # Which fails with ACL
+                        hidden: true
+                        default: false
+                    - variable: datasetName
+                      label: Dataset Name
+                      description: The name of the dataset to use for storage.
+                      schema:
+                        type: string
+                        required: true
+                        immutable: true
+                        hidden: true
+                        default: "pgData"
+                    - variable: aclEntries
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+              - variable: hostPathConfig
+                label: hostPathConfig
                 schema:
-                  type: hostpath
+                  type: dict
                   show_if: [["type", "=", "hostPath"]]
-                  immutable: true
-                  required: true
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # Postgres does a CHMOD at startup
+                        # Which fails with ACL
+                        hidden: true
+                        default: false
+                    - variable: acl
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+                        $ref:
+                          - "normalize/acl"
+                    - variable: hostPath
+                      label: Host Path
+                      description: The host path to use for storage.
+                      schema:
+                        type: hostpath
+                        show_if: [["aclEnable", "=", false]]
+                        immutable: true
+                        required: true
+
         - variable: pgBackup
           label: n8n Postgres Backup Storage
           description: The path to store n8n Postgres Backup.
@@ -223,24 +313,73 @@ questions:
                       description: Host Path (Path that already exists on the system)
                     - value: ixVolume
                       description: ixVolume (Dataset created automatically by the system)
-              - variable: datasetName
-                label: Dataset Name
+              - variable: ixVolumeConfig
+                label: ixVolume Configuration
+                description: The configuration for the ixVolume dataset.
                 schema:
-                  type: string
-                  show_if: [["type", "=", "ixVolume"]]
-                  required: true
+                  type: dict
+                  # Nothing to show for the user
                   hidden: true
-                  immutable: true
-                  default: pgBackup
+                  show_if: [["type", "=", "ixVolume"]]
                   $ref:
                     - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # Postgres does a CHMOD at startup
+                        # Which fails with ACL
+                        hidden: true
+                        default: false
+                    - variable: datasetName
+                      label: Dataset Name
+                      description: The name of the dataset to use for storage.
+                      schema:
+                        type: string
+                        required: true
+                        immutable: true
+                        hidden: true
+                        default: "pgBackup"
+                    - variable: aclEntries
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+              - variable: hostPathConfig
+                label: hostPathConfig
                 schema:
-                  type: hostpath
+                  type: dict
                   show_if: [["type", "=", "hostPath"]]
-                  immutable: true
-                  required: true
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # Postgres does a CHMOD at startup
+                        # Which fails with ACL
+                        hidden: true
+                        default: false
+                    - variable: acl
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+                        $ref:
+                          - "normalize/acl"
+                    - variable: hostPath
+                      label: Host Path
+                      description: The host path to use for storage.
+                      schema:
+                        type: hostpath
+                        show_if: [["aclEnable", "=", false]]
+                        immutable: true
+                        required: true
+
         - variable: additionalStorages
           label: Additional Storage
           description: Additional storage for n8n.
@@ -271,74 +410,120 @@ questions:
                             description: ixVolume (Dataset created automatically by the system)
                           - value: "smb-pv-pvc"
                             description: SMB Share (Mounts a persistent volume claim to a SMB share)
+                    - variable: readOnly
+                      label: Read Only
+                      description: Mount the volume as read only.
+                      schema:
+                        type: boolean
+                        default: false
                     - variable: mountPath
                       label: Mount Path
                       description: The path inside the container to mount the storage.
                       schema:
                         type: path
                         required: true
-                    - variable: hostPath
-                      label: Host Path
-                      description: The host path to use for storage.
+                    - variable: hostPathConfig
+                      label: hostPathConfig
                       schema:
-                        type: hostpath
+                        type: dict
                         show_if: [["type", "=", "hostPath"]]
-                        required: true
-                    - variable: datasetName
-                      label: Dataset Name
-                      description: The name of the dataset to use for storage.
+                        attrs:
+                          - variable: aclEnable
+                            label: Enable ACL
+                            description: Enable ACL for the dataset.
+                            schema:
+                              type: boolean
+                              default: false
+                          - variable: acl
+                            label: ACL Configuration
+                            schema:
+                              type: dict
+                              show_if: [["aclEnable", "=", true]]
+                              attrs: []
+                              $ref:
+                                - "normalize/acl"
+                          - variable: hostPath
+                            label: Host Path
+                            description: The host path to use for storage.
+                            schema:
+                              type: hostpath
+                              show_if: [["aclEnable", "=", false]]
+                              immutable: true
+                              required: true
+                    - variable: ixVolumeConfig
+                      label: ixVolume Configuration
+                      description: The configuration for the ixVolume dataset.
                       schema:
-                        type: string
+                        type: dict
                         show_if: [["type", "=", "ixVolume"]]
-                        required: true
-                        immutable: true
-                        default: "storage_entry"
                         $ref:
                           - "normalize/ixVolume"
-                    - variable: server
-                      label: Server
-                      description: The server for the SMB share.
+                        attrs:
+                          - variable: aclEnable
+                            label: Enable ACL
+                            description: Enable ACL for the dataset.
+                            schema:
+                              type: boolean
+                              default: false
+                          - variable: datasetName
+                            label: Dataset Name
+                            description: The name of the dataset to use for storage.
+                            schema:
+                              type: string
+                              required: true
+                              immutable: true
+                              default: "storage_entry"
+                          - variable: aclEntries
+                            label: ACL Configuration
+                            schema:
+                              type: dict
+                              show_if: [["aclEnable", "=", true]]
+                              attrs: []
+                    - variable: smbConfig
+                      label: SMB Share Configuration
+                      description: The configuration for the SMB Share.
                       schema:
-                        type: string
+                        type: dict
                         show_if: [["type", "=", "smb-pv-pvc"]]
-                        required: true
-                    - variable: share
-                      label: Share
-                      description: The share name for the SMB share.
-                      schema:
-                        type: string
-                        show_if: [["type", "=", "smb-pv-pvc"]]
-                        required: true
-                    - variable: domain
-                      label: Domain (Optional)
-                      description: The domain for the SMB share.
-                      schema:
-                        type: string
-                        show_if: [["type", "=", "smb-pv-pvc"]]
-                    - variable: username
-                      label: Username
-                      description: The username for the SMB share.
-                      schema:
-                        type: string
-                        show_if: [["type", "=", "smb-pv-pvc"]]
-                        required: true
-                    - variable: password
-                      label: Password
-                      description: The password for the SMB share.
-                      schema:
-                        type: string
-                        show_if: [["type", "=", "smb-pv-pvc"]]
-                        required: true
-                        private: true
-                    - variable: size
-                      label: Size (in Gi)
-                      description: The size of the volume quota.
-                      schema:
-                        type: int
-                        show_if: [["type", "=", "smb-pv-pvc"]]
-                        required: true
-                        min: 1
-                        default: 1
+                        attrs:
+                          - variable: server
+                            label: Server
+                            description: The server for the SMB share.
+                            schema:
+                              type: string
+                              required: true
+                          - variable: share
+                            label: Share
+                            description: The share name for the SMB share.
+                            schema:
+                              type: string
+                              required: true
+                          - variable: domain
+                            label: Domain (Optional)
+                            description: The domain for the SMB share.
+                            schema:
+                              type: string
+                          - variable: username
+                            label: Username
+                            description: The username for the SMB share.
+                            schema:
+                              type: string
+                              required: true
+                          - variable: password
+                            label: Password
+                            description: The password for the SMB share.
+                            schema:
+                              type: string
+                              required: true
+                              private: true
+                          - variable: size
+                            label: Size (in Gi)
+                            description: The size of the volume quota.
+                            schema:
+                              type: int
+                              required: true
+                              min: 1
+                              default: 1
 
   - variable: resources
     label: ""
diff --git a/community/n8n/1.1.5/templates/NOTES.txt b/community/n8n/1.2.0/templates/NOTES.txt
similarity index 100%
rename from community/n8n/1.1.5/templates/NOTES.txt
rename to community/n8n/1.2.0/templates/NOTES.txt
diff --git a/community/n8n/1.1.5/templates/_configuration.tpl b/community/n8n/1.2.0/templates/_configuration.tpl
similarity index 100%
rename from community/n8n/1.1.5/templates/_configuration.tpl
rename to community/n8n/1.2.0/templates/_configuration.tpl
diff --git a/community/n8n/1.1.5/templates/_n8n.tpl b/community/n8n/1.2.0/templates/_n8n.tpl
similarity index 82%
rename from community/n8n/1.1.5/templates/_n8n.tpl
rename to community/n8n/1.2.0/templates/_n8n.tpl
index dcaacbefa2..c40dd569d4 100644
--- a/community/n8n/1.1.5/templates/_n8n.tpl
+++ b/community/n8n/1.2.0/templates/_n8n.tpl
@@ -49,11 +49,6 @@ workload:
               path: /healthz
               port: {{ .Values.n8nNetwork.webPort }}
       initContainers:
-      {{- include "ix.v1.common.app.permissions" (dict "containerName" "01-permissions"
-                                                        "UID" .Values.n8nRunAs.user
-                                                        "GID" .Values.n8nRunAs.group
-                                                        "mode" "check"
-                                                        "type" "init") | nindent 8 }}
       {{- include "ix.v1.common.app.redisWait" (dict  "name" "02-redis-wait"
                                                       "secretName" "redis-creds") | nindent 8 }}
       {{- include "ix.v1.common.app.postgresWait" (dict "name" "03-postgres-wait"
diff --git a/community/n8n/1.1.5/templates/_persistence.tpl b/community/n8n/1.2.0/templates/_persistence.tpl
similarity index 52%
rename from community/n8n/1.1.5/templates/_persistence.tpl
rename to community/n8n/1.2.0/templates/_persistence.tpl
index ce7c046feb..d9a74c47b7 100644
--- a/community/n8n/1.1.5/templates/_persistence.tpl
+++ b/community/n8n/1.2.0/templates/_persistence.tpl
@@ -2,15 +2,12 @@
 persistence:
   data:
     enabled: true
-    type: {{ .Values.n8nStorage.data.type }}
-    datasetName: {{ .Values.n8nStorage.data.datasetName | default "" }}
-    hostPath: {{ .Values.n8nStorage.data.hostPath | default "" }}
+    {{- include "n8n.storage.ci.migration" (dict "storage" .Values.n8nStorage.data) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.n8nStorage.data) | nindent 4 }}
     targetSelector:
       n8n:
         n8n:
           mountPath: /data
-        01-permissions:
-          mountPath: /mnt/directories/data
   tmp:
     enabled: true
     type: emptyDir
@@ -19,33 +16,18 @@ persistence:
         n8n:
           mountPath: /tmp
   {{- range $idx, $storage := .Values.n8nStorage.additionalStorages }}
-  {{ printf "n8n-%v" (int $idx) }}:
-    {{- $size := "" -}}
-    {{- if $storage.size -}}
-      {{- $size = (printf "%vGi" $storage.size) -}}
-    {{- end }}
+  {{ printf "n8n-%v:" (int $idx) }}
     enabled: true
-    type: {{ $storage.type }}
-    datasetName: {{ $storage.datasetName | default "" }}
-    hostPath: {{ $storage.hostPath | default "" }}
-    server: {{ $storage.server | default "" }}
-    share: {{ $storage.share | default "" }}
-    domain: {{ $storage.domain | default "" }}
-    username: {{ $storage.username | default "" }}
-    password: {{ $storage.password | default "" }}
-    size: {{ $size }}
-    {{- if eq $storage.type "smb-pv-pvc" }}
-    mountOptions:
-      - key: noperm
-    {{- end }}
+    {{- include "n8n.storage.ci.migration" (dict "storage" $storage) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
     targetSelector:
       n8n:
         n8n:
           mountPath: {{ $storage.mountPath }}
-        01-permissions:
-          mountPath: /mnt/directories{{ $storage.mountPath }}
   {{- end }}
 
+  {{- include "n8n.storage.ci.migration" (dict "storage" .Values.n8nStorage.pgData) }}
+  {{- include "n8n.storage.ci.migration" (dict "storage" .Values.n8nStorage.pgBackup) }}
   {{- include "ix.v1.common.app.postgresPersistence"
       (dict "pgData" .Values.n8nStorage.pgData
             "pgBackup" .Values.n8nStorage.pgBackup
@@ -74,3 +56,13 @@ scaleCertificate:
     id: {{ .Values.n8nNetwork.certificateID }}
     {{- end }}
 {{- end -}}
+
+{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}}
+{{- define "n8n.storage.ci.migration" -}}
+  {{- $storage := .storage -}}
+
+  {{- if $storage.hostPath -}}
+    {{- $_ := set $storage "hostPathConfig" dict -}}
+    {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}}
+  {{- end -}}
+{{- end -}}
diff --git a/community/n8n/1.1.5/templates/_portal.tpl b/community/n8n/1.2.0/templates/_portal.tpl
similarity index 100%
rename from community/n8n/1.1.5/templates/_portal.tpl
rename to community/n8n/1.2.0/templates/_portal.tpl
diff --git a/community/n8n/1.1.5/templates/_postgres.tpl b/community/n8n/1.2.0/templates/_postgres.tpl
similarity index 100%
rename from community/n8n/1.1.5/templates/_postgres.tpl
rename to community/n8n/1.2.0/templates/_postgres.tpl
diff --git a/community/n8n/1.1.5/templates/_redis.tpl b/community/n8n/1.2.0/templates/_redis.tpl
similarity index 100%
rename from community/n8n/1.1.5/templates/_redis.tpl
rename to community/n8n/1.2.0/templates/_redis.tpl
diff --git a/community/n8n/1.1.5/templates/_service.tpl b/community/n8n/1.2.0/templates/_service.tpl
similarity index 100%
rename from community/n8n/1.1.5/templates/_service.tpl
rename to community/n8n/1.2.0/templates/_service.tpl
diff --git a/community/n8n/1.1.5/templates/_validation.tpl b/community/n8n/1.2.0/templates/_validation.tpl
similarity index 100%
rename from community/n8n/1.1.5/templates/_validation.tpl
rename to community/n8n/1.2.0/templates/_validation.tpl
diff --git a/community/n8n/1.1.5/templates/common.yaml b/community/n8n/1.2.0/templates/common.yaml
similarity index 100%
rename from community/n8n/1.1.5/templates/common.yaml
rename to community/n8n/1.2.0/templates/common.yaml