diff --git a/apps/traefik-ui/index.yaml b/apps/traefik-ui/index.yaml
index f78cb8b..8eacdc0 100644
--- a/apps/traefik-ui/index.yaml
+++ b/apps/traefik-ui/index.yaml
@@ -6,36 +6,36 @@ metadata:
   name: traefik-ui
   description: Access to the Traefik UI
 options:
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  app_group:
-    default: infra
-    examples:
-    - infra
-    type: string
   sub-domain:
     default: traefik
     examples:
     - traefik
     type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
+  app_group:
+    default: infra
+    examples:
+    - infra
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
 dependencies:
 - dist: null
   category: share
diff --git a/apps/traefik-ui/presentation.tf b/apps/traefik-ui/presentation.tf
index 00248cf..68eda6f 100644
--- a/apps/traefik-ui/presentation.tf
+++ b/apps/traefik-ui/presentation.tf
@@ -24,7 +24,7 @@ module "ingress" {
   ingress_class     = var.ingress_class
   labels            = local.common-labels
   dns_names         = local.dns_names
-  middlewares       = ["forward-${local.app_name}"]
+  middlewares       = [module.forward.middleware]
   services          = [local.service]
   providers = {
     kubectl = kubectl
diff --git a/monitor/alertmanager/presentation.tf b/monitor/alertmanager/presentation.tf
index 77c4f7d..6d0b1b9 100644
--- a/monitor/alertmanager/presentation.tf
+++ b/monitor/alertmanager/presentation.tf
@@ -24,7 +24,7 @@ module "ingress" {
   ingress_class     = var.ingress_class
   labels            = local.common-labels
   dns_names         = local.dns_names
-  middlewares       = ["forward-${local.app_name}"]
+  middlewares       = [module.forward.middleware]
   services          = [local.service]
   providers = {
     kubectl = kubectl
diff --git a/monitor/prometheus/presentation.tf b/monitor/prometheus/presentation.tf
index 60c0e6c..54a92a1 100644
--- a/monitor/prometheus/presentation.tf
+++ b/monitor/prometheus/presentation.tf
@@ -24,7 +24,7 @@ module "ingress" {
   ingress_class     = var.ingress_class
   labels            = local.common-labels
   dns_names         = local.dns_names
-  middlewares       = ["forward-${local.app_name}"]
+  middlewares       = [module.forward.middleware]
   services          = [local.service]
   providers = {
     kubectl = kubectl