diff --git a/meta/domain-devspaces/apps.tf b/meta/domain-devspaces/apps.tf
index 1e8d8c8..18a4c6b 100644
--- a/meta/domain-devspaces/apps.tf
+++ b/meta/domain-devspaces/apps.tf
@@ -39,7 +39,7 @@ locals {
             "name" = "${ds.name}-dataset-pg-${db.name}"
             "key" = "POSGRESQL_PASSWORD"
           }
-        }] if ds.engine=="pg" && length(i.databases)>0]),
+        }] if ds.engine=="pg" && length(ds.databases)>0]),
         flatten([for org in local.sorted-organisations: flatten([for stage in org.stages: flatten([for ds in org.datasets: [for db in ds.databases:{
           "name" = "${ds.name}-dataset-pg"
           "namespace" = "${var.domain}-${org.name}-${stage.name}"
diff --git a/meta/domain-devspaces/index.yaml b/meta/domain-devspaces/index.yaml
index 1652eef..97bc74e 100644
--- a/meta/domain-devspaces/index.yaml
+++ b/meta/domain-devspaces/index.yaml
@@ -6,45 +6,16 @@ metadata:
   name: domain-devspaces
   description: null
 options:
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   app-group:
     default: dev
     examples:
     - dev
     type: string
-  external-pgs:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        dbname:
-          default: ''
-          type: string
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-        secret:
-          properties:
-            key:
-              default: ''
-              type: string
-            name:
-              default: ''
-              type: string
-          type: object
-        username:
-          default: ''
-          type: string
-      type: object
-    type: array
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
   backups:
     default:
       enable: false
@@ -75,156 +46,6 @@ options:
         default: backup-settings
         type: string
     type: object
-  storage-classes:
-    default:
-      BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    examples:
-    - BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    properties:
-      BlockReadWriteMany:
-        default: ''
-        type: string
-      BlockReadWriteOnce:
-        default: ''
-        type: string
-      FilesystemReadWriteMany:
-        default: ''
-        type: string
-      FilesystemReadWriteOnce:
-        default: ''
-        type: string
-    type: object
-  stations:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        name:
-          default: ''
-          type: string
-        organisations:
-          default: []
-          items:
-            type: string
-          type: array
-      type: object
-    type: array
-  external-mongos:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        dbname:
-          default: ''
-          type: string
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-        secret:
-          properties:
-            key:
-              default: ''
-              type: string
-            name:
-              default: ''
-              type: string
-          type: object
-        username:
-          default: ''
-          type: string
-      type: object
-    type: array
-  external-redis:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-      type: object
-    type: array
-  distributions:
-    default:
-      core: core
-      domain: domain
-    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
-  organisations:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        datasets:
-          default: []
-          items:
-            properties:
-              databases:
-                default: []
-                items:
-                  properties:
-                    name:
-                      default: db
-                      type: string
-                  type: object
-                type: array
-              engine:
-                default: pg
-                type: string
-              name:
-                default: ''
-                type: string
-            type: object
-          type: array
-        name:
-          default: ''
-          type: string
-        stages:
-          default: []
-          items:
-            properties:
-              name:
-                default: prod
-                type: string
-            type: object
-          type: array
-      type: object
-    type: array
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   stations-sub-domain:
     default: code
     examples:
@@ -283,12 +104,15 @@ options:
             type: boolean
         type: object
     type: object
-  external-marias:
+  external-mongos:
     default: []
     examples:
     - []
     items:
       properties:
+        dbname:
+          default: ''
+          type: string
         name:
           default: ''
           type: string
@@ -309,11 +133,51 @@ options:
           type: string
       type: object
     type: array
-  domain:
-    default: your-company
+  distributions:
+    default:
+      core: core
+      domain: domain
     examples:
-    - your-company
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
     type: string
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
   images:
     default:
       codeserver:
@@ -353,6 +217,142 @@ options:
             type: number
         type: object
     type: object
+  external-pgs:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        dbname:
+          default: ''
+          type: string
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+        secret:
+          properties:
+            key:
+              default: ''
+              type: string
+            name:
+              default: ''
+              type: string
+          type: object
+        username:
+          default: ''
+          type: string
+      type: object
+    type: array
+  stations:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        organisations:
+          default: []
+          items:
+            type: string
+          type: array
+      type: object
+    type: array
+  external-marias:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+        secret:
+          properties:
+            key:
+              default: ''
+              type: string
+            name:
+              default: ''
+              type: string
+          type: object
+        username:
+          default: ''
+          type: string
+      type: object
+    type: array
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  external-redis:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+      type: object
+    type: array
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  organisations:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        datasets:
+          default: []
+          items:
+            properties:
+              databases:
+                default: []
+                items:
+                  properties:
+                    name:
+                      default: db
+                      type: string
+                  type: object
+                type: array
+              engine:
+                default: pg
+                type: string
+              name:
+                default: ''
+                type: string
+            type: object
+          type: array
+        name:
+          default: ''
+          type: string
+        stages:
+          default: []
+          items:
+            properties:
+              name:
+                default: prod
+                type: string
+            type: object
+          type: array
+      type: object
+    type: array
 dependencies: []
 providers:
   kubernetes: true