diff --git a/badhouseplants/values/values.funkwhale.yaml b/badhouseplants/values/values.funkwhale.yaml
index e6a36db..08bdbd6 100644
--- a/badhouseplants/values/values.funkwhale.yaml
+++ b/badhouseplants/values/values.funkwhale.yaml
@@ -1,5 +1,6 @@
+---
 replicaCount: 1
-worker: 
+worker:
   replicaCount: 1
 celery:
   beat:
@@ -21,4 +22,8 @@ s3:
   enabled: false
 ingress:
   enabled: false
-
+postgresql:
+  primary:
+    resources:
+      requests:
+        cpu: 50m
diff --git a/badhouseplants/values/values.gitea.yaml b/badhouseplants/values/values.gitea.yaml
index 4d299a6..ef846f3 100644
--- a/badhouseplants/values/values.gitea.yaml
+++ b/badhouseplants/values/values.gitea.yaml
@@ -1,3 +1,4 @@
+---
 ns:
   enabled: true
   name: gitea-service
@@ -39,7 +40,7 @@ resources:
     cpu: 300m
     memory: 512Mi
   requests:
-    cpu: 100m
+    cpu: 50m
     memory: 128Mi
 
 persistence:
@@ -56,7 +57,7 @@ memcached:
     port: 11211
 
 postgresql:
-  auth: 
+  auth:
     postgresPassword: check
   enabled: true
   global:
@@ -64,6 +65,9 @@ postgresql:
       servicePort: 5432
   persistence:
     size: 10Gi
+  resources:
+    requests:
+      cpu: 50m
 
 ingress:
   enabled: false
diff --git a/badhouseplants/values/values.rook-ceph-cluster.yaml b/badhouseplants/values/values.rook-ceph-cluster.yaml
index 5a4428a..53c949b 100644
--- a/badhouseplants/values/values.rook-ceph-cluster.yaml
+++ b/badhouseplants/values/values.rook-ceph-cluster.yaml
@@ -1,3 +1,4 @@
+---
 cephClusterSpec:
   mon:
     count: 1
@@ -8,3 +9,50 @@ cephClusterSpec:
     modules:
       - name: pg_autoscaler
         enabled: true
+  resources:
+    mgr:
+      limits:
+        cpu: "200m"
+        memory: "512Mi"
+      requests:
+        cpu: "200m"
+        memory: "512Mi"
+    mon:
+      limits:
+        cpu: "300m"
+        memory: "512Mi"
+      requests:
+        cpu: "300m"
+        memory: "512Mi"
+    osd:
+      limits:
+        cpu: "200m"
+        memory: "512Mi"
+      requests:
+        cpu: "200m"
+        memory: "512Mi"
+    prepareosd:
+      requests:
+        cpu: "100m"
+        memory: "50Mi"
+    crashcollector:
+      limits:
+        cpu: "500m"
+        memory: "60Mi"
+      requests:
+        cpu: "100m"
+        memory: "60Mi"
+    logcollector:
+      limits:
+        cpu: "100m"
+        memory: "256Mi"
+      requests:
+        cpu: "100m"
+        memory: "100Mi"
+    cleanup:
+      limits:
+        cpu: "100m"
+        memory: "512Mi"
+      requests:
+        cpu: "100m"
+        memory: "512Mi"
diff --git a/badhouseplants/values/values.rook-ceph.yaml b/badhouseplants/values/values.rook-ceph.yaml
new file mode 100644
index 0000000..e87f0e8
--- /dev/null
+++ b/badhouseplants/values/values.rook-ceph.yaml
@@ -0,0 +1,65 @@
+resources:
+  limits:
+    cpu: 500m
+    memory: 512Mi
+  requests:
+    cpu: 25m
+    memory: 128Mi
+csi:
+  csiRBDProvisionerResource: |
+    - name : csi-provisioner
+      resource:
+        requests:
+          memory: 128Mi
+          cpu: 25m
+        limits:
+          memory: 256Mi
+          cpu: 200m
+    - name : csi-resizer
+      resource:
+        requests:
+          memory: 128Mi
+          cpu: 25m
+        limits:
+          memory: 256Mi
+          cpu: 200m
+    - name : csi-attacher
+      resource:
+        requests:
+          memory: 128Mi
+          cpu: 25m
+        limits:
+          memory: 256Mi
+          cpu: 200m
+    - name : csi-snapshotter
+      resource:
+        requests:
+          memory: 128Mi
+          cpu: 25m
+        limits:
+          memory: 256Mi
+          cpu: 200m
+    - name : csi-rbdplugin
+      resource:
+        requests:
+          memory: 512Mi
+          cpu: 25m
+        limits:
+          memory: 1Gi
+          cpu: 500m
+    - name : csi-omap-generator
+      resource:
+        requests:
+          memory: 512Mi
+          cpu: 25m
+        limits:
+          memory: 1Gi
+          cpu: 500m
+    - name : liveness-prometheus
+      resource:
+        requests:
+          memory: 128Mi
+          cpu: 25m
+        limits:
+          memory: 256Mi
+          cpu: 100m
\ No newline at end of file
diff --git a/releases.yaml b/releases.yaml
index 5259c75..60f179b 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -83,16 +83,29 @@ templates:
     inherit:
       - template: default-env-values
       - template: default-env-secrets
+  # ----------------------------
+  # -- Rook
+  # ----------------------------
+  rook-common:
+    labels:
+      bundle: rook
+    version: v1.11.0
+
   rook-ceph: &rook-ceph
     name: rook-ceph
     chart: rook-release/rook-ceph
     version: v1.11.0
+    inherit:
+      - template: rook-common
+      - template: default-env-values
+
   
   rook-ceph-cluster: &rook-ceph-cluster
     name: rook-ceph-cluster
     chart: rook-release/rook-ceph-cluster
     version: v1.11.0
     inherit:
+      - template: rook-common
       - template: default-env-values
 
   # ----------------------------