diff --git a/charts/minio/1.6.16/.helmignore b/charts/minio/1.6.17/.helmignore
similarity index 100%
rename from charts/minio/1.6.16/.helmignore
rename to charts/minio/1.6.17/.helmignore
diff --git a/charts/minio/1.6.16/CHANGELOG.md b/charts/minio/1.6.17/CHANGELOG.md
similarity index 100%
rename from charts/minio/1.6.16/CHANGELOG.md
rename to charts/minio/1.6.17/CHANGELOG.md
diff --git a/charts/minio/1.6.16/Chart.yaml b/charts/minio/1.6.17/Chart.yaml
similarity index 96%
rename from charts/minio/1.6.16/Chart.yaml
rename to charts/minio/1.6.17/Chart.yaml
index 489e1aba36..004e214109 100644
--- a/charts/minio/1.6.16/Chart.yaml
+++ b/charts/minio/1.6.17/Chart.yaml
@@ -16,4 +16,4 @@ sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-version: 1.6.16
+version: 1.6.17
diff --git a/charts/minio/1.6.16/README.md b/charts/minio/1.6.17/README.md
similarity index 100%
rename from charts/minio/1.6.16/README.md
rename to charts/minio/1.6.17/README.md
diff --git a/charts/minio/1.6.16/app-readme.md b/charts/minio/1.6.17/app-readme.md
similarity index 100%
rename from charts/minio/1.6.16/app-readme.md
rename to charts/minio/1.6.17/app-readme.md
diff --git a/charts/minio/1.6.16/charts/common-2112.0.0.tgz b/charts/minio/1.6.17/charts/common-2112.0.0.tgz
similarity index 100%
rename from charts/minio/1.6.16/charts/common-2112.0.0.tgz
rename to charts/minio/1.6.17/charts/common-2112.0.0.tgz
diff --git a/charts/minio/1.6.16/ix_values.yaml b/charts/minio/1.6.17/ix_values.yaml
similarity index 100%
rename from charts/minio/1.6.16/ix_values.yaml
rename to charts/minio/1.6.17/ix_values.yaml
diff --git a/charts/minio/1.6.16/migrations/migrate b/charts/minio/1.6.17/migrations/migrate
similarity index 100%
rename from charts/minio/1.6.16/migrations/migrate
rename to charts/minio/1.6.17/migrations/migrate
diff --git a/charts/minio/1.6.16/migrations/migrate_from_1.0.0 b/charts/minio/1.6.17/migrations/migrate_from_1.0.0
similarity index 100%
rename from charts/minio/1.6.16/migrations/migrate_from_1.0.0
rename to charts/minio/1.6.17/migrations/migrate_from_1.0.0
diff --git a/charts/minio/1.6.16/questions.yaml b/charts/minio/1.6.17/questions.yaml
similarity index 100%
rename from charts/minio/1.6.16/questions.yaml
rename to charts/minio/1.6.17/questions.yaml
diff --git a/charts/minio/1.6.16/requirements.lock b/charts/minio/1.6.17/requirements.lock
similarity index 100%
rename from charts/minio/1.6.16/requirements.lock
rename to charts/minio/1.6.17/requirements.lock
diff --git a/charts/minio/1.6.16/templates/NOTES.txt b/charts/minio/1.6.17/templates/NOTES.txt
similarity index 100%
rename from charts/minio/1.6.16/templates/NOTES.txt
rename to charts/minio/1.6.17/templates/NOTES.txt
diff --git a/charts/minio/1.6.16/templates/_cert.tpl b/charts/minio/1.6.17/templates/_cert.tpl
similarity index 100%
rename from charts/minio/1.6.16/templates/_cert.tpl
rename to charts/minio/1.6.17/templates/_cert.tpl
diff --git a/test/minio/1.6.16/templates/_helpers.tpl b/charts/minio/1.6.17/templates/_helpers.tpl
similarity index 85%
rename from test/minio/1.6.16/templates/_helpers.tpl
rename to charts/minio/1.6.17/templates/_helpers.tpl
index 55b50755aa..8fdf17e791 100644
--- a/test/minio/1.6.16/templates/_helpers.tpl
+++ b/charts/minio/1.6.17/templates/_helpers.tpl
@@ -56,11 +56,11 @@ Retrieve scheme/protocol for minio
 Retrieve command for minio application
 */}}
 {{- define "minio.commandArgs" -}}
-{{- $arg := "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':9001'" -}}
+{{- $arg := (printf "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':%d'" (.Values.service.consolePort | int)) -}}
 {{- if .Values.distributedMode -}}
 {{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}}
 {{- else -}}
-{{- cat $arg ((concat (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
+{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
 {{- end -}}
 {{- end -}}
 
diff --git a/charts/minio/1.6.16/templates/configmap.yaml b/charts/minio/1.6.17/templates/configmap.yaml
similarity index 100%
rename from charts/minio/1.6.16/templates/configmap.yaml
rename to charts/minio/1.6.17/templates/configmap.yaml
diff --git a/test/minio/1.6.16/templates/deployment.yaml b/charts/minio/1.6.17/templates/deployment.yaml
similarity index 96%
rename from test/minio/1.6.16/templates/deployment.yaml
rename to charts/minio/1.6.17/templates/deployment.yaml
index fa6f2ead47..66da2d202c 100644
--- a/test/minio/1.6.16/templates/deployment.yaml
+++ b/charts/minio/1.6.17/templates/deployment.yaml
@@ -46,9 +46,9 @@ spec:
             - {{ include "minio.commandArgs" . }}
           ports:
             - name: api
-              containerPort: 9000
+              containerPort: {{ .Values.service.nodePort | int }}
             - name: console
-              containerPort: 9001
+              containerPort: {{ .Values.service.consolePort | int }}
           env:
             {{ $secretName := (include "minio.secretName" .) }}
             {{ $envList := (default list .Values.environmentVariables) }}
diff --git a/charts/minio/1.6.16/templates/pre-install-job.yaml b/charts/minio/1.6.17/templates/pre-install-job.yaml
similarity index 100%
rename from charts/minio/1.6.16/templates/pre-install-job.yaml
rename to charts/minio/1.6.17/templates/pre-install-job.yaml
diff --git a/charts/minio/1.6.16/templates/secrets.yaml b/charts/minio/1.6.17/templates/secrets.yaml
similarity index 100%
rename from charts/minio/1.6.16/templates/secrets.yaml
rename to charts/minio/1.6.17/templates/secrets.yaml
diff --git a/test/minio/1.6.16/templates/service.yaml b/charts/minio/1.6.17/templates/service.yaml
similarity index 71%
rename from test/minio/1.6.16/templates/service.yaml
rename to charts/minio/1.6.17/templates/service.yaml
index fd2e6ba676..cbb4afc3dc 100644
--- a/test/minio/1.6.16/templates/service.yaml
+++ b/charts/minio/1.6.17/templates/service.yaml
@@ -1,11 +1,13 @@
+{{ if eq (include "minio.hostNetworking" .) "false" }}
 {{ $svc := .Values.service }}
 {{ $selectors := list }}
 {{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }}
 {{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }}
 {{ $ports := list }}
-{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }}
-{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }}
+{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" (.Values.service.nodePort | int)) }}
+{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" (.Values.service.consolePort | int)) }}
 {{ $params := . }}
 {{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }}
 {{ $_1 := set .Values "extraSelectorLabels" $selectors }}
 {{ include "common.classes.service" $params }}
+{{ end }}
diff --git a/charts/minio/1.6.16/templates/serviceaccount.yaml b/charts/minio/1.6.17/templates/serviceaccount.yaml
similarity index 100%
rename from charts/minio/1.6.16/templates/serviceaccount.yaml
rename to charts/minio/1.6.17/templates/serviceaccount.yaml
diff --git a/charts/minio/1.6.16/templates/tests/deployment-check.yaml b/charts/minio/1.6.17/templates/tests/deployment-check.yaml
similarity index 100%
rename from charts/minio/1.6.16/templates/tests/deployment-check.yaml
rename to charts/minio/1.6.17/templates/tests/deployment-check.yaml
diff --git a/charts/minio/1.6.16/test_values.yaml b/charts/minio/1.6.17/test_values.yaml
similarity index 100%
rename from charts/minio/1.6.16/test_values.yaml
rename to charts/minio/1.6.17/test_values.yaml
diff --git a/test/minio/1.6.16/.helmignore b/test/minio/1.6.17/.helmignore
similarity index 100%
rename from test/minio/1.6.16/.helmignore
rename to test/minio/1.6.17/.helmignore
diff --git a/test/minio/1.6.16/CHANGELOG.md b/test/minio/1.6.17/CHANGELOG.md
similarity index 100%
rename from test/minio/1.6.16/CHANGELOG.md
rename to test/minio/1.6.17/CHANGELOG.md
diff --git a/test/minio/1.6.16/Chart.yaml b/test/minio/1.6.17/Chart.yaml
similarity index 96%
rename from test/minio/1.6.16/Chart.yaml
rename to test/minio/1.6.17/Chart.yaml
index 489e1aba36..004e214109 100644
--- a/test/minio/1.6.16/Chart.yaml
+++ b/test/minio/1.6.17/Chart.yaml
@@ -16,4 +16,4 @@ sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-version: 1.6.16
+version: 1.6.17
diff --git a/test/minio/1.6.16/README.md b/test/minio/1.6.17/README.md
similarity index 100%
rename from test/minio/1.6.16/README.md
rename to test/minio/1.6.17/README.md
diff --git a/test/minio/1.6.16/app-readme.md b/test/minio/1.6.17/app-readme.md
similarity index 100%
rename from test/minio/1.6.16/app-readme.md
rename to test/minio/1.6.17/app-readme.md
diff --git a/test/minio/1.6.16/charts/common-2112.0.0.tgz b/test/minio/1.6.17/charts/common-2112.0.0.tgz
similarity index 100%
rename from test/minio/1.6.16/charts/common-2112.0.0.tgz
rename to test/minio/1.6.17/charts/common-2112.0.0.tgz
diff --git a/test/minio/1.6.16/ix_values.yaml b/test/minio/1.6.17/ix_values.yaml
similarity index 100%
rename from test/minio/1.6.16/ix_values.yaml
rename to test/minio/1.6.17/ix_values.yaml
diff --git a/test/minio/1.6.16/migrations/migrate b/test/minio/1.6.17/migrations/migrate
similarity index 100%
rename from test/minio/1.6.16/migrations/migrate
rename to test/minio/1.6.17/migrations/migrate
diff --git a/test/minio/1.6.16/migrations/migrate_from_1.0.0 b/test/minio/1.6.17/migrations/migrate_from_1.0.0
similarity index 100%
rename from test/minio/1.6.16/migrations/migrate_from_1.0.0
rename to test/minio/1.6.17/migrations/migrate_from_1.0.0
diff --git a/test/minio/1.6.16/questions.yaml b/test/minio/1.6.17/questions.yaml
similarity index 100%
rename from test/minio/1.6.16/questions.yaml
rename to test/minio/1.6.17/questions.yaml
diff --git a/test/minio/1.6.16/requirements.lock b/test/minio/1.6.17/requirements.lock
similarity index 100%
rename from test/minio/1.6.16/requirements.lock
rename to test/minio/1.6.17/requirements.lock
diff --git a/test/minio/1.6.16/templates/NOTES.txt b/test/minio/1.6.17/templates/NOTES.txt
similarity index 100%
rename from test/minio/1.6.16/templates/NOTES.txt
rename to test/minio/1.6.17/templates/NOTES.txt
diff --git a/test/minio/1.6.16/templates/_cert.tpl b/test/minio/1.6.17/templates/_cert.tpl
similarity index 100%
rename from test/minio/1.6.16/templates/_cert.tpl
rename to test/minio/1.6.17/templates/_cert.tpl
diff --git a/charts/minio/1.6.16/templates/_helpers.tpl b/test/minio/1.6.17/templates/_helpers.tpl
similarity index 85%
rename from charts/minio/1.6.16/templates/_helpers.tpl
rename to test/minio/1.6.17/templates/_helpers.tpl
index 55b50755aa..8fdf17e791 100644
--- a/charts/minio/1.6.16/templates/_helpers.tpl
+++ b/test/minio/1.6.17/templates/_helpers.tpl
@@ -56,11 +56,11 @@ Retrieve scheme/protocol for minio
 Retrieve command for minio application
 */}}
 {{- define "minio.commandArgs" -}}
-{{- $arg := "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':9001'" -}}
+{{- $arg := (printf "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':%d'" (.Values.service.consolePort | int)) -}}
 {{- if .Values.distributedMode -}}
 {{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}}
 {{- else -}}
-{{- cat $arg ((concat (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
+{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list "/export") (.Values.extraArgs | default list)) | join " ") -}}
 {{- end -}}
 {{- end -}}
 
diff --git a/test/minio/1.6.16/templates/configmap.yaml b/test/minio/1.6.17/templates/configmap.yaml
similarity index 100%
rename from test/minio/1.6.16/templates/configmap.yaml
rename to test/minio/1.6.17/templates/configmap.yaml
diff --git a/charts/minio/1.6.16/templates/deployment.yaml b/test/minio/1.6.17/templates/deployment.yaml
similarity index 96%
rename from charts/minio/1.6.16/templates/deployment.yaml
rename to test/minio/1.6.17/templates/deployment.yaml
index fa6f2ead47..66da2d202c 100644
--- a/charts/minio/1.6.16/templates/deployment.yaml
+++ b/test/minio/1.6.17/templates/deployment.yaml
@@ -46,9 +46,9 @@ spec:
             - {{ include "minio.commandArgs" . }}
           ports:
             - name: api
-              containerPort: 9000
+              containerPort: {{ .Values.service.nodePort | int }}
             - name: console
-              containerPort: 9001
+              containerPort: {{ .Values.service.consolePort | int }}
           env:
             {{ $secretName := (include "minio.secretName" .) }}
             {{ $envList := (default list .Values.environmentVariables) }}
diff --git a/test/minio/1.6.16/templates/pre-install-job.yaml b/test/minio/1.6.17/templates/pre-install-job.yaml
similarity index 100%
rename from test/minio/1.6.16/templates/pre-install-job.yaml
rename to test/minio/1.6.17/templates/pre-install-job.yaml
diff --git a/test/minio/1.6.16/templates/secrets.yaml b/test/minio/1.6.17/templates/secrets.yaml
similarity index 100%
rename from test/minio/1.6.16/templates/secrets.yaml
rename to test/minio/1.6.17/templates/secrets.yaml
diff --git a/charts/minio/1.6.16/templates/service.yaml b/test/minio/1.6.17/templates/service.yaml
similarity index 71%
rename from charts/minio/1.6.16/templates/service.yaml
rename to test/minio/1.6.17/templates/service.yaml
index fd2e6ba676..cbb4afc3dc 100644
--- a/charts/minio/1.6.16/templates/service.yaml
+++ b/test/minio/1.6.17/templates/service.yaml
@@ -1,11 +1,13 @@
+{{ if eq (include "minio.hostNetworking" .) "false" }}
 {{ $svc := .Values.service }}
 {{ $selectors := list }}
 {{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }}
 {{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }}
 {{ $ports := list }}
-{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }}
-{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }}
+{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" (.Values.service.nodePort | int)) }}
+{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" (.Values.service.consolePort | int)) }}
 {{ $params := . }}
 {{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }}
 {{ $_1 := set .Values "extraSelectorLabels" $selectors }}
 {{ include "common.classes.service" $params }}
+{{ end }}
diff --git a/test/minio/1.6.16/templates/serviceaccount.yaml b/test/minio/1.6.17/templates/serviceaccount.yaml
similarity index 100%
rename from test/minio/1.6.16/templates/serviceaccount.yaml
rename to test/minio/1.6.17/templates/serviceaccount.yaml
diff --git a/test/minio/1.6.16/templates/tests/deployment-check.yaml b/test/minio/1.6.17/templates/tests/deployment-check.yaml
similarity index 100%
rename from test/minio/1.6.16/templates/tests/deployment-check.yaml
rename to test/minio/1.6.17/templates/tests/deployment-check.yaml
diff --git a/test/minio/1.6.16/test_values.yaml b/test/minio/1.6.17/test_values.yaml
similarity index 100%
rename from test/minio/1.6.16/test_values.yaml
rename to test/minio/1.6.17/test_values.yaml