diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml
index a1465c6..50af5ef 100644
--- a/apps/nextcloud/index.yaml
+++ b/apps/nextcloud/index.yaml
@@ -6,31 +6,44 @@ metadata:
   name: nextcloud
   description: null
 options:
-  sub-domain:
-    default: cloud
+  domain:
+    default: your-company
     examples:
-    - cloud
+    - your-company
     type: string
-  admin:
+  redis:
     default:
-      name: nextcloud_admin
+      exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
     examples:
-    - name: nextcloud_admin
+    - exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
     properties:
-      name:
-        default: nextcloud_admin
+      exporter:
+        default:
+          enabled: true
+          image: quay.io/opstree/redis-exporter:v1.44.0
+        properties:
+          enabled:
+            default: true
+            type: boolean
+          image:
+            default: quay.io/opstree/redis-exporter:v1.44.0
+            type: string
+        type: object
+      image:
+        default: quay.io/opstree/redis:v7.0.5
+        type: string
+      storage:
+        default: 2Gi
         type: string
     type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   storage:
     default:
       accessMode: ReadWriteOnce
@@ -50,16 +63,6 @@ options:
         default: 10Gi
         type: string
     type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   images:
     default:
       exporter:
@@ -163,6 +166,11 @@ options:
             type: string
         type: object
     type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   hpa:
     default:
       avg-cpu: 50
@@ -183,6 +191,51 @@ options:
         default: 1
         type: integer
     type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  postgres:
+    default:
+      replicas: 1
+      storage: 5Gi
+      version: '14'
+    examples:
+    - replicas: 1
+      storage: 5Gi
+      version: '14'
+    properties:
+      replicas:
+        default: 1
+        type: integer
+      storage:
+        default: 5Gi
+        type: string
+      version:
+        default: '14'
+        type: string
+    type: object
+  admin:
+    default:
+      name: nextcloud_admin
+    examples:
+    - name: nextcloud_admin
+    properties:
+      name:
+        default: nextcloud_admin
+        type: string
+    type: object
+  sub-domain:
+    default: cloud
+    examples:
+    - cloud
+    type: string
 dependencies: []
 providers:
   kubernetes: true
diff --git a/apps/nextcloud/postgresql.tf b/apps/nextcloud/postgresql.tf
index eb9c3a2..c503a2a 100644
--- a/apps/nextcloud/postgresql.tf
+++ b/apps/nextcloud/postgresql.tf
@@ -3,7 +3,7 @@ locals {
     "app.kubernetes.io/component" = "postgresql"
   })
 }
-resource "kubectl_manifest" "dolibarr_postgresql" {
+resource "kubectl_manifest" "prj_postgresql" {
   yaml_body  = <<-EOF
     apiVersion: "acid.zalan.do/v1"
     kind: "postgresql"
diff --git a/apps/nextcloud/redis.tf b/apps/nextcloud/redis.tf
index 648115f..0ac78d6 100644
--- a/apps/nextcloud/redis.tf
+++ b/apps/nextcloud/redis.tf
@@ -3,7 +3,7 @@ locals {
     "app.kubernetes.io/component" = "redis"
   })
 }
-resource "kubectl_manifest" "dolibarr_redis" {
+resource "kubectl_manifest" "prj_redis" {
   yaml_body  = <<-EOF
     apiVersion: "redis.redis.opstreelabs.in/v1beta1"
     kind: "Redis"