diff --git a/examples/simple-trino-cluster-hive-ha-s3.yaml b/examples/simple-trino-cluster-hive-ha-s3.yaml
index 233acbb1..eb7edea7 100644
--- a/examples/simple-trino-cluster-hive-ha-s3.yaml
+++ b/examples/simple-trino-cluster-hive-ha-s3.yaml
@@ -1,6 +1,6 @@
-# stackablectl operator install commons secret hive trino
-# helm install minio minio --repo https://charts.bitnami.com/bitnami --set auth.rootUser=minio-access-key --set auth.rootPassword=minio-secret-key
-# helm upgrade hive --install --version=12.1.5 --set postgresqlUsername=hive --set postgresqlPassword=hive --set postgresqlDatabase=hive --repo https://charts.bitnami.com/bitnami postgresql
+# stackablectl operator install commons secret listener hive trino
+# helm install minio oci://registry-1.docker.io/bitnamicharts/minio --set auth.rootUser=minio-access-key --set auth.rootPassword=minio-secret-key --set global.security.allowInsecureImages=true --set image.repository=bitnamilegacy/minio --set clientImage.repository=bitnamilegacy/minio-client --set defaultInitContainers.volumePermissions.image.repository=bitnamilegacy/os-shell --set console.image.repository=bitnamilegacy/minio-object-browser
+# helm upgrade hive --install --version=12.1.5 --set auth.username=hive --set auth.password=hive --set auth.database=hive --set image.repository=bitnamilegacy/postgresql --set volumePermissions.image.repository=bitnamilegacy/os-shell --set metrics.image.repository=bitnamilegacy/postgres-exporter --set global.security.allowInsecureImages=true --repo https://charts.bitnami.com/bitnami postgresql
 # PostgreSQL is required for Hive HA to work! Does not work with Derby.
 ---
 apiVersion: trino.stackable.tech/v1alpha1
@@ -33,14 +33,14 @@ spec:
   connector:
     hive:
       metastore:
-        configMap: simple-hive-derby
+        configMap: simple-hive
       s3:
         reference: minio
 ---
 apiVersion: hive.stackable.tech/v1alpha1
 kind: HiveCluster
 metadata:
-  name: simple-hive-derby
+  name: simple-hive
 spec:
   image:
     productVersion: 4.0.0
diff --git a/examples/simple-trino-cluster-s3.yaml b/examples/simple-trino-cluster-s3.yaml
index 22ffe530..aa59aa01 100644
--- a/examples/simple-trino-cluster-s3.yaml
+++ b/examples/simple-trino-cluster-s3.yaml
@@ -1,5 +1,5 @@
-# stackablectl operator install commons secret hive zookeeper
-# helm install minio minio --repo https://charts.bitnami.com/bitnami --set auth.rootUser=minio-access-key --set auth.rootPassword=minio-secret-key
+# stackablectl operator install commons secret listener hive zookeeper trino
+# helm install minio oci://registry-1.docker.io/bitnamicharts/minio --set auth.rootUser=minio-access-key --set auth.rootPassword=minio-secret-key --set global.security.allowInsecureImages=true --set image.repository=bitnamilegacy/minio --set clientImage.repository=bitnamilegacy/minio-client --set defaultInitContainers.volumePermissions.image.repository=bitnamilegacy/os-shell --set console.image.repository=bitnamilegacy/minio-object-browser
 ---
 apiVersion: trino.stackable.tech/v1alpha1
 kind: TrinoCluster
diff --git a/tests/templates/kuttl/authentication/install-openldap-other.yaml.j2 b/tests/templates/kuttl/authentication/install-openldap-other.yaml.j2
index 2c96460d..bea9ccfd 100644
--- a/tests/templates/kuttl/authentication/install-openldap-other.yaml.j2
+++ b/tests/templates/kuttl/authentication/install-openldap-other.yaml.j2
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: "ldap-sa"
       containers:
         - name: openldap-other
-          image: docker.io/bitnami/openldap:2.5
+          image: docker.io/bitnamilegacy/openldap:2.5
           env:
             - name: LDAP_ADMIN_USERNAME
               value: admin
diff --git a/tests/templates/kuttl/authentication/install-openldap.yaml.j2 b/tests/templates/kuttl/authentication/install-openldap.yaml.j2
index d2b36cf7..140b868a 100644
--- a/tests/templates/kuttl/authentication/install-openldap.yaml.j2
+++ b/tests/templates/kuttl/authentication/install-openldap.yaml.j2
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: "ldap-sa"
       containers:
         - name: openldap
-          image: docker.io/bitnami/openldap:2.5
+          image: docker.io/bitnamilegacy/openldap:2.5
           env:
             - name: LDAP_ADMIN_USERNAME
               value: admin
diff --git a/tests/templates/kuttl/opa-authorization/helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/opa-authorization/helm-bitnami-minio-values.yaml.j2
index 71118547..dbf36b61 100644
--- a/tests/templates/kuttl/opa-authorization/helm-bitnami-minio-values.yaml.j2
+++ b/tests/templates/kuttl/opa-authorization/helm-bitnami-minio-values.yaml.j2
@@ -1,4 +1,21 @@
 ---
+global:
+  security:
+    allowInsecureImages: true
+
+image:
+  repository: bitnamilegacy/minio
+clientImage:
+  repository: bitnamilegacy/minio-client
+defaultInitContainers:
+  volumePermissions: # volumePermissions moved under defaultInitContainers starting with Chart version 17.0.0
+    enabled: false
+    image:
+      repository: bitnamilegacy/os-shell
+console:
+  image:
+    repository: bitnamilegacy/minio-object-browser
+
 mode: standalone
 disableWebUI: false
 extraEnvVars:
@@ -27,8 +44,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/opa-authorization/helm-bitnami-postgresql-values.yaml.j2 b/tests/templates/kuttl/opa-authorization/helm-bitnami-postgresql-values.yaml.j2
index 2526c3df..40dfcd33 100644
--- a/tests/templates/kuttl/opa-authorization/helm-bitnami-postgresql-values.yaml.j2
+++ b/tests/templates/kuttl/opa-authorization/helm-bitnami-postgresql-values.yaml.j2
@@ -1,9 +1,22 @@
 ---
+global:
+  security:
+    allowInsecureImages: true # needed starting with Chart version 16.3.0 if modifying images
+
+image:
+  repository: bitnamilegacy/postgresql
+
 volumePermissions:
   enabled: false
+  image:
+    repository: bitnamilegacy/os-shell
   securityContext:
     runAsUser: auto
 
+metrics:
+  image:
+    repository: bitnamilegacy/postgres-exporter
+
 primary:
   extendedConfiguration: |
     password_encryption=md5
diff --git a/tests/templates/kuttl/smoke/helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/smoke/helm-bitnami-minio-values.yaml.j2
index 71118547..6236fdf0 100644
--- a/tests/templates/kuttl/smoke/helm-bitnami-minio-values.yaml.j2
+++ b/tests/templates/kuttl/smoke/helm-bitnami-minio-values.yaml.j2
@@ -1,4 +1,21 @@
 ---
+global:
+  security:
+    allowInsecureImages: true # needed starting with Chart version 14.9.0 if modifying images
+
+image:
+  repository: bitnamilegacy/minio
+clientImage:
+  repository: bitnamilegacy/minio-client
+defaultInitContainers:
+  volumePermissions: # volumePermissions moved under defaultInitContainers starting with Chart version 17.0.0
+    enabled: false
+    image:
+      repository: bitnamilegacy/os-shell
+console:
+  image:
+    repository: bitnamilegacy/minio-object-browser
+
 mode: standalone
 disableWebUI: false
 extraEnvVars:
@@ -27,8 +44,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/smoke/helm-bitnami-postgresql-values.yaml.j2 b/tests/templates/kuttl/smoke/helm-bitnami-postgresql-values.yaml.j2
index 2526c3df..40dfcd33 100644
--- a/tests/templates/kuttl/smoke/helm-bitnami-postgresql-values.yaml.j2
+++ b/tests/templates/kuttl/smoke/helm-bitnami-postgresql-values.yaml.j2
@@ -1,9 +1,22 @@
 ---
+global:
+  security:
+    allowInsecureImages: true # needed starting with Chart version 16.3.0 if modifying images
+
+image:
+  repository: bitnamilegacy/postgresql
+
 volumePermissions:
   enabled: false
+  image:
+    repository: bitnamilegacy/os-shell
   securityContext:
     runAsUser: auto
 
+metrics:
+  image:
+    repository: bitnamilegacy/postgres-exporter
+
 primary:
   extendedConfiguration: |
     password_encryption=md5
diff --git a/tests/templates/kuttl/smoke_aws/helm-bitnami-postgresql-values.yaml.j2 b/tests/templates/kuttl/smoke_aws/helm-bitnami-postgresql-values.yaml.j2
index 2526c3df..40dfcd33 100644
--- a/tests/templates/kuttl/smoke_aws/helm-bitnami-postgresql-values.yaml.j2
+++ b/tests/templates/kuttl/smoke_aws/helm-bitnami-postgresql-values.yaml.j2
@@ -1,9 +1,22 @@
 ---
+global:
+  security:
+    allowInsecureImages: true # needed starting with Chart version 16.3.0 if modifying images
+
+image:
+  repository: bitnamilegacy/postgresql
+
 volumePermissions:
   enabled: false
+  image:
+    repository: bitnamilegacy/os-shell
   securityContext:
     runAsUser: auto
 
+metrics:
+  image:
+    repository: bitnamilegacy/postgres-exporter
+
 primary:
   extendedConfiguration: |
     password_encryption=md5