--- charts-original/templates/post-install-create-bucket-job.yaml
+++ charts/templates/post-install-create-bucket-job.yaml
@@ -31,18 +31,17 @@
     spec:
       restartPolicy: OnFailure
 {{- include "minio.imagePullSecrets" . | indent 6 }}
-{{- if .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.makeBucketJob.nodeSelector | indent 8 }}
-{{- end }}
+        {{- include "linux-node-selector" . | nindent 8 }}
 {{- with .Values.makeBucketJob.affinity }}
       affinity:
 {{ toYaml . | indent 8 }}
 {{- end }}
-{{- with .Values.makeBucketJob.tolerations }}
       tolerations:
-{{ toYaml . | indent 8 }}
-{{- end }}
+        {{- include "linux-node-tolerations" . | nindent 8 }}
+        {{- with .Values.makeBucketJob.tolerations }}
+        {{ toYaml . | indent 8 }}
+        {{- end }}
 {{- if .Values.makeBucketJob.securityContext.enabled }}
       securityContext:
         runAsUser: {{ .Values.makeBucketJob.securityContext.runAsUser }}
@@ -73,7 +72,7 @@
 {{- end }}
       containers:
       - name: minio-mc
-        image: "{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}"
+        image: "{{ default .Values.mcImage.registry (include "registry-url" .) }}{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}"
         imagePullPolicy: {{ .Values.mcImage.pullPolicy }}
         {{- if .Values.makeBucketJob.exitCommand }}
         command: ["/bin/sh", "-c"]