diff --git a/stx-vault-helm/stx-vault-helm/manifests/vault_manifest.yaml b/stx-vault-helm/stx-vault-helm/manifests/vault_manifest.yaml
index 1c697ea..4561eb0 100644
--- a/stx-vault-helm/stx-vault-helm/manifests/vault_manifest.yaml
+++ b/stx-vault-helm/stx-vault-helm/manifests/vault_manifest.yaml
@@ -60,6 +60,10 @@ data:
       image:
         repository: starlingx/stx-vault-manager
         tag: stx.5.0-v1.18.3
+      tolerations: |
+        - key: "node-role.kubernetes.io/master"
+          operator: "Exists"
+          effect: "NoSchedule"
     injector:
       enabled: true
       nodeSelector: |
@@ -70,6 +74,10 @@ data:
       agentImage:
         repository: vault
         tag: 1.4.2
+      tolerations: |
+        - key: "node-role.kubernetes.io/master"
+          operator: "Exists"
+          effect: "NoSchedule"
     server:
       affinity: |
         podAntiAffinity:
@@ -83,6 +91,10 @@ data:
       image:
         repository: vault
         tag: 1.4.2
+      tolerations: |
+        - key: "node-role.kubernetes.io/master"
+          operator: "Exists"
+          effect: "NoSchedule"
       auditStorage:
         enabled: true
         size: 10Gi
diff --git a/vault-helm/vault-helm/helm-charts/vault-init.yaml b/vault-helm/vault-helm/helm-charts/vault-init.yaml
index 2b78377..4305d15 100644
--- a/vault-helm/vault-helm/helm-charts/vault-init.yaml
+++ b/vault-helm/vault-helm/helm-charts/vault-init.yaml
@@ -199,6 +199,10 @@ spec:
       imagePullSecrets:
         {{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
       {{- end }}
+      {{- if .Values.manager.tolerations }}
+      tolerations:
+        {{- tpl .Values.manager.tolerations . | nindent 8 }}
+      {{- end }}
       containers:
         - name: manager
           image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}"