diff --git a/apps/dolibarr/index.yaml b/apps/dolibarr/index.yaml
index 9de09b8..adb62d5 100644
--- a/apps/dolibarr/index.yaml
+++ b/apps/dolibarr/index.yaml
@@ -6,6 +6,11 @@ metadata:
   name: dolibarr
   description: Open Source ERP & CRM for business
 options:
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   backups:
     default:
       enable: false
@@ -112,51 +117,16 @@ options:
         default: false
         type: boolean
     type: object
-  hpa:
+  postgres:
     default:
-      avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
+      replicas: 1
     examples:
-    - avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
+    - replicas: 1
     properties:
-      avg-cpu:
-        default: 50
-        type: integer
-      max-replicas:
-        default: 5
-        type: integer
-      min-replicas:
+      replicas:
         default: 1
         type: integer
     type: object
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  user-groups:
-    default:
-    - admin: true
-      name: dolibarr-admin
-    examples:
-    - - admin: true
-        name: dolibarr-admin
-    items:
-      properties:
-        admin:
-          type: boolean
-        name:
-          type: string
-      type: object
-    type: array
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
   redis:
     default:
       exporter:
@@ -174,46 +144,6 @@ options:
             type: boolean
         type: object
     type: object
-  log-level:
-    default: 5
-    examples:
-    - 5
-    type: integer
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  app_group:
-    default: ''
-    examples:
-    - ''
-    type: string
-  sub_domain:
-    default: erp
-    examples:
-    - erp
-    type: string
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
-  parameters:
-    default:
-      MAIN_LANG_DEFAULT: auto
-    examples:
-    - MAIN_LANG_DEFAULT: auto
-    properties:
-      MAIN_LANG_DEFAULT:
-        default: auto
-        type: string
-    type: object
   images:
     default:
       dolibarr:
@@ -363,19 +293,21 @@ options:
             type: string
         type: object
     type: object
-  domain_name:
-    default: your_company.com
+  app_group:
+    default: ''
     examples:
-    - your_company.com
+    - ''
     type: string
-  modules:
-    default:
-    - societe
+  ingress_class:
+    default: traefik
     examples:
-    - - societe
-    items:
-      type: string
-    type: array
+    - traefik
+    type: string
+  log-level:
+    default: 5
+    examples:
+    - 5
+    type: integer
   storage:
     default:
       postgres:
@@ -443,6 +375,31 @@ options:
             type: string
         type: object
     type: object
+  hpa:
+    default:
+      avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    examples:
+    - avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    properties:
+      avg-cpu:
+        default: 50
+        type: integer
+      max-replicas:
+        default: 5
+        type: integer
+      min-replicas:
+        default: 1
+        type: integer
+    type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   resources:
     default:
       limits:
@@ -484,6 +441,49 @@ options:
             type: string
         type: object
     type: object
+  user-groups:
+    default:
+    - admin: true
+      name: dolibarr-admin
+    examples:
+    - - admin: true
+        name: dolibarr-admin
+    items:
+      properties:
+        admin:
+          type: boolean
+        name:
+          type: string
+      type: object
+    type: array
+  sub_domain:
+    default: erp
+    examples:
+    - erp
+    type: string
+  modules:
+    default:
+    - societe
+    examples:
+    - - societe
+    items:
+      type: string
+    type: array
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  parameters:
+    default:
+      MAIN_LANG_DEFAULT: auto
+    examples:
+    - MAIN_LANG_DEFAULT: auto
+    properties:
+      MAIN_LANG_DEFAULT:
+        default: auto
+        type: string
+    type: object
 dependencies:
 - dist: null
   category: share
diff --git a/apps/dolibarr/redis.tf b/apps/dolibarr/redis.tf
index 7afc6b3..22a400e 100644
--- a/apps/dolibarr/redis.tf
+++ b/apps/dolibarr/redis.tf
@@ -5,7 +5,7 @@ locals {
 }
 resource "kubectl_manifest" "dolibarr_redis" {
   yaml_body  = <<-EOF
-    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta1"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}-redis"
diff --git a/apps/gitea/index.yaml b/apps/gitea/index.yaml
index 3ea7cfc..d86371a 100644
--- a/apps/gitea/index.yaml
+++ b/apps/gitea/index.yaml
@@ -9,67 +9,40 @@ metadata:
     A painless self-hosted Git service.
     Gitea is a community managed lightweight code hosting solution written in Go. It is published under the MIT license.
 options:
-  redis:
-    default:
-      exporter:
-        enabled: true
+  ssh-port:
+    default: 2222
     examples:
-    - exporter:
-        enabled: true
-    properties:
-      exporter:
-        default:
-          enabled: true
-        properties:
-          enabled:
-            default: true
-            type: boolean
-        type: object
-    type: object
+    - 2222
+    type: integer
   release:
     default: 8.3.0
     examples:
     - 8.3.0
     type: string
-  load-balancer:
-    default:
-      ip: ''
+  domain_name:
+    default: your_company.com
     examples:
-    - ip: ''
-    properties:
-      ip:
-        default: ''
-        type: string
-    type: object
-  ssh-sub_domain:
-    default: git
-    examples:
-    - git
+    - your_company.com
     type: string
-  admin:
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  postgres:
     default:
-      email: git-admin@git.your_company.com
-      name: gitea_admin
+      replicas: 1
     examples:
-    - email: git-admin@git.your_company.com
-      name: gitea_admin
+    - replicas: 1
     properties:
-      email:
-        default: git-admin@git.your_company.com
-        type: string
-      name:
-        default: gitea_admin
-        type: string
+      replicas:
+        default: 1
+        type: integer
     type: object
-  ingress_class:
-    default: traefik
+  domain:
+    default: your-company
     examples:
-    - traefik
-    type: string
-  timezone:
-    default: Europe/Paris
-    examples:
-    - Europe/Paris
+    - your-company
     type: string
   webhook:
     default:
@@ -91,16 +64,219 @@ options:
         default: false
         type: boolean
     type: object
-  domain:
-    default: your-company
+  load-balancer:
+    default:
+      ip: ''
     examples:
-    - your-company
+    - ip: ''
+    properties:
+      ip:
+        default: ''
+        type: string
+    type: object
+  timezone:
+    default: Europe/Paris
+    examples:
+    - Europe/Paris
     type: string
-  ssh-port:
-    default: 2222
+  default-branch:
+    default: main
     examples:
-    - 2222
-    type: integer
+    - main
+    type: string
+  app_group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  sub_domain:
+    default: git
+    examples:
+    - git
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      restic_key: bck-password
+      retention:
+        db: 30d
+        keepDaily: 14
+        keepMonthly: 12
+        keepWeekly: 6
+        keepYearly: 12
+      schedule:
+        backup: 10 3 * * *
+        check: 10 5 * * 1
+        db: 10 3 * * *
+        prune: 10 1 * * 0
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use_barman: false
+    examples:
+    - enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      restic_key: bck-password
+      retention:
+        db: 30d
+        keepDaily: 14
+        keepMonthly: 12
+        keepWeekly: 6
+        keepYearly: 12
+      schedule:
+        backup: 10 3 * * *
+        check: 10 5 * * 1
+        db: 10 3 * * *
+        prune: 10 1 * * 0
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use_barman: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key_id_key:
+        default: s3-id
+        type: string
+      restic_key:
+        default: bck-password
+        type: string
+      retention:
+        default:
+          db: 30d
+          keepDaily: 14
+          keepMonthly: 12
+          keepWeekly: 6
+          keepYearly: 12
+        properties:
+          db:
+            default: 30d
+            type: string
+          keepDaily:
+            default: 14
+            type: integer
+          keepMonthly:
+            default: 12
+            type: integer
+          keepWeekly:
+            default: 6
+            type: integer
+          keepYearly:
+            default: 12
+            type: integer
+        type: object
+      schedule:
+        default:
+          backup: 10 3 * * *
+          check: 10 5 * * 1
+          db: 10 3 * * *
+          prune: 10 1 * * 0
+        properties:
+          backup:
+            default: 10 3 * * *
+            type: string
+          check:
+            default: 10 5 * * 1
+            type: string
+          db:
+            default: 10 3 * * *
+            type: string
+          prune:
+            default: 10 1 * * 0
+            type: string
+        type: object
+      secret_key:
+        default: s3-secret
+        type: string
+      secret_name:
+        default: backup-settings
+        type: string
+      use_barman:
+        default: false
+        type: boolean
+    type: object
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  disable-registration:
+    default: true
+    examples:
+    - true
+    type: boolean
+  push-create:
+    default:
+      org: 'true'
+      private: 'false'
+      user: 'true'
+    examples:
+    - org: 'true'
+      private: 'false'
+      user: 'true'
+    properties:
+      org:
+        default: 'true'
+        type: string
+      private:
+        default: 'false'
+        type: string
+      user:
+        default: 'true'
+        type: string
+    type: object
+  theme:
+    default: gitea-modern
+    examples:
+    - gitea-modern
+    type: string
+  admin:
+    default:
+      email: git-admin@git.your_company.com
+      name: gitea_admin
+    examples:
+    - email: git-admin@git.your_company.com
+      name: gitea_admin
+    properties:
+      email:
+        default: git-admin@git.your_company.com
+        type: string
+      name:
+        default: gitea_admin
+        type: string
+    type: object
+  redis:
+    default:
+      exporter:
+        enabled: true
+    examples:
+    - exporter:
+        enabled: true
+    properties:
+      exporter:
+        default:
+          enabled: true
+        properties:
+          enabled:
+            default: true
+            type: boolean
+        type: object
+    type: object
+  ssh-sub_domain:
+    default: git
+    examples:
+    - git
+    type: string
   storage:
     default:
       postgres:
@@ -299,182 +475,6 @@ options:
             type: string
         type: object
     type: object
-  sub_domain:
-    default: git
-    examples:
-    - git
-    type: string
-  default-branch:
-    default: main
-    examples:
-    - main
-    type: string
-  push-create:
-    default:
-      org: 'true'
-      private: 'false'
-      user: 'true'
-    examples:
-    - org: 'true'
-      private: 'false'
-      user: 'true'
-    properties:
-      org:
-        default: 'true'
-        type: string
-      private:
-        default: 'false'
-        type: string
-      user:
-        default: 'true'
-        type: string
-    type: object
-  theme:
-    default: gitea-modern
-    examples:
-    - gitea-modern
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  disable-registration:
-    default: true
-    examples:
-    - true
-    type: boolean
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key_id_key: s3-id
-      restic_key: bck-password
-      retention:
-        db: 30d
-        keepDaily: 14
-        keepMonthly: 12
-        keepWeekly: 6
-        keepYearly: 12
-      schedule:
-        backup: 10 3 * * *
-        check: 10 5 * * 1
-        db: 10 3 * * *
-        prune: 10 1 * * 0
-      secret_key: s3-secret
-      secret_name: backup-settings
-      use_barman: false
-    examples:
-    - enable: false
-      endpoint: ''
-      key_id_key: s3-id
-      restic_key: bck-password
-      retention:
-        db: 30d
-        keepDaily: 14
-        keepMonthly: 12
-        keepWeekly: 6
-        keepYearly: 12
-      schedule:
-        backup: 10 3 * * *
-        check: 10 5 * * 1
-        db: 10 3 * * *
-        prune: 10 1 * * 0
-      secret_key: s3-secret
-      secret_name: backup-settings
-      use_barman: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key_id_key:
-        default: s3-id
-        type: string
-      restic_key:
-        default: bck-password
-        type: string
-      retention:
-        default:
-          db: 30d
-          keepDaily: 14
-          keepMonthly: 12
-          keepWeekly: 6
-          keepYearly: 12
-        properties:
-          db:
-            default: 30d
-            type: string
-          keepDaily:
-            default: 14
-            type: integer
-          keepMonthly:
-            default: 12
-            type: integer
-          keepWeekly:
-            default: 6
-            type: integer
-          keepYearly:
-            default: 12
-            type: integer
-        type: object
-      schedule:
-        default:
-          backup: 10 3 * * *
-          check: 10 5 * * 1
-          db: 10 3 * * *
-          prune: 10 1 * * 0
-        properties:
-          backup:
-            default: 10 3 * * *
-            type: string
-          check:
-            default: 10 5 * * 1
-            type: string
-          db:
-            default: 10 3 * * *
-            type: string
-          prune:
-            default: 10 1 * * 0
-            type: string
-        type: object
-      secret_key:
-        default: s3-secret
-        type: string
-      secret_name:
-        default: backup-settings
-        type: string
-      use_barman:
-        default: false
-        type: boolean
-    type: object
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
-  app_group:
-    default: dev
-    examples:
-    - dev
-    type: string
 dependencies:
 - dist: null
   category: share
diff --git a/apps/gitea/redis.tf b/apps/gitea/redis.tf
index be17f0c..6316802 100644
--- a/apps/gitea/redis.tf
+++ b/apps/gitea/redis.tf
@@ -5,7 +5,7 @@ locals {
 }
 resource "kubectl_manifest" "prj_redis" {
   yaml_body  = <<-EOF
-    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta1"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}-redis"
diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml
index 25acc0b..10eb4a3 100644
--- a/apps/nextcloud/index.yaml
+++ b/apps/nextcloud/index.yaml
@@ -6,26 +6,294 @@ metadata:
   name: nextcloud
   description: null
 options:
+  hpa:
+    default:
+      avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    examples:
+    - avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    properties:
+      avg-cpu:
+        default: 50
+        type: integer
+      max-replicas:
+        default: 5
+        type: integer
+      min-replicas:
+        default: 1
+        type: integer
+    type: object
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  admin:
+    default:
+      name: nextcloud_admin
+    examples:
+    - name: nextcloud_admin
+    properties:
+      name:
+        default: nextcloud_admin
+        type: string
+    type: object
+  apps:
+    default:
+      audioplayer: false
+      bookmarks: false
+      bpm: false
+      calendar: false
+      collabora: false
+      contacts: false
+      deck: false
+      groupfolders: true
+      mindmap: false
+      music: false
+      notes: false
+      onlyoffice: false
+      passman: false
+      spreed: false
+      tables: false
+      tasks: false
+      texteditor: true
+    examples:
+    - audioplayer: false
+      bookmarks: false
+      bpm: false
+      calendar: false
+      collabora: false
+      contacts: false
+      deck: false
+      groupfolders: true
+      mindmap: false
+      music: false
+      notes: false
+      onlyoffice: false
+      passman: false
+      spreed: false
+      tables: false
+      tasks: false
+      texteditor: true
+    properties:
+      audioplayer:
+        default: false
+        type: boolean
+      bookmarks:
+        default: false
+        type: boolean
+      bpm:
+        default: false
+        type: boolean
+      calendar:
+        default: false
+        type: boolean
+      collabora:
+        default: false
+        type: boolean
+      contacts:
+        default: false
+        type: boolean
+      deck:
+        default: false
+        type: boolean
+      groupfolders:
+        default: true
+        type: boolean
+      mindmap:
+        default: false
+        type: boolean
+      music:
+        default: false
+        type: boolean
+      notes:
+        default: false
+        type: boolean
+      onlyoffice:
+        default: false
+        type: boolean
+      passman:
+        default: false
+        type: boolean
+      spreed:
+        default: false
+        type: boolean
+      tables:
+        default: false
+        type: boolean
+      tasks:
+        default: false
+        type: boolean
+      texteditor:
+        default: true
+        type: boolean
+    type: object
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
-  ingress_class:
-    default: traefik
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      restic_key: bck-password
+      retention:
+        db: 30d
+        keepDaily: 14
+        keepMonthly: 12
+        keepWeekly: 6
+        keepYearly: 12
+      schedule:
+        backup: 30 3 * * *
+        check: 30 5 * * 1
+        db: 30 3 * * *
+        prune: 30 1 * * 0
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use_barman: false
     examples:
-    - traefik
-    type: string
+    - enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      restic_key: bck-password
+      retention:
+        db: 30d
+        keepDaily: 14
+        keepMonthly: 12
+        keepWeekly: 6
+        keepYearly: 12
+      schedule:
+        backup: 30 3 * * *
+        check: 30 5 * * 1
+        db: 30 3 * * *
+        prune: 30 1 * * 0
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use_barman: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key_id_key:
+        default: s3-id
+        type: string
+      restic_key:
+        default: bck-password
+        type: string
+      retention:
+        default:
+          db: 30d
+          keepDaily: 14
+          keepMonthly: 12
+          keepWeekly: 6
+          keepYearly: 12
+        properties:
+          db:
+            default: 30d
+            type: string
+          keepDaily:
+            default: 14
+            type: integer
+          keepMonthly:
+            default: 12
+            type: integer
+          keepWeekly:
+            default: 6
+            type: integer
+          keepYearly:
+            default: 12
+            type: integer
+        type: object
+      schedule:
+        default:
+          backup: 30 3 * * *
+          check: 30 5 * * 1
+          db: 30 3 * * *
+          prune: 30 1 * * 0
+        properties:
+          backup:
+            default: 30 3 * * *
+            type: string
+          check:
+            default: 30 5 * * 1
+            type: string
+          db:
+            default: 30 3 * * *
+            type: string
+          prune:
+            default: 30 1 * * 0
+            type: string
+        type: object
+      secret_key:
+        default: s3-secret
+        type: string
+      secret_name:
+        default: backup-settings
+        type: string
+      use_barman:
+        default: false
+        type: boolean
+    type: object
   openid-name:
     default: vynil
     examples:
     - vynil
     type: string
+  sub_domain:
+    default: files
+    examples:
+    - files
+    type: string
   app_group:
     default: ''
     examples:
     - ''
     type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  redis:
+    default:
+      exporter:
+        enabled: true
+    examples:
+    - exporter:
+        enabled: true
+    properties:
+      exporter:
+        default:
+          enabled: true
+        properties:
+          enabled:
+            default: true
+            type: boolean
+        type: object
+    type: object
   images:
     default:
       collabora:
@@ -281,106 +549,6 @@ options:
             type: string
         type: object
     type: object
-  apps:
-    default:
-      audioplayer: false
-      bookmarks: false
-      bpm: false
-      calendar: false
-      collabora: false
-      contacts: false
-      deck: false
-      groupfolders: true
-      mindmap: false
-      music: false
-      notes: false
-      onlyoffice: false
-      passman: false
-      spreed: false
-      tables: false
-      tasks: false
-      texteditor: true
-    examples:
-    - audioplayer: false
-      bookmarks: false
-      bpm: false
-      calendar: false
-      collabora: false
-      contacts: false
-      deck: false
-      groupfolders: true
-      mindmap: false
-      music: false
-      notes: false
-      onlyoffice: false
-      passman: false
-      spreed: false
-      tables: false
-      tasks: false
-      texteditor: true
-    properties:
-      audioplayer:
-        default: false
-        type: boolean
-      bookmarks:
-        default: false
-        type: boolean
-      bpm:
-        default: false
-        type: boolean
-      calendar:
-        default: false
-        type: boolean
-      collabora:
-        default: false
-        type: boolean
-      contacts:
-        default: false
-        type: boolean
-      deck:
-        default: false
-        type: boolean
-      groupfolders:
-        default: true
-        type: boolean
-      mindmap:
-        default: false
-        type: boolean
-      music:
-        default: false
-        type: boolean
-      notes:
-        default: false
-        type: boolean
-      onlyoffice:
-        default: false
-        type: boolean
-      passman:
-        default: false
-        type: boolean
-      spreed:
-        default: false
-        type: boolean
-      tables:
-        default: false
-        type: boolean
-      tasks:
-        default: false
-        type: boolean
-      texteditor:
-        default: true
-        type: boolean
-    type: object
-  admin:
-    default:
-      name: nextcloud_admin
-    examples:
-    - name: nextcloud_admin
-    properties:
-      name:
-        default: nextcloud_admin
-        type: string
-    type: object
   storage:
     default:
       postgres:
@@ -445,174 +613,6 @@ options:
             type: string
         type: object
     type: object
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key_id_key: s3-id
-      restic_key: bck-password
-      retention:
-        db: 30d
-        keepDaily: 14
-        keepMonthly: 12
-        keepWeekly: 6
-        keepYearly: 12
-      schedule:
-        backup: 30 3 * * *
-        check: 30 5 * * 1
-        db: 30 3 * * *
-        prune: 30 1 * * 0
-      secret_key: s3-secret
-      secret_name: backup-settings
-      use_barman: false
-    examples:
-    - enable: false
-      endpoint: ''
-      key_id_key: s3-id
-      restic_key: bck-password
-      retention:
-        db: 30d
-        keepDaily: 14
-        keepMonthly: 12
-        keepWeekly: 6
-        keepYearly: 12
-      schedule:
-        backup: 30 3 * * *
-        check: 30 5 * * 1
-        db: 30 3 * * *
-        prune: 30 1 * * 0
-      secret_key: s3-secret
-      secret_name: backup-settings
-      use_barman: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key_id_key:
-        default: s3-id
-        type: string
-      restic_key:
-        default: bck-password
-        type: string
-      retention:
-        default:
-          db: 30d
-          keepDaily: 14
-          keepMonthly: 12
-          keepWeekly: 6
-          keepYearly: 12
-        properties:
-          db:
-            default: 30d
-            type: string
-          keepDaily:
-            default: 14
-            type: integer
-          keepMonthly:
-            default: 12
-            type: integer
-          keepWeekly:
-            default: 6
-            type: integer
-          keepYearly:
-            default: 12
-            type: integer
-        type: object
-      schedule:
-        default:
-          backup: 30 3 * * *
-          check: 30 5 * * 1
-          db: 30 3 * * *
-          prune: 30 1 * * 0
-        properties:
-          backup:
-            default: 30 3 * * *
-            type: string
-          check:
-            default: 30 5 * * 1
-            type: string
-          db:
-            default: 30 3 * * *
-            type: string
-          prune:
-            default: 30 1 * * 0
-            type: string
-        type: object
-      secret_key:
-        default: s3-secret
-        type: string
-      secret_name:
-        default: backup-settings
-        type: string
-      use_barman:
-        default: false
-        type: boolean
-    type: object
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  redis:
-    default:
-      exporter:
-        enabled: true
-    examples:
-    - exporter:
-        enabled: true
-    properties:
-      exporter:
-        default:
-          enabled: true
-        properties:
-          enabled:
-            default: true
-            type: boolean
-        type: object
-    type: object
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
-  sub_domain:
-    default: files
-    examples:
-    - files
-    type: string
-  hpa:
-    default:
-      avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    examples:
-    - avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    properties:
-      avg-cpu:
-        default: 50
-        type: integer
-      max-replicas:
-        default: 5
-        type: integer
-      min-replicas:
-        default: 1
-        type: integer
-    type: object
 dependencies:
 - dist: null
   category: share
diff --git a/apps/nextcloud/redis.tf b/apps/nextcloud/redis.tf
index be17f0c..6316802 100644
--- a/apps/nextcloud/redis.tf
+++ b/apps/nextcloud/redis.tf
@@ -5,7 +5,7 @@ locals {
 }
 resource "kubectl_manifest" "prj_redis" {
   yaml_body  = <<-EOF
-    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta1"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}-redis"
diff --git a/share/authentik/index.yaml b/share/authentik/index.yaml
index af97c3d..3721c39 100644
--- a/share/authentik/index.yaml
+++ b/share/authentik/index.yaml
@@ -6,28 +6,23 @@ metadata:
   name: authentik
   description: authentik is an open-source Identity Provider focused on flexibility and versatility
 options:
-  email:
+  error_reporting:
     default:
-      port: 587
-      timeout: 30
-      use_ssl: false
-      use_tls: false
+      enabled: false
+      environment: k8s
+      send_pii: false
     examples:
-    - port: 587
-      timeout: 30
-      use_ssl: false
-      use_tls: false
+    - enabled: false
+      environment: k8s
+      send_pii: false
     properties:
-      port:
-        default: 587
-        type: integer
-      timeout:
-        default: 30
-        type: integer
-      use_ssl:
+      enabled:
         default: false
         type: boolean
-      use_tls:
+      environment:
+        default: k8s
+        type: string
+      send_pii:
         default: false
         type: boolean
     type: object
@@ -36,85 +31,6 @@ options:
     examples:
     - auth
     type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  geoip:
-    default: /geoip/GeoLite2-City.mmdb
-    examples:
-    - /geoip/GeoLite2-City.mmdb
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key_id_key: s3-id
-      retention:
-        db: 30d
-      schedule:
-        db: 0 3 * * *
-      secret_key: s3-secret
-      secret_name: backup-settings
-      use_barman: false
-    examples:
-    - enable: false
-      endpoint: ''
-      key_id_key: s3-id
-      retention:
-        db: 30d
-      schedule:
-        db: 0 3 * * *
-      secret_key: s3-secret
-      secret_name: backup-settings
-      use_barman: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key_id_key:
-        default: s3-id
-        type: string
-      retention:
-        default:
-          db: 30d
-        properties:
-          db:
-            default: 30d
-            type: string
-        type: object
-      schedule:
-        default:
-          db: 0 3 * * *
-        properties:
-          db:
-            default: 0 3 * * *
-            type: string
-        type: object
-      secret_key:
-        default: s3-secret
-        type: string
-      secret_name:
-        default: backup-settings
-        type: string
-      use_barman:
-        default: false
-        type: boolean
-    type: object
   images:
     default:
       app:
@@ -252,6 +168,48 @@ options:
             type: string
         type: object
     type: object
+  email:
+    default:
+      port: 587
+      timeout: 30
+      use_ssl: false
+      use_tls: false
+    examples:
+    - port: 587
+      timeout: 30
+      use_ssl: false
+      use_tls: false
+    properties:
+      port:
+        default: 587
+        type: integer
+      timeout:
+        default: 30
+        type: integer
+      use_ssl:
+        default: false
+        type: boolean
+      use_tls:
+        default: false
+        type: boolean
+    type: object
+  redis:
+    default:
+      exporter:
+        enabled: true
+    examples:
+    - exporter:
+        enabled: true
+    properties:
+      exporter:
+        default:
+          enabled: true
+        properties:
+          enabled:
+            default: true
+            type: boolean
+        type: object
+    type: object
   storage:
     default:
       postgres:
@@ -281,63 +239,6 @@ options:
             type: string
         type: object
     type: object
-  error_reporting:
-    default:
-      enabled: false
-      environment: k8s
-      send_pii: false
-    examples:
-    - enabled: false
-      environment: k8s
-      send_pii: false
-    properties:
-      enabled:
-        default: false
-        type: boolean
-      environment:
-        default: k8s
-        type: string
-      send_pii:
-        default: false
-        type: boolean
-    type: object
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
-  loglevel:
-    default: info
-    examples:
-    - info
-    type: string
-  redis:
-    default:
-      exporter:
-        enabled: true
-    examples:
-    - exporter:
-        enabled: true
-    properties:
-      exporter:
-        default:
-          enabled: true
-        properties:
-          enabled:
-            default: true
-            type: boolean
-        type: object
-    type: object
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   admin:
     default:
       email: auth-admin
@@ -348,6 +249,105 @@ options:
         default: auth-admin
         type: string
     type: object
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      retention:
+        db: 30d
+      schedule:
+        db: 0 3 * * *
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use_barman: false
+    examples:
+    - enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      retention:
+        db: 30d
+      schedule:
+        db: 0 3 * * *
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use_barman: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key_id_key:
+        default: s3-id
+        type: string
+      retention:
+        default:
+          db: 30d
+        properties:
+          db:
+            default: 30d
+            type: string
+        type: object
+      schedule:
+        default:
+          db: 0 3 * * *
+        properties:
+          db:
+            default: 0 3 * * *
+            type: string
+        type: object
+      secret_key:
+        default: s3-secret
+        type: string
+      secret_name:
+        default: backup-settings
+        type: string
+      use_barman:
+        default: false
+        type: boolean
+    type: object
+  geoip:
+    default: /geoip/GeoLite2-City.mmdb
+    examples:
+    - /geoip/GeoLite2-City.mmdb
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  loglevel:
+    default: info
+    examples:
+    - info
+    type: string
 dependencies:
 - dist: null
   category: core
diff --git a/share/authentik/redis.tf b/share/authentik/redis.tf
index a4a778b..5f9e19a 100644
--- a/share/authentik/redis.tf
+++ b/share/authentik/redis.tf
@@ -1,6 +1,6 @@
 resource "kubectl_manifest" "authentik_redis" {
   yaml_body  = <<-EOF
-    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta1"
     kind: "Redis"
     metadata:
       name: "${var.name}-${var.component}-redis"
diff --git a/share/dataset-redis/index.yaml b/share/dataset-redis/index.yaml
index 2228558..d0d7e35 100644
--- a/share/dataset-redis/index.yaml
+++ b/share/dataset-redis/index.yaml
@@ -11,16 +11,6 @@ options:
     examples:
     - 8Gi
     type: string
-  exporter:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
   images:
     default:
       redis:
@@ -84,6 +74,16 @@ options:
             type: string
         type: object
     type: object
+  exporter:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/dataset-redis/redis.tf b/share/dataset-redis/redis.tf
index da2781a..68aa396 100644
--- a/share/dataset-redis/redis.tf
+++ b/share/dataset-redis/redis.tf
@@ -5,7 +5,7 @@ locals {
 }
 resource "kubectl_manifest" "prj_redis" {
   yaml_body  = <<-EOF
-    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta1"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}"
diff --git a/share/wildduck/index.yaml b/share/wildduck/index.yaml
index fc9d1a9..c942165 100644
--- a/share/wildduck/index.yaml
+++ b/share/wildduck/index.yaml
@@ -6,105 +6,6 @@ metadata:
   name: wildduck
   description: null
 options:
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  app_group:
-    default: ''
-    examples:
-    - ''
-    type: string
-  storage:
-    default:
-      redis:
-        size: 2Gi
-    examples:
-    - redis:
-        size: 2Gi
-    properties:
-      redis:
-        default:
-          size: 2Gi
-        properties:
-          size:
-            default: 2Gi
-            type: string
-        type: object
-    type: object
-  additional-domains:
-    default: []
-    items:
-      type: string
-    type: array
-  sub_domain:
-    default: mail
-    examples:
-    - mail
-    type: string
-  redis:
-    default:
-      exporter:
-        enabled: true
-    examples:
-    - exporter:
-        enabled: true
-    properties:
-      exporter:
-        default:
-          enabled: true
-        properties:
-          enabled:
-            default: true
-            type: boolean
-        type: object
-    type: object
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
-    examples:
-    - enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key-id-key:
-        default: s3-id
-        type: string
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
-        type: string
-    type: object
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   images:
     default:
       haraka:
@@ -382,6 +283,105 @@ options:
             type: string
         type: object
     type: object
+  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
+  app_group:
+    default: ''
+    examples:
+    - ''
+    type: string
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    examples:
+    - enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key-id-key:
+        default: s3-id
+        type: string
+      secret-key:
+        default: s3-secret
+        type: string
+      secret-name:
+        default: backup-settings
+        type: string
+    type: object
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  storage:
+    default:
+      redis:
+        size: 2Gi
+    examples:
+    - redis:
+        size: 2Gi
+    properties:
+      redis:
+        default:
+          size: 2Gi
+        properties:
+          size:
+            default: 2Gi
+            type: string
+        type: object
+    type: object
+  sub_domain:
+    default: mail
+    examples:
+    - mail
+    type: string
+  redis:
+    default:
+      exporter:
+        enabled: true
+    examples:
+    - exporter:
+        enabled: true
+    properties:
+      exporter:
+        default:
+          enabled: true
+        properties:
+          enabled:
+            default: true
+            type: boolean
+        type: object
+    type: object
+  additional-domains:
+    default: []
+    items:
+      type: string
+    type: array
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/wildduck/redis.tf b/share/wildduck/redis.tf
index be17f0c..6316802 100644
--- a/share/wildduck/redis.tf
+++ b/share/wildduck/redis.tf
@@ -5,7 +5,7 @@ locals {
 }
 resource "kubectl_manifest" "prj_redis" {
   yaml_body  = <<-EOF
-    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta1"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}-redis"