diff --git a/apps/dbgate/application.tf b/apps/dbgate/application.tf
index 592ab1e..5fa3a59 100644
--- a/apps/dbgate/application.tf
+++ b/apps/dbgate/application.tf
@@ -12,6 +12,13 @@ module "ingress" {
   ingress-class     = var.ingress-class
   labels            = local.common-labels
   dns-names         = local.dns-names
+  middlewares       = ["${var.instance}-https"]
+  service           = {
+    "name"  = "${var.component}-${var.instance}"
+    "port" = {
+      "number" = 80
+    }
+  }
 }
 
 module "application" {
diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml
index 8bc2cfc..42d40d2 100644
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,7 +6,7 @@ metadata:
   name: dbgate
   description: null
 options:
-  maria:
+  pg:
     default: []
     examples:
     - []
@@ -35,21 +35,11 @@ options:
           type: string
       type: object
     type: array
-  sub-domain:
-    default: dbgate
-    examples:
-    - dbgate
-    type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
   images:
     default:
       dbgate:
@@ -89,22 +79,22 @@ options:
             type: string
         type: object
     type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  domain:
-    default: your-company
+  sub-domain:
+    default: dbgate
     examples:
-    - your-company
+    - dbgate
     type: string
-  use-oauth:
-    default: false
-    examples:
-    - false
-    type: boolean
-  pg:
+  maria:
     default: []
     examples:
     - []
@@ -162,6 +152,11 @@ options:
           type: string
       type: object
     type: array
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
   storage:
     default:
       accessMode: ReadWriteOnce
@@ -189,10 +184,15 @@ options:
         - Block
         type: string
     type: object
-  domain-name:
-    default: your_company.com
+  use-oauth:
+    default: false
     examples:
-    - your_company.com
+    - false
+    type: boolean
+  domain:
+    default: your-company
+    examples:
+    - your-company
     type: string
 dependencies:
 - dist: null
diff --git a/modules/ingress/variables.tf b/modules/ingress/variables.tf
index dad8803..6856732 100644
--- a/modules/ingress/variables.tf
+++ b/modules/ingress/variables.tf
@@ -22,14 +22,8 @@ variable "dns-names" {
 }
 variable "middlewares" {
   type        = list(string)
-  default     = ["${var.instance}-https"]
 }
 variable "service" {
-  default     = {
-      "name"  = "${var.component}-${var.instance}"
-      "port" = {
-        "number" = 80
-      }
-    }
+  type        = object
 }