diff --git a/tests/templates/kuttl/iceberg/25_helm-bitnami-postgresql-values.yaml.j2 b/tests/templates/kuttl/iceberg/25_helm-bitnami-postgresql-values.yaml.j2
index 2526c3df..40dfcd33 100644
--- a/tests/templates/kuttl/iceberg/25_helm-bitnami-postgresql-values.yaml.j2
+++ b/tests/templates/kuttl/iceberg/25_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/ldap/install-openldap.yaml.j2 b/tests/templates/kuttl/ldap/install-openldap.yaml.j2
index 8622b148..bd55ba77 100644
--- a/tests/templates/kuttl/ldap/install-openldap.yaml.j2
+++ b/tests/templates/kuttl/ldap/install-openldap.yaml.j2
@@ -39,7 +39,7 @@ spec:
         fsGroup: 1000
       containers:
         - name: openldap
-          image: docker.io/bitnami/openldap:2.5
+          image: docker.io/bitnamilegacy/openldap:2.5
           env:
             - name: LDAP_ADMIN_USERNAME
               value: admin