diff --git a/charts/etcd/templates/tests/test-etcd-health.yaml b/charts/etcd/templates/tests/test-etcd-health.yaml
index a1f33c7f..4ea55a91 100644
--- a/charts/etcd/templates/tests/test-etcd-health.yaml
+++ b/charts/etcd/templates/tests/test-etcd-health.yaml
@@ -25,12 +25,32 @@ metadata:
   name: "{{ .Release.Name }}-etcd-test"
   annotations:
     "helm.sh/hook": "test-success"
+    scheduler.alpha.kubernetes.io/critical-pod: ''
   labels:
 {{ tuple $envAll $applicationName "etcd-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   nodeSelector:
     {{ .Values.labels.anchor.node_selector_key }}: {{ .Values.labels.anchor.node_selector_value }}
   restartPolicy: Never
+  hostNetwork: true
+  tolerations:
+    - key: node-role.kubernetes.io/master
+      effect: NoSchedule
+    - key: node.kubernetes.io/memory-pressure
+      effect: NoSchedule
+      operator: Exists
+    - key: node.kubernetes.io/disk-pressure
+      effect: NoSchedule
+      operator: Exists
+    - key: node.kubernetes.io/out-of-disk
+      effect: NoSchedule
+      operator: Exists
+    - key: node.kubernetes.io/unschedulable
+      effect: NoSchedule
+      operator: Exists
+    - key: node.kubernetes.io/network-unavailable
+      effect: NoSchedule
+      operator: Exists
   containers:
     - name: "{{ .Release.Name }}-etcd-test"
       env:
diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml
index 5a63db0e..39f19b6f 100644
--- a/charts/scheduler/values.yaml
+++ b/charts/scheduler/values.yaml
@@ -77,4 +77,5 @@ service:
 
 command_prefix:
   - /scheduler
+  - --feature-gates=TaintNodesByCondition=true
   - --v=5
diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml
index e419b51b..ae1e95ae 100644
--- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml
+++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml
@@ -20,6 +20,7 @@ spec:
       - scheduler
       - --leader-elect=true
       - --kubeconfig=/etc/kubernetes/scheduler/kubeconfig.yaml
+      - --feature-gates=TaintNodesByCondition=true
       - --v=5
       volumeMounts:
         - name: config