diff --git a/tests/templates/kuttl/oidc/04_helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/oidc/04_helm-bitnami-minio-values.yaml.j2
index c9643e2e..2b257578 100644
--- a/tests/templates/kuttl/oidc/04_helm-bitnami-minio-values.yaml.j2
+++ b/tests/templates/kuttl/oidc/04_helm-bitnami-minio-values.yaml.j2
@@ -8,7 +8,8 @@ image:
 clientImage:
   repository: bitnamilegacy/minio-client
 defaultInitContainers:
-  volumePermissions:
+  volumePermissions: # volumePermissions moved under defaultInitContainers starting with Chart version 17.0.0
+    enabled: false
     image:
       repository: bitnamilegacy/os-shell
 console:
@@ -41,8 +42,11 @@ provisioning:
   containerSecurityContext:
     enabled: false
 
+# volumePermissions can be removed starting with Chart version 17.0.0, moved under defaultInitContainers
 volumePermissions:
   enabled: false
+  image:
+    repository: bitnamilegacy/os-shell
 
 podSecurityContext:
   enabled: false
diff --git a/tests/templates/kuttl/resources/02_helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/resources/02_helm-bitnami-minio-values.yaml.j2
index c9643e2e..2b257578 100644
--- a/tests/templates/kuttl/resources/02_helm-bitnami-minio-values.yaml.j2
+++ b/tests/templates/kuttl/resources/02_helm-bitnami-minio-values.yaml.j2
@@ -8,7 +8,8 @@ image:
 clientImage:
   repository: bitnamilegacy/minio-client
 defaultInitContainers:
-  volumePermissions:
+  volumePermissions: # volumePermissions moved under defaultInitContainers starting with Chart version 17.0.0
+    enabled: false
     image:
       repository: bitnamilegacy/os-shell
 console:
@@ -41,8 +42,11 @@ provisioning:
   containerSecurityContext:
     enabled: false
 
+# volumePermissions can be removed starting with Chart version 17.0.0, moved under defaultInitContainers
 volumePermissions:
   enabled: false
+  image:
+    repository: bitnamilegacy/os-shell
 
 podSecurityContext:
   enabled: false
diff --git a/tests/templates/kuttl/s3-deep-storage/04_helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/04_helm-bitnami-minio-values.yaml.j2
index c9643e2e..2b257578 100644
--- a/tests/templates/kuttl/s3-deep-storage/04_helm-bitnami-minio-values.yaml.j2
+++ b/tests/templates/kuttl/s3-deep-storage/04_helm-bitnami-minio-values.yaml.j2
@@ -8,7 +8,8 @@ image:
 clientImage:
   repository: bitnamilegacy/minio-client
 defaultInitContainers:
-  volumePermissions:
+  volumePermissions: # volumePermissions moved under defaultInitContainers starting with Chart version 17.0.0
+    enabled: false
     image:
       repository: bitnamilegacy/os-shell
 console:
@@ -41,8 +42,11 @@ provisioning:
   containerSecurityContext:
     enabled: false
 
+# volumePermissions can be removed starting with Chart version 17.0.0, moved under defaultInitContainers
 volumePermissions:
   enabled: false
+  image:
+    repository: bitnamilegacy/os-shell
 
 podSecurityContext:
   enabled: false
diff --git a/tests/templates/kuttl/tls/03_helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/tls/03_helm-bitnami-minio-values.yaml.j2
index afe2be7a..85410813 100644
--- a/tests/templates/kuttl/tls/03_helm-bitnami-minio-values.yaml.j2
+++ b/tests/templates/kuttl/tls/03_helm-bitnami-minio-values.yaml.j2
@@ -8,7 +8,8 @@ image:
 clientImage:
   repository: bitnamilegacy/minio-client
 defaultInitContainers:
-  volumePermissions:
+  volumePermissions: # volumePermissions moved under defaultInitContainers starting with Chart version 17.0.0
+    enabled: false
     image:
       repository: bitnamilegacy/os-shell
 console:
@@ -41,8 +42,11 @@ provisioning:
   containerSecurityContext:
     enabled: false
 
+# volumePermissions can be removed starting with Chart version 17.0.0, moved under defaultInitContainers
 volumePermissions:
   enabled: false
+  image:
+    repository: bitnamilegacy/os-shell
 
 podSecurityContext:
   enabled: false