diff --git a/deployments/helm/templates/daemon-set.yml b/deployments/helm/templates/daemon-set.yml
index c9b1da198..98a92861e 100644
--- a/deployments/helm/templates/daemon-set.yml
+++ b/deployments/helm/templates/daemon-set.yml
@@ -57,18 +57,6 @@ spec:
               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 }}
           volumeMounts:
             - mountPath: /etc/beyla/config
               name: beyla-config
@@ -80,6 +68,18 @@ spec:
           {{- toYaml .Values.image.pullSecrets | nindent 4 }}
           {{- end }}
         {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- tpl (toYaml .) $ | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: beyla-config
           configMap: