diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go
index 116e80c77..2c7ac737d 100644
--- a/config/configStructs/tapConfig.go
+++ b/config/configStructs/tapConfig.go
@@ -34,8 +34,8 @@ const (
 )
 
 type ResourceLimits struct {
-	CPU    string `yaml:"cpu" json:"cpu" default:"750m"`
-	Memory string `yaml:"memory" json:"memory" default:"1Gi"`
+	CPU    string `yaml:"cpu" json:"cpu" default:"500m"`
+	Memory string `yaml:"memory" json:"memory" default:"500Mi"`
 }
 
 type ResourceRequests struct {
@@ -76,8 +76,10 @@ type DockerConfig struct {
 }
 
 type ResourcesConfig struct {
-	Worker ResourceRequirements `yaml:"worker" json:"worker"`
-	Hub    ResourceRequirements `yaml:"hub" json:"hub"`
+	Sniffer ResourceRequirements `yaml:"sniffer" json:"sniffer"`
+	Server  ResourceRequirements `yaml:"server" json:"server"`
+	Tracer  ResourceRequirements `yaml:"tracer" json:"tracer"`
+	Hub     ResourceRequirements `yaml:"hub" json:"hub"`
 }
 
 type AuthConfig struct {
diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml
index 455a17b57..65415cd2d 100644
--- a/helm-chart/templates/09-worker-daemon-set.yaml
+++ b/helm-chart/templates/09-worker-daemon-set.yaml
@@ -60,11 +60,11 @@ spec:
         {{- end }}
           resources:
             limits:
-              cpu: {{ .Values.tap.resources.worker.limits.cpu }}
-              memory: {{ .Values.tap.resources.worker.limits.memory }}
+              cpu: {{ .Values.tap.resources.sniffer.limits.cpu }}
+              memory: {{ .Values.tap.resources.sniffer.limits.memory }}
             requests:
-              cpu: {{ .Values.tap.resources.worker.requests.cpu }}
-              memory: {{ .Values.tap.resources.worker.requests.memory }}
+              cpu: {{ .Values.tap.resources.sniffer.requests.cpu }}
+              memory: {{ .Values.tap.resources.sniffer.requests.memory }}
           securityContext:
             capabilities:
               add:
@@ -117,11 +117,11 @@ spec:
         {{- end }}
           resources:
             limits:
-              cpu: {{ .Values.tap.resources.worker.limits.cpu }}
-              memory: {{ .Values.tap.resources.worker.limits.memory }}
+              cpu: {{ .Values.tap.resources.server.limits.cpu }}
+              memory: {{ .Values.tap.resources.server.limits.memory }}
             requests:
-              cpu: {{ .Values.tap.resources.worker.requests.cpu }}
-              memory: {{ .Values.tap.resources.worker.requests.memory }}
+              cpu: {{ .Values.tap.resources.server.requests.cpu }}
+              memory: {{ .Values.tap.resources.server.requests.memory }}
           securityContext:
             capabilities:
               drop:
@@ -172,11 +172,11 @@ spec:
                 name: kubeshark-secret
           resources:
             limits:
-              cpu: {{ .Values.tap.resources.worker.limits.cpu }}
-              memory: {{ .Values.tap.resources.worker.limits.memory }}
+              cpu: {{ .Values.tap.resources.tracer.limits.cpu }}
+              memory: {{ .Values.tap.resources.tracer.limits.memory }}
             requests:
-              cpu: {{ .Values.tap.resources.worker.requests.cpu }}
-              memory: {{ .Values.tap.resources.worker.requests.memory }}
+              cpu: {{ .Values.tap.resources.tracer.requests.cpu }}
+              memory: {{ .Values.tap.resources.tracer.requests.memory }}
           securityContext:
             capabilities:
               add:
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index 2deb8ef7b..dfc7b3e68 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -25,17 +25,31 @@ tap:
   dryrun: false
   pcap: ""
   resources:
-    worker:
+    sniffer:
       limits:
-        cpu: 750m
-        memory: 1Gi
+        cpu: 500m
+        memory: 500Mi
+      requests:
+        cpu: 50m
+        memory: 50Mi
+    server:
+      limits:
+        cpu: 500m
+        memory: 500Mi
+      requests:
+        cpu: 50m
+        memory: 50Mi
+    tracer:
+      limits:
+        cpu: 500m
+        memory: 500Mi
       requests:
         cpu: 50m
         memory: 50Mi
     hub:
       limits:
-        cpu: 750m
-        memory: 1Gi
+        cpu: 500m
+        memory: 500Mi
       requests:
         cpu: 50m
         memory: 50Mi