diff --git a/share/dataset-pg/directus.tf b/share/dataset-pg/directus.tf
index 2e7c84c..182cbe4 100644
--- a/share/dataset-pg/directus.tf
+++ b/share/dataset-pg/directus.tf
@@ -47,7 +47,7 @@ resource "kubectl_manifest" "directus_config" {
       TELEMETRY: "false"
       AUTH_PROVIDERS: "vynil"
       AUTH_VYNIL_DRIVER: "oauth2"
-      AUTH_VYNIL_ISSUER_URL: "https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/o/${replace(var.sub-domain, ".", "-")}-${var.instance}/.well-known/openid-configuration"
+      AUTH_VYNIL_ISSUER_URL: "https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/o/directus-${replace(var.sub-domain, ".", "-")}-${var.instance}/.well-known/openid-configuration"
       AUTH_VYNIL_IDENTIFIER_KEY: "nickname"
       PUBLIC_URL: "https://${local.directus-dns-name}"
   EOF
@@ -219,7 +219,7 @@ module "directus-ingress" {
 module "directus-application" {
   count = var.extentions.directus.enable ? 1 : 0
   source = "/dist/modules/application"
-  component         = replace(var.sub-domain, ".", "-")
+  component         = "directus-${replace(var.sub-domain, ".", "-")}"
   instance          = var.instance
   app-group         = var.app-group
   dns-name          = local.directus-dns-name
@@ -233,7 +233,7 @@ module "directus-application" {
 module "directus-oauth2" {
   count = var.extentions.directus.enable ? 1 : 0
   source = "/dist/modules/oauth2"
-  component         = replace(var.sub-domain, ".", "-")
+  component         = "directus-${replace(var.sub-domain, ".", "-")}"
   instance          = var.instance
   namespace         = var.namespace
   labels            = local.directus-labels
diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index 827cbe7..dd19c25 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,6 +6,79 @@ 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
+      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:
@@ -187,94 +260,6 @@ options:
             type: object
         type: object
     type: object
-  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
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: alt-account
-          type: string
-      type: object
-    type: array
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  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
-  app-group:
-    default: api
-    examples:
-    - api
-    type: string
   databases:
     default: []
     items:
@@ -284,20 +269,35 @@ 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
-  domain-name:
-    default: your_company.com
+  sub-domain:
+    default: dataset-pg
     examples:
-    - your_company.com
+    - dataset-pg
+    type: string
+  app-group:
+    default: api
+    examples:
+    - api
     type: string
 dependencies:
 - dist: null