--- charts-original/templates/statefulset.yaml
+++ charts/templates/statefulset.yaml
@@ -96,7 +96,7 @@
 {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: "{{ default .Values.image.registry (include "registry-url" .) }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
 
           command: [ "/bin/sh",
@@ -155,19 +155,18 @@
             {{- end}}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
-    {{- with .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
+        {{- include "linux-node-selector" . | nindent 8 }}
 {{- include "minio.imagePullSecrets" . | indent 6 }}
     {{- with .Values.affinity }}
       affinity:
 {{ toYaml . | indent 8 }}
     {{- end }}
-    {{- with .Values.tolerations }}
       tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
+        {{- include "linux-node-tolerations" . | nindent 8 }}
+        {{- with .Values.tolerations }}
+        {{ toYaml . | indent 8 }}
+        {{- end }}
       volumes:
         - name: minio-user
           secret: