diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml
index 8a0e9e8..f25c46a 100644
--- a/templates/deployment-sidekiq.yaml
+++ b/templates/deployment-sidekiq.yaml
@@ -122,7 +122,7 @@ spec:
               mountPath: /opt/mastodon/public/system
           {{- end }}
           resources:
-            {{- toYaml (default (default $context.Values.resources $context.Values.mastodon.sidekiq.resources) .resources) | nindent 12 }}
+            {{- toYaml (default $context.Values.mastodon.sidekiq.resources .resources) | nindent 12 }}
       {{- with $context.Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml
index dd80404..0a80530 100644
--- a/templates/deployment-streaming.yaml
+++ b/templates/deployment-streaming.yaml
@@ -70,7 +70,7 @@ spec:
             httpGet:
               path: /api/v1/streaming/health
               port: streaming
-          {{- with (default .Values.resources .Values.mastodon.streaming.resources) }}
+          {{- with .Values.mastodon.streaming.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml
index 30308e2..ce06650 100644
--- a/templates/deployment-web.yaml
+++ b/templates/deployment-web.yaml
@@ -126,7 +126,7 @@ spec:
               port: http
             failureThreshold: 30
             periodSeconds: 5
-          {{- with (default .Values.resources .Values.mastodon.web.resources) }}
+          {{- with .Values.mastodon.web.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
diff --git a/values.yaml b/values.yaml
index 711f000..b58d263 100644
--- a/values.yaml
+++ b/values.yaml
@@ -85,15 +85,15 @@ mastodon:
     # -- (Sidekiq Container) Security Context for all Pods, overwrites .Values.securityContext
     securityContext: {}
     # -- Resources for all Sidekiq Deployments unless overwritten
-    resources: {}
-    # -- Affinity for all Sidekiq Deployments unless overwritten, overwrites .Values.affinity
-    affinity: {}
+    resources:
+      requests:
+        cpu: 250m
+        memory: 512Mi
     # limits:
     #   cpu: "1"
     #   memory: 768Mi
-    # requests:
-    #   cpu: 250m
-    #   memory: 512Mi
+    # -- Affinity for all Sidekiq Deployments unless overwritten, overwrites .Values.affinity
+    affinity: {}
     workers:
     - name: all-queues
       # -- Number of threads / parallel sidekiq jobs that are executed per Pod
@@ -165,13 +165,13 @@ mastodon:
     # -- (Streaming Container) Security Context for Streaming Pods, overwrites .Values.securityContext
     securityContext: {}
     # -- (Streaming Container) Resources for Streaming Pods, overwrites .Values.resources
-    resources: {}
+    resources:
+      requests:
+        cpu: 250m
+        memory: 128Mi
     # limits:
     #   cpu: "500m"
     #   memory: 512Mi
-    # requests:
-    #   cpu: 250m
-    #   memory: 128Mi
   web:
     port: 3000
     # -- Number of Web Pods running
@@ -183,13 +183,13 @@ mastodon:
     # -- (Web Container) Security Context for Web Pods, overwrites .Values.securityContext
     securityContext: {}
     # -- (Web Container) Resources for Web Pods, overwrites .Values.resources
-    resources: {}
+    resources:
+      requests:
+        cpu: 250m
+        memory: 512Mi
     # limits:
     #   cpu: "1"
     #   memory: 1280Mi
-    # requests:
-    #   cpu: 250m
-    #   memory: 768Mi
     # -- Puma-specific options. Below values are based on default behavior in
     # config/puma.rb when no custom values are provided.
     minThreads: "5"
@@ -243,6 +243,18 @@ elasticsearch:
   # @ignored
   image:
     tag: 7
+  coordinating:
+    resources:
+      requests:
+        memory: 512Mi
+  ingest:
+    resources:
+      requests:
+        memory: 512Mi
+  master:
+    resources:
+      requests:
+        memory: 512Mi
 
 # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#parameters
 postgresql:
@@ -265,6 +277,10 @@ postgresql:
     # you can also specify the name of an existing Secret
     # with a key of password set to the password you want
     existingSecret: ""
+  primary:
+    resources:
+      requests:
+        memory: 384Mi
 
 # https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters
 redis:
@@ -280,6 +296,14 @@ redis:
     # you can also specify the name of an existing Secret
     # with a key of redis-password set to the password you want
     # existingSecret: ""
+  master:
+    resources:
+      requests:
+        memory: 56Mi
+  replica:
+    resources:
+      requests:
+        memory: 56Mi
 
 # @ignored
 service:
@@ -419,19 +443,6 @@ revisionPodAnnotation: true
 # The annotations set with jobAnnotations will be added to all job pods.
 jobAnnotations: {}
 
-# -- Default resources for all Deployments and jobs unless overwritten
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
 # @ignored
 nodeSelector: {}