diff --git a/share/dataset-pg/directus.tf b/share/dataset-pg/directus.tf
index 8aed614..be7cc63 100644
--- a/share/dataset-pg/directus.tf
+++ b/share/dataset-pg/directus.tf
@@ -84,11 +84,11 @@ resource "kubectl_manifest" "directus_pvc" {
       labels: ${jsonencode(local.common-labels)}
     spec:
       accessModes:
-      - "${var.storage.accessMode}"
+      - "${var.extentions.directus.storage.accessMode}"
       resources:
         requests:
-          storage: "${var.storage.size}"
-      volumeMode: "${var.storage.type}"
+          storage: "${var.extentions.directus.storage.size}"
+      volumeMode: "${var.extentions.directus.storage.type}"
   EOF
 }
 
diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index 0d6389c..35e0628 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,98 +6,6 @@ metadata:
   name: dataset-pg
   description: null
 options:
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  storage:
-    default: 8Gi
-    examples:
-    - 8Gi
-    type: string
-  databases:
-    default: []
-    items:
-      properties:
-        name:
-          default: db
-          type: string
-      type: object
-    type: array
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: alt-account
-          type: string
-      type: object
-    type: array
-  sub-domain:
-    default: dataset-pg
-    examples:
-    - dataset-pg
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      retention:
-        db: 30d
-      schedule:
-        db: 0 3 * * *
-      secret-key: s3-secret
-      secret-name: backup-settings
-    examples:
-    - enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      retention:
-        db: 30d
-      schedule:
-        db: 0 3 * * *
-      secret-key: s3-secret
-      secret-name: backup-settings
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key-id-key:
-        default: s3-id
-        type: string
-      retention:
-        default:
-          db: 30d
-        properties:
-          db:
-            default: 30d
-            type: string
-        type: object
-      schedule:
-        default:
-          db: 0 3 * * *
-        properties:
-          db:
-            default: 0 3 * * *
-            type: string
-        type: object
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
-        type: string
-    type: object
   extentions:
     default:
       directus:
@@ -107,6 +15,10 @@ options:
           registry: docker.io
           repository: directus/directus
           tag: 10.6.4
+        storage:
+          accessMode: ReadWriteOnce
+          size: 1Gi
+          type: Filesystem
       pool:
         enable: false
       postgrest:
@@ -130,6 +42,10 @@ options:
           registry: docker.io
           repository: directus/directus
           tag: 10.6.4
+        storage:
+          accessMode: ReadWriteOnce
+          size: 1Gi
+          type: Filesystem
       pool:
         enable: false
       postgrest:
@@ -154,6 +70,10 @@ options:
             registry: docker.io
             repository: directus/directus
             tag: 10.6.4
+          storage:
+            accessMode: ReadWriteOnce
+            size: 1Gi
+            type: Filesystem
         properties:
           enable:
             default: false
@@ -178,6 +98,22 @@ options:
                 default: 10.6.4
                 type: string
             type: object
+          storage:
+            default:
+              accessMode: ReadWriteOnce
+              size: 1Gi
+              type: Filesystem
+            properties:
+              accessMode:
+                default: ReadWriteOnce
+                type: string
+              size:
+                default: 1Gi
+                type: string
+              type:
+                default: Filesystem
+                type: string
+            type: object
         type: object
       pool:
         default:
@@ -251,21 +187,113 @@ options:
             type: object
         type: object
     type: object
+  storage:
+    default: 8Gi
+    examples:
+    - 8Gi
+    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      retention:
+        db: 30d
+      schedule:
+        db: 0 3 * * *
+      secret-key: s3-secret
+      secret-name: backup-settings
+    examples:
+    - enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      retention:
+        db: 30d
+      schedule:
+        db: 0 3 * * *
+      secret-key: s3-secret
+      secret-name: backup-settings
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key-id-key:
+        default: s3-id
+        type: string
+      retention:
+        default:
+          db: 30d
+        properties:
+          db:
+            default: 30d
+            type: string
+        type: object
+      schedule:
+        default:
+          db: 0 3 * * *
+        properties:
+          db:
+            default: 0 3 * * *
+            type: string
+        type: object
+      secret-key:
+        default: s3-secret
+        type: string
+      secret-name:
+        default: backup-settings
+        type: string
+    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  sub-domain:
+    default: dataset-pg
+    examples:
+    - dataset-pg
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  databases:
+    default: []
+    items:
+      properties:
+        name:
+          default: db
+          type: string
+      type: object
+    type: array
+  roles:
+    default: []
+    items:
+      properties:
+        name:
+          default: alt-account
+          type: string
+      type: object
+    type: array
 dependencies:
 - dist: null
   category: dbo