diff --git a/charts/sn-platform/templates/vault/vault-initialize-public-key.yaml b/charts/sn-platform/templates/vault/vault-initialize-public-key.yaml
index 4139a306..017b17ac 100644
--- a/charts/sn-platform/templates/vault/vault-initialize-public-key.yaml
+++ b/charts/sn-platform/templates/vault/vault-initialize-public-key.yaml
@@ -26,6 +26,19 @@ spec:
 {{- end }}
     spec:
       serviceAccountName: {{ template "pulsar.vault.serviceAccount" . }}
+      {{- if .Values.global.imagePullSecrets }}
+      imagePullSecrets: {{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.vault.tolerations }}
+      tolerations:
+      {{ toYaml .Values.vault.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.vault.nodeSelector }}
+      nodeSelector:
+      {{ toYaml .Values.vault.nodeSelector | indent 8 }}
+      {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.vault.affinity "Component" .Values.vault.component "Release" .Release "Chart" .Chart) | indent 8 }}
       containers:
       - name: "{{ template "pulsar.fullname" . }}-{{ .Values.vault.component }}-init"
         image: "{{ .Values.images.vault_init.repository }}:{{ .Values.images.vault_init.tag }}"
diff --git a/charts/sn-platform/templates/vault/vault-initialize.yaml b/charts/sn-platform/templates/vault/vault-initialize.yaml
index 02e6a2f6..6a71986a 100644
--- a/charts/sn-platform/templates/vault/vault-initialize.yaml
+++ b/charts/sn-platform/templates/vault/vault-initialize.yaml
@@ -29,6 +29,16 @@ spec:
       {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets: {{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
       {{- end }}
+      {{- if .Values.vault.tolerations }}
+      tolerations:
+      {{ toYaml .Values.vault.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.vault.nodeSelector }}
+      nodeSelector:
+      {{ toYaml .Values.vault.nodeSelector | indent 8 }}
+      {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.vault.affinity "Component" .Values.vault.component "Release" .Release "Chart" .Chart) | indent 8 }}
       containers:
       - name: "{{ template "pulsar.fullname" . }}-{{ .Values.vault.component }}-init"
         image: "{{ .Values.images.vault_init.repository }}:{{ .Values.images.vault_init.tag }}"