diff --git a/share/dataset-pg/directus.tf b/share/dataset-pg/directus.tf
index 182cbe4..499782e 100644
--- a/share/dataset-pg/directus.tf
+++ b/share/dataset-pg/directus.tf
@@ -129,12 +129,12 @@ resource "kubectl_manifest" "directus_deploy" {
               valueFrom:
                 secretKeyRef:
                   key: "client-id"
-                  name: "directus-${var.instance}-id"
+                  name: "directus-${replace(var.sub-domain, ".", "-")}-${var.instance}-id"
             - name: AUTH_VYNIL_CLIENT_SECRET
               valueFrom:
                 secretKeyRef:
                   key: "client-secret"
-                  name: "directus-${var.instance}-secret"
+                  name: "directus-${replace(var.sub-domain, ".", "-")}-${var.instance}-secret"
             - name: DB_USER
               valueFrom:
                 secretKeyRef:
diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index dd19c25..6ff0b7b 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,25 +6,6 @@ metadata:
   name: dataset-pg
   description: null
 options:
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: alt-account
-          type: string
-      type: object
-    type: array
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   backups:
     default:
       enable: false
@@ -79,6 +60,16 @@ options:
         default: backup-settings
         type: string
     type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  storage:
+    default: 8Gi
+    examples:
+    - 8Gi
+    type: string
   extentions:
     default:
       directus:
@@ -269,26 +260,11 @@ options:
           type: string
       type: object
     type: array
-  storage:
-    default: 8Gi
-    examples:
-    - 8Gi
-    type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
   sub-domain:
     default: dataset-pg
     examples:
@@ -299,6 +275,30 @@ options:
     examples:
     - api
     type: string
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  roles:
+    default: []
+    items:
+      properties:
+        name:
+          default: alt-account
+          type: string
+      type: object
+    type: array
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
 dependencies:
 - dist: null
   category: dbo