diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml
index 3fd93e4..6c55a1d 100644
--- a/helm-chart/templates/deployment.yaml
+++ b/helm-chart/templates/deployment.yaml
@@ -94,7 +94,7 @@ spec:
             - frx_challenges.wsgi
           securityContext:
             runAsUser: 0
-          resources: {{ toJson .Values.resources }}
+          resources: {{ toJson .Values.web.resources }}
           volumeMounts:
             - name: storage
               mountPath: /opt/state
@@ -103,6 +103,7 @@ spec:
               subPath: frx_challenges.yaml
         - name: dind
           image: {{ .Values.dind.image.repository }}:{{ .Values.dind.image.tag }}
+          resources: {{ toJson .Values.dind.resources }}
           command:
             {{ if .Values.dind.rootless }}
             - dind
@@ -121,6 +122,7 @@ spec:
         - name: evaluator
           image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          resources: {{ toJson .Values.evaluator.resources }}
           args:
             - python
             - manage.py
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index 3abce24..a6700f5 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -9,6 +9,9 @@ image:
   tag: "1.0.1"
   pullPolicy: IfNotPresent
 
+web:
+  resources: {}
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
@@ -36,8 +39,6 @@ pvc:
   storage: 1Gi
   storageClassName:
 
-resources: {}
-
 nodeSelector: {}
 
 tolerations: []
@@ -63,8 +64,12 @@ nginx:
 
 extraInitContainers: {}
 
+evaluator:
+  resources: {}
+
 dind:
   rootless: false
+  resources: {}
   image:
     repository: docker
     tag: 27.0.3-dind