diff --git a/stable/yugabyte/templates/hooks/setup-credentials-job.yaml b/stable/yugabyte/templates/hooks/setup-credentials-job.yaml
index 1bde38cbae..d1ef65fcb2 100644
--- a/stable/yugabyte/templates/hooks/setup-credentials-job.yaml
+++ b/stable/yugabyte/templates/hooks/setup-credentials-job.yaml
@@ -24,6 +24,12 @@ spec:
         chart: "{{ .Chart.Name }}"
         component: "{{ .Values.Component }}"
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.tserver.tolerations }}
+      tolerations: {{ toYaml .Values.tserver.tolerations | nindent 8 }}
+      {{- end }}
       restartPolicy: Never
       containers:
       - name: setup-credentials