diff --git a/apps/dolibarr/redis.tf b/apps/dolibarr/redis.tf
index 22a400e..7afc6b3 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/v1beta1"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}-redis"
diff --git a/apps/gitea/redis.tf b/apps/gitea/redis.tf
index 6316802..be17f0c 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/v1beta1"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}-redis"
diff --git a/apps/nextcloud/redis.tf b/apps/nextcloud/redis.tf
index 6316802..be17f0c 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/v1beta1"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}-redis"
diff --git a/meta/domain-apps/apps.tf b/meta/domain-apps/apps.tf
index be5d3e5..25dd836 100644
--- a/meta/domain-apps/apps.tf
+++ b/meta/domain-apps/apps.tf
@@ -44,7 +44,7 @@ locals {
     nextcloud = merge(local.global,{ for k, v in var.nextcloud : k => v if !contains(["enable","storage","backups"],k) },{
       backups = merge(lookup(var.nextcloud, "backups", {}), local.global-backups)
       storage = merge({ for k, v in lookup(var.nextcloud, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.nextcloud, "storage", {}), "volume", {}), local.global-volume)
+        volume = lookup(lookup(var.nextcloud, "storage", {}), "volume", local.global-volume)
       })
     })
 }
diff --git a/meta/domain-apps/index.yaml b/meta/domain-apps/index.yaml
index fb5d097..0533fbf 100644
--- a/meta/domain-apps/index.yaml
+++ b/meta/domain-apps/index.yaml
@@ -6,6 +6,28 @@ metadata:
   name: domain-apps
   description: null
 options:
+  nextcloud:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: nextcloud
+  language:
+    default: fr_FR
+    examples:
+    - fr_FR
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   backups:
     default:
       enable: false
@@ -46,16 +68,31 @@ options:
         default: false
         type: boolean
     type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   timezone:
     default: Europe/Paris
     examples:
     - Europe/Paris
     type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  sso_vynil:
+    default: true
+    examples:
+    - true
+    type: boolean
+  domain_name:
+    default: your-company.com
+    examples:
+    - your-company.com
+    type: string
   distributions:
     default:
       core: core
@@ -71,15 +108,10 @@ options:
         default: domain
         type: string
     type: object
-  issuer:
-    default: letsencrypt-prod
+  app_group:
+    default: apps
     examples:
-    - letsencrypt-prod
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
+    - apps
     type: string
   storage:
     default:
@@ -104,44 +136,13 @@ options:
             type: string
         type: object
     type: object
-  nextcloud:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: nextcloud
-  language:
-    default: fr_FR
-    examples:
-    - fr_FR
-    type: string
-  domain_name:
-    default: your-company.com
-    examples:
-    - your-company.com
-    type: string
-  sso_vynil:
-    default: true
-    examples:
-    - true
-    type: boolean
-  app_group:
-    default: apps
-    examples:
-    - apps
-    type: string
 dependencies: []
 providers:
   kubernetes: true
   authentik: null
   kubectl: true
   postgresql: null
+  mysql: null
   restapi: null
   http: null
   gitea: null
diff --git a/share/authentik/redis.tf b/share/authentik/redis.tf
index 5f9e19a..a4a778b 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/v1beta1"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
     kind: "Redis"
     metadata:
       name: "${var.name}-${var.component}-redis"
diff --git a/share/dataset-redis/redis.tf b/share/dataset-redis/redis.tf
index 68aa396..da2781a 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/v1beta1"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}"
diff --git a/share/wildduck/redis.tf b/share/wildduck/redis.tf
index 6316802..be17f0c 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/v1beta1"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}-redis"