diff --git a/apps/dbgate/application.tf b/apps/dbgate/application.tf
index 6c0ce06..eb685a1 100644
--- a/apps/dbgate/application.tf
+++ b/apps/dbgate/application.tf
@@ -84,8 +84,6 @@ module "forward" {
   service           = local.service
   icon              = local.icon
   request_headers   = local.request_headers
-  application-id    = module.application.application-id
-  policy-id         = module.application.policy-id
   providers = {
     restapi = restapi
     http = http
diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml
index fd05376..ceaccdb 100644
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,116 +6,26 @@ metadata:
   name: dbgate
   description: null
 options:
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 1Gi
-      type: Filesystem
+  ingress-class:
+    default: traefik
     examples:
-    - accessMode: ReadWriteOnce
-      size: 1Gi
-      type: Filesystem
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 1Gi
-        type: string
-      type:
-        default: Filesystem
-        enum:
-        - Filesystem
-        - Block
-        type: string
-    type: object
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
+    - traefik
     type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
-  pg:
-    default: []
+  app-group:
+    default: dev
     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
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
+    - dev
     type: string
-  sub-domain:
-    default: dbgate
+  use-oauth:
+    default: false
     examples:
-    - dbgate
-    type: string
-  maria:
-    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
+    - false
+    type: boolean
   images:
     default:
       dbgate:
@@ -155,6 +65,69 @@ options:
             type: string
         type: object
     type: object
+  pg:
+    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
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  maria:
+    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
   mongo:
     default: []
     examples:
@@ -184,11 +157,38 @@ options:
           type: string
       type: object
     type: array
-  use-oauth:
-    default: false
+  storage:
+    default:
+      accessMode: ReadWriteOnce
+      size: 1Gi
+      type: Filesystem
     examples:
-    - false
-    type: boolean
+    - accessMode: ReadWriteOnce
+      size: 1Gi
+      type: Filesystem
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 1Gi
+        type: string
+      type:
+        default: Filesystem
+        enum:
+        - Filesystem
+        - Block
+        type: string
+    type: object
+  sub-domain:
+    default: dbgate
+    examples:
+    - dbgate
+    type: string
   issuer:
     default: letsencrypt-prod
     examples: