diff --git a/meta/domain-ci/apps.tf b/meta/domain-ci/apps.tf
index 326145c..4ad5ec8 100644
--- a/meta/domain-ci/apps.tf
+++ b/meta/domain-ci/apps.tf
@@ -82,7 +82,7 @@ resource "kubectl_manifest" "gitea" {
       distrib: "${var.distributions.domain}"
       category: "apps"
       component: "gitea"
-      options: ${jsonencode(merge(local.global, local.gitea-storage, local.gitea))}
+      options: ${jsonencode(local.gitea)}
   EOF
 }
 
@@ -100,6 +100,6 @@ resource "kubectl_manifest" "woodpecker" {
       distrib: "${var.distributions.domain}"
       category: "apps"
       component: "woodpecker"
-      options: ${jsonencode(merge(local.global, local.woodpecker-storage, local.woodpecker))}
+      options: ${jsonencode(local.woodpecker)}
   EOF
 }
diff --git a/meta/domain-ci/index.yaml b/meta/domain-ci/index.yaml
index 805eb37..3fcfd42 100644
--- a/meta/domain-ci/index.yaml
+++ b/meta/domain-ci/index.yaml
@@ -6,28 +6,61 @@ metadata:
   name: domain-ci
   description: null
 options:
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  language:
+    default: fr_FR
+    examples:
+    - fr_FR
+    type: string
   timezone:
     default: Europe/Paris
     examples:
     - Europe/Paris
     type: string
-  woodpecker:
-    default:
-      enable: false
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - enable: false
+    - letsencrypt-prod
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  app_group:
+    default: infra
+    examples:
+    - infra
+    type: string
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
     properties:
-      enable:
-        default: false
-        type: boolean
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
     type: object
-    x-vynil-category: apps
-    x-vynil-package: woodpecker
   sso_vynil:
     default: true
     examples:
     - true
     type: boolean
+  domain_name:
+    default: your-company.com
+    examples:
+    - your-company.com
+    type: string
   backups:
     default:
       enable: false
@@ -68,48 +101,6 @@ options:
         default: false
         type: boolean
     type: object
-  gitea:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: gitea
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  language:
-    default: fr_FR
-    examples:
-    - fr_FR
-    type: string
-  domain_name:
-    default: your-company.com
-    examples:
-    - your-company.com
-    type: string
-  distributions:
-    default:
-      core: core
-      domain: domain
-    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
   storage:
     default:
       volume:
@@ -133,21 +124,30 @@ options:
             type: string
         type: object
     type: object
-  app_group:
-    default: infra
+  gitea:
+    default:
+      enable: true
     examples:
-    - infra
-    type: string
-  domain:
-    default: your-company
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: gitea
+  woodpecker:
+    default:
+      enable: false
     examples:
-    - your-company
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: woodpecker
 dependencies: []
 providers:
   kubernetes: true