diff --git a/apps/code-server/index.yaml b/apps/code-server/index.yaml
index 0c0f7f4..da70368 100644
--- a/apps/code-server/index.yaml
+++ b/apps/code-server/index.yaml
@@ -6,64 +6,15 @@ metadata:
   name: code-server
   description: null
 options:
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   timezone:
     default: Europe/Paris
     examples:
     - Europe/Paris
     type: string
-  images:
-    default:
-      codeserver:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: sebt3/code-server
-        tag: 4.18
+  sub_domain:
+    default: code
     examples:
-    - codeserver:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: sebt3/code-server
-        tag: 4.18
-    properties:
-      codeserver:
-        default:
-          pullPolicy: IfNotPresent
-          registry: docker.io
-          repository: sebt3/code-server
-          tag: 4.18
-        properties:
-          pullPolicy:
-            default: IfNotPresent
-            enum:
-            - Always
-            - Never
-            - IfNotPresent
-            type: string
-          registry:
-            default: docker.io
-            type: string
-          repository:
-            default: sebt3/code-server
-            type: string
-          tag:
-            default: 4.18
-            type: number
-        type: object
-    type: object
-  domain_name:
-    default: your-company.com
-    examples:
-    - your-company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
+    - code
     type: string
   storage:
     default:
@@ -108,16 +59,6 @@ options:
             type: string
         type: object
     type: object
-  sub_domain:
-    default: code
-    examples:
-    - code
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   no-editor:
     default: false
     examples:
@@ -143,6 +84,65 @@ options:
     examples:
     - dev
     type: string
+  images:
+    default:
+      codeserver:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: sebt3/code-server
+        tag: 4.18
+    examples:
+    - codeserver:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: sebt3/code-server
+        tag: 4.18
+    properties:
+      codeserver:
+        default:
+          pullPolicy: IfNotPresent
+          registry: docker.io
+          repository: sebt3/code-server
+          tag: 4.18
+        properties:
+          pullPolicy:
+            default: IfNotPresent
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+          registry:
+            default: docker.io
+            type: string
+          repository:
+            default: sebt3/code-server
+            type: string
+          tag:
+            default: 4.18
+            type: number
+        type: object
+    type: object
+  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
+  domain_name:
+    default: your-company.com
+    examples:
+    - your-company.com
+    type: string
 dependencies:
 - dist: null
   category: share
@@ -155,6 +155,7 @@ providers:
   authentik: true
   kubectl: true
   postgresql: null
+  mysql: null
   restapi: true
   http: true
   gitea: null
diff --git a/apps/code-server/presentation.tf b/apps/code-server/presentation.tf
index e759401..82ea534 100644
--- a/apps/code-server/presentation.tf
+++ b/apps/code-server/presentation.tf
@@ -7,12 +7,6 @@ locals {
     "Content-Type"  = "application/json"
     Authorization   = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}"
   }
-  service           = {
-    "name"  = "${var.instance}${var.component==""?"":"-"}${var.component}"
-    "port" = {
-      "number" = 80
-    }
-  }
 }
 
 module "service" {
@@ -22,7 +16,6 @@ module "service" {
   namespace         = var.namespace
   labels            = local.common-labels
   targets           = ["http"]
-  ports             = [local.service.port.number]
   providers = {
     kubectl = kubectl
   }
@@ -38,7 +31,7 @@ module "ingress" {
   labels            = local.common-labels
   dns_names         = local.dns_names
   middlewares       = [module.forward.middleware]
-  services          = [local.service]
+  services          = [module.service.default_definition]
   providers = {
     kubectl = kubectl
   }
@@ -76,7 +69,7 @@ module "forward" {
   ingress_class     = var.ingress_class
   labels            = local.common-labels
   dns_names         = local.dns_names
-  service           = local.service
+  service           = module.service.default_definition
   icon              = local.icon
   request_headers   = local.request_headers
   providers = {
diff --git a/apps/gramo/index.yaml b/apps/gramo/index.yaml
index aaf938b..7bfe922 100644
--- a/apps/gramo/index.yaml
+++ b/apps/gramo/index.yaml
@@ -6,6 +6,51 @@ metadata:
   name: gramo
   description: null
 options:
+  managed:
+    default: false
+    examples:
+    - false
+    type: boolean
+  namespaces:
+    default: []
+    items:
+      type: string
+    type: array
+  app_group:
+    default: infra
+    examples:
+    - infra
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  sub_domain:
+    default: gramo
+    examples:
+    - gramo
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  cluster-admin:
+    default: false
+    examples:
+    - false
+    type: boolean
   images:
     default:
       gramo:
@@ -45,51 +90,6 @@ options:
             type: string
         type: object
     type: object
-  cluster-admin:
-    default: false
-    examples:
-    - false
-    type: boolean
-  app_group:
-    default: infra
-    examples:
-    - infra
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  sub_domain:
-    default: gramo
-    examples:
-    - gramo
-    type: string
-  namespaces:
-    default: []
-    items:
-      type: string
-    type: array
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  managed:
-    default: false
-    examples:
-    - false
-    type: boolean
 dependencies:
 - dist: null
   category: share
@@ -102,6 +102,7 @@ providers:
   authentik: true
   kubectl: true
   postgresql: null
+  mysql: null
   restapi: true
   http: true
   gitea: null
diff --git a/apps/gramo/presentation.tf b/apps/gramo/presentation.tf
index 49ce9e8..80b23ef 100644
--- a/apps/gramo/presentation.tf
+++ b/apps/gramo/presentation.tf
@@ -7,12 +7,6 @@ locals {
     "Content-Type"  = "application/json"
     Authorization   = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}"
   }
-  service           = {
-    "name"  = "${var.instance}-${var.component}"
-    "port" = {
-      "number" = 80
-    }
-  }
 }
 
 module "service" {
@@ -22,7 +16,6 @@ module "service" {
   namespace         = var.namespace
   labels            = local.common-labels
   targets           = ["http"]
-  ports             = [local.service.port.number]
   providers = {
     kubectl = kubectl
   }
@@ -38,7 +31,7 @@ module "ingress" {
   labels            = local.common-labels
   dns_names         = local.dns_names
   middlewares       = [module.forward.middleware]
-  services          = [local.service]
+  services          = [module.service.default_definition]
   providers = {
     kubectl = kubectl
   }
@@ -76,7 +69,7 @@ module "forward" {
   ingress_class     = var.ingress_class
   labels            = local.common-labels
   dns_names         = local.dns_names
-  service           = local.service
+  service           = module.service.default_definition
   icon              = local.icon
   request_headers   = local.request_headers
   providers = {
diff --git a/apps/okd/index.yaml b/apps/okd/index.yaml
index fffde77..6c76ccd 100644
--- a/apps/okd/index.yaml
+++ b/apps/okd/index.yaml
@@ -6,41 +6,6 @@ metadata:
   name: okd
   description: null
 options:
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  app_group:
-    default: infra
-    examples:
-    - infra
-    type: string
-  sub_domain:
-    default: okd
-    examples:
-    - okd
-    type: string
-  cluster-admin:
-    default: false
-    examples:
-    - false
-    type: boolean
-  namespaces:
-    default: []
-    items:
-      type: string
-    type: array
   images:
     default:
       okd:
@@ -80,16 +45,51 @@ options:
             type: string
         type: object
     type: object
+  cluster-admin:
+    default: false
+    examples:
+    - false
+    type: boolean
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   ingress_class:
     default: traefik
     examples:
     - traefik
     type: string
+  app_group:
+    default: infra
+    examples:
+    - infra
+    type: string
+  sub_domain:
+    default: okd
+    examples:
+    - okd
+    type: string
   managed:
     default: false
     examples:
     - false
     type: boolean
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  namespaces:
+    default: []
+    items:
+      type: string
+    type: array
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
 dependencies:
 - dist: null
   category: share
@@ -102,6 +102,7 @@ providers:
   authentik: true
   kubectl: true
   postgresql: null
+  mysql: null
   restapi: true
   http: true
   gitea: null
diff --git a/apps/okd/presentation.tf b/apps/okd/presentation.tf
index d736826..769e0e0 100644
--- a/apps/okd/presentation.tf
+++ b/apps/okd/presentation.tf
@@ -7,12 +7,6 @@ locals {
     "Content-Type"  = "application/json"
     Authorization   = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}"
   }
-  service           = {
-    "name"  = "${var.instance}${var.component==""?"":"-"}${var.component}"
-    "port" = {
-      "number" = 80
-    }
-  }
 }
 
 module "service" {
@@ -22,7 +16,6 @@ module "service" {
   namespace         = var.namespace
   labels            = local.common-labels
   targets           = ["http"]
-  ports             = [local.service.port.number]
   providers = {
     kubectl = kubectl
   }
@@ -38,7 +31,7 @@ module "ingress" {
   labels            = local.common-labels
   dns_names         = local.dns_names
   middlewares       = [module.forward.middleware]
-  services          = [local.service]
+  services          = [module.service.default_definition]
   providers = {
     kubectl = kubectl
   }
@@ -76,7 +69,7 @@ module "forward" {
   ingress_class     = var.ingress_class
   labels            = local.common-labels
   dns_names         = local.dns_names
-  service           = local.service
+  service           = module.service.default_definition
   icon              = local.icon
   request_headers   = local.request_headers
   providers = {