diff --git a/charts/odigos/Chart.yaml b/charts/odigos/Chart.yaml
index b492bd1..11f26be 100644
--- a/charts/odigos/Chart.yaml
+++ b/charts/odigos/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.41
+version: 0.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "1.0.31"
diff --git a/charts/odigos/templates/autoscaler/deployment.yaml b/charts/odigos/templates/autoscaler/deployment.yaml
index ab6c06e..d27a6ef 100644
--- a/charts/odigos/templates/autoscaler/deployment.yaml
+++ b/charts/odigos/templates/autoscaler/deployment.yaml
@@ -59,9 +59,18 @@ spec:
         runAsNonRoot: true
       serviceAccountName: odigos-autoscaler
       terminationGracePeriodSeconds: 10
-      nodeSelector:
-        kubernetes.io/os: linux
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 6 }}
 {{- end }}
+{{- with .Values.autoscaler }}
+  {{- if .nodeSelector }}
+      nodeSelector: {{ toYaml .nodeSelector | nindent 8 }}
+  {{- end }}
+  {{- if .tolerations }}
+      tolerations: {{ toYaml .tolerations | nindent 8 }}
+  {{- end }}
+  {{- if .affinity }}
+      affinity: {{ toYaml .affinity | nindent 8 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/odigos/templates/instrumentor/deployment.yaml b/charts/odigos/templates/instrumentor/deployment.yaml
index 28a43dc..866a156 100644
--- a/charts/odigos/templates/instrumentor/deployment.yaml
+++ b/charts/odigos/templates/instrumentor/deployment.yaml
@@ -56,9 +56,18 @@ spec:
         runAsNonRoot: true
       serviceAccountName: odigos-instrumentor
       terminationGracePeriodSeconds: 10
-      nodeSelector:
-        kubernetes.io/os: linux
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 6 }}
 {{- end }}
+{{- with .Values.instrumentor }}
+  {{- if .nodeSelector }}
+      nodeSelector: {{ toYaml .nodeSelector | nindent 8 }}
+  {{- end }}
+  {{- if .tolerations }}
+      tolerations: {{ toYaml .tolerations | nindent 8 }}
+  {{- end }}
+  {{- if .affinity }}
+      affinity: {{ toYaml .affinity | nindent 8 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/odigos/templates/odiglet/daemonset.yaml b/charts/odigos/templates/odiglet/daemonset.yaml
index 3d66147..11c7835 100644
--- a/charts/odigos/templates/odiglet/daemonset.yaml
+++ b/charts/odigos/templates/odiglet/daemonset.yaml
@@ -49,14 +49,7 @@ spec:
               mountPath: /sys/kernel/debug
       hostNetwork: true
       hostPID: true
-      nodeSelector:
-        kubernetes.io/os: linux
       serviceAccountName: odiglet
-      tolerations:
-        - effect: NoSchedule
-          key: node.kubernetes.io/os
-          operator: Equal
-          value: windows
       volumes:
         - name: run-dir
           hostPath:
@@ -74,3 +67,14 @@ spec:
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 6 }}
 {{- end }}
+{{- with .Values.odiglet }}
+  {{- if .nodeSelector }}
+      nodeSelector: {{ toYaml .nodeSelector | nindent 8 }}
+  {{- end }}
+  {{- if .tolerations }}
+      tolerations: {{ toYaml .tolerations | nindent 8 }}
+  {{- end }}
+  {{- if .affinity }}
+      affinity: {{ toYaml .affinity | nindent 8 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/odigos/templates/scheduler/deployment.yaml b/charts/odigos/templates/scheduler/deployment.yaml
index 236b6df..1c1fa85 100644
--- a/charts/odigos/templates/scheduler/deployment.yaml
+++ b/charts/odigos/templates/scheduler/deployment.yaml
@@ -56,9 +56,18 @@ spec:
         runAsNonRoot: true
       serviceAccountName: odigos-scheduler
       terminationGracePeriodSeconds: 10
-      nodeSelector:
-        kubernetes.io/os: linux
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 6 }}
 {{- end }}
+{{- with .Values.scheduler }}
+  {{- if .nodeSelector }}
+      nodeSelector: {{ toYaml .nodeSelector | nindent 8 }}
+  {{- end }}
+  {{- if .tolerations }}
+      tolerations: {{ toYaml .tolerations | nindent 8 }}
+  {{- end }}
+  {{- if .affinity }}
+      affinity: {{ toYaml .affinity | nindent 8 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/odigos/values.yaml b/charts/odigos/values.yaml
index 5f55117..2fbae97 100644
--- a/charts/odigos/values.yaml
+++ b/charts/odigos/values.yaml
@@ -1,13 +1,22 @@
 image:
-  tag: v1.0.27
+  tag: v1.0.31
+imagePullSecrets: []
 
 autoscaler:
   image:
     repository: keyval/odigos-autoscaler
+  nodeSelector:
+    kubernetes.io/os: linux
+  tolerations: []
+  affinity: {}
 
 scheduler:
   image:
     repository: keyval/odigos-scheduler
+  nodeSelector:
+    kubernetes.io/os: linux
+  tolerations: []
+  affinity: {}
 
 instrumentor:
   deleteLangDetectionPods: true
@@ -20,10 +29,22 @@ instrumentor:
     - linkerd
   image:
     repository: keyval/odigos-instrumentor
+  nodeSelector:
+    kubernetes.io/os: linux
+  tolerations: []
+  affinity: {}
 
 odiglet:
   image:
     repository: keyval/odigos-odiglet
+  nodeSelector:
+    kubernetes.io/os: linux
+  tolerations:
+    - effect: NoSchedule
+      key: node.kubernetes.io/os
+      operator: Equal
+      value: windows
+  affinity: {}
 
 # Pod Security Policy
 psp: