diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml
index ccffb98..d099af7 100644
--- a/apps/nextcloud/index.yaml
+++ b/apps/nextcloud/index.yaml
@@ -6,41 +6,6 @@ metadata:
   name: nextcloud
   description: null
 options:
-  openid-name:
-    default: vynil
-    examples:
-    - vynil
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  hpa:
-    default:
-      avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    examples:
-    - avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    properties:
-      avg-cpu:
-        default: 50
-        type: integer
-      max-replicas:
-        default: 5
-        type: integer
-      min-replicas:
-        default: 1
-        type: integer
-    type: object
   apps:
     default:
       audioplayer: false
@@ -131,25 +96,44 @@ options:
         default: true
         type: boolean
     type: object
-  admin:
-    default:
-      name: nextcloud_admin
+  app-group:
+    default: ''
     examples:
-    - name: nextcloud_admin
-    properties:
-      name:
-        default: nextcloud_admin
-        type: string
-    type: object
+    - ''
+    type: string
   sub-domain:
     default: files
     examples:
     - files
     type: string
-  app-group:
-    default: ''
+  domain:
+    default: your-company
     examples:
-    - ''
+    - your-company
+    type: string
+  storage:
+    default:
+      accessMode: ReadWriteOnce
+      size: 10Gi
+    examples:
+    - accessMode: ReadWriteOnce
+      size: 10Gi
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 10Gi
+        type: string
+    type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
     type: string
   postgres:
     default:
@@ -171,16 +155,6 @@ options:
         default: '14'
         type: string
     type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   backups:
     default:
       enable: false
@@ -287,6 +261,79 @@ options:
         default: false
         type: boolean
     type: object
+  hpa:
+    default:
+      avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    examples:
+    - avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    properties:
+      avg-cpu:
+        default: 50
+        type: integer
+      max-replicas:
+        default: 5
+        type: integer
+      min-replicas:
+        default: 1
+        type: integer
+    type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  admin:
+    default:
+      name: nextcloud_admin
+    examples:
+    - name: nextcloud_admin
+    properties:
+      name:
+        default: nextcloud_admin
+        type: string
+    type: object
+  redis:
+    default:
+      exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
+    examples:
+    - exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
+    properties:
+      exporter:
+        default:
+          enabled: true
+          image: quay.io/opstree/redis-exporter:v1.44.0
+        properties:
+          enabled:
+            default: true
+            type: boolean
+          image:
+            default: quay.io/opstree/redis-exporter:v1.44.0
+            type: string
+        type: object
+      image:
+        default: quay.io/opstree/redis:v7.0.5
+        type: string
+      storage:
+        default: 2Gi
+        type: string
+    type: object
   images:
     default:
       collabora:
@@ -450,58 +497,11 @@ options:
             type: string
         type: object
     type: object
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 10Gi
+  openid-name:
+    default: vynil
     examples:
-    - accessMode: ReadWriteOnce
-      size: 10Gi
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 10Gi
-        type: string
-    type: object
-  redis:
-    default:
-      exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
-    examples:
-    - exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
-    properties:
-      exporter:
-        default:
-          enabled: true
-          image: quay.io/opstree/redis-exporter:v1.44.0
-        properties:
-          enabled:
-            default: true
-            type: boolean
-          image:
-            default: quay.io/opstree/redis-exporter:v1.44.0
-            type: string
-        type: object
-      image:
-        default: quay.io/opstree/redis:v7.0.5
-        type: string
-      storage:
-        default: 2Gi
-        type: string
-    type: object
+    - vynil
+    type: string
 dependencies:
 - dist: null
   category: share
diff --git a/apps/nextcloud/presentation.tf b/apps/nextcloud/presentation.tf
index 4a3c1d5..4d39395 100644
--- a/apps/nextcloud/presentation.tf
+++ b/apps/nextcloud/presentation.tf
@@ -12,13 +12,13 @@ locals {
     }
   }
   collabora-service = {
-    "name"  = "${var.instance}-collabora"
+    "name"  = "collabora-${var.instance}"
     "port" = {
       "number" = 80
     }
   }
   onlyoffice-service = {
-    "name"  = "${var.instance}-onlyoffice"
+    "name"  = "onlyoffice-${var.instance}"
     "port" = {
       "number" = 80
     }
diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index 42028c8..e4f84a4 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,6 +6,31 @@ metadata:
   name: dataset-pg
   description: null
 options:
+  storage:
+    default: 8Gi
+    examples:
+    - 8Gi
+    type: string
+  sub-domain:
+    default: dataset-pg
+    examples:
+    - dataset-pg
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   extentions:
     default:
       pool:
@@ -112,16 +137,6 @@ options:
             type: object
         type: object
     type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   databases:
     default: []
     items:
@@ -131,21 +146,20 @@ options:
           type: string
       type: object
     type: array
-  domain-name:
-    default: your_company.com
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - your_company.com
+    - letsencrypt-prod
     type: string
-  sub-domain:
-    default: dataset-pg
-    examples:
-    - dataset-pg
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
+  roles:
+    default: []
+    items:
+      properties:
+        name:
+          default: alt-account
+          type: string
+      type: object
+    type: array
   backups:
     default:
       enable: false
@@ -200,20 +214,6 @@ options:
         default: backup-settings
         type: string
     type: object
-  storage:
-    default: 8Gi
-    examples:
-    - 8Gi
-    type: string
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: alt-account
-          type: string
-      type: object
-    type: array
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/dataset-pg/postgrest.tf b/share/dataset-pg/postgrest.tf
index 00402e7..7d03efd 100644
--- a/share/dataset-pg/postgrest.tf
+++ b/share/dataset-pg/postgrest.tf
@@ -4,13 +4,13 @@ locals {
   })
   prest-dns-name = "api.${local.dns-name}"
   prest-service = {
-    "name"  = "${var.instance}-postgrest"
+    "name"  = "postgrest-${var.instance}"
     "port" = {
       "number" = 80
     }
   }
   swagger-service = {
-    "name"  = "${var.instance}-swagger"
+    "name"  = "swagger-${var.instance}"
     "port" = {
       "number" = 80
     }