diff --git a/deployments/helm/templates/daemon-set.yml b/deployments/helm/templates/daemon-set.yml
index 1c795f8d1..c5cd533d3 100644
--- a/deployments/helm/templates/daemon-set.yml
+++ b/deployments/helm/templates/daemon-set.yml
@@ -13,6 +13,10 @@ spec:
   selector:
     matchLabels:
       instrumentation: {{ include "beyla.fullname" . }}
+  {{- with .Values.updateStrategy }}
+  strategy:
+    {{- toYaml . | trim | nindent 4 }}
+  {{- end }}
   template:
     metadata:
       labels:
@@ -50,4 +54,16 @@ spec:
             - name: {{ $key | quote }}
               valueFrom:
           {{- tpl (toYaml $value) $ | nindent 16 }}
+          {{- end }}
+          {{- with .Values.nodeSelector }}          
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.affinity }}
+          affinity:
+            {{- tpl (toYaml .) $ | nindent 12 }}
+          {{- end }}
+          {{- with .Values.tolerations }}
+          tolerations:
+            {{- toYaml . | nindent 12 }}
           {{- end }}
\ No newline at end of file
diff --git a/deployments/helm/values.yaml b/deployments/helm/values.yaml
index 9ef02149f..c8ab7b6c4 100644
--- a/deployments/helm/values.yaml
+++ b/deployments/helm/values.yaml
@@ -95,6 +95,12 @@ readinessProbe:
     path: /
     port: http
 
+
+## See `kubectl explain deployment.spec.strategy` for more
+## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+updateStrategy:
+  type: RollingUpdate
+
 autoscaling:
   enabled: false
   minReplicas: 1