diff --git a/share/organisation/index.yaml b/share/organisation/index.yaml
index dbb0bbb..732a276 100644
--- a/share/organisation/index.yaml
+++ b/share/organisation/index.yaml
@@ -6,6 +6,28 @@ metadata:
   name: organisation
   description: null
 options:
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  datasets:
+    default: []
+    items:
+      properties:
+        engine:
+          default: pg
+          type: string
+        name:
+          default: ''
+          type: string
+      type: object
+    type: array
   backups:
     default:
       enable: false
@@ -36,38 +58,25 @@ options:
         default: backup-settings
         type: string
     type: object
-  datasets:
-    default: []
-    items:
-      properties:
-        engine:
-          default: pg
-          type: string
-        name:
-          default: ''
-          type: string
-      type: object
-    type: array
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   app-group:
     default: dev
     examples:
     - dev
     type: string
+  stages:
+    default: []
+    items:
+      properties:
+        name:
+          default: prod
+          type: string
+      type: object
+    type: array
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   distributions:
     default:
       core: core
@@ -83,25 +92,16 @@ options:
         default: domain
         type: string
     type: object
-  issuer:
-    default: letsencrypt-prod
+  domain-name:
+    default: your_company.com
     examples:
-    - letsencrypt-prod
+    - your_company.com
     type: string
   haveGitea:
     default: false
     examples:
     - false
     type: boolean
-  stages:
-    default: []
-    items:
-      properties:
-        name:
-          default: prod
-          type: string
-      type: object
-    type: array
 dependencies: []
 providers:
   kubernetes: true
diff --git a/share/organisation/stages.tf b/share/organisation/stages.tf
index a33b2d3..8cb7270 100644
--- a/share/organisation/stages.tf
+++ b/share/organisation/stages.tf
@@ -18,7 +18,7 @@ locals {
   sorted-stages = flatten([
     for name in local.sorted-stage-name: [
       for s in var.stages:
-        merge({s, {"namespace" = "${var.domain}-${var.instance}-${name}"}}) if s.name == name
+        merge(s, {"namespace" = "${var.domain}-${var.instance}-${name}"}) if s.name == name
     ]
   ])
   sorted-datasets = flatten([