diff --git a/tests/templates/kuttl/ldap/01_openldap.yaml.j2 b/tests/templates/kuttl/ldap/01_openldap.yaml.j2
index 5487d049..f7f38b25 100644
--- a/tests/templates/kuttl/ldap/01_openldap.yaml.j2
+++ b/tests/templates/kuttl/ldap/01_openldap.yaml.j2
@@ -69,11 +69,19 @@ spec:
               port: 1389
       volumes:
         - name: tls
-          csi:
-            driver: secrets.stackable.tech
-            volumeAttributes:
-              secrets.stackable.tech/class: openldap-tls
-              secrets.stackable.tech/scope: pod
+          ephemeral:
+            volumeClaimTemplate:
+              metadata:
+                annotations:
+                  secrets.stackable.tech/class: openldap-tls
+                  secrets.stackable.tech/scope: pod
+              spec:
+                storageClassName: secrets.stackable.tech
+                accessModes:
+                  - ReadWriteOnce
+                resources:
+                  requests:
+                    storage: "1"
 ---
 apiVersion: v1
 kind: Service
diff --git a/tests/templates/kuttl/oidc/51-install-test-container.yaml.j2 b/tests/templates/kuttl/oidc/51-install-test-container.yaml.j2
index 4365c312..f54e4c72 100644
--- a/tests/templates/kuttl/oidc/51-install-test-container.yaml.j2
+++ b/tests/templates/kuttl/oidc/51-install-test-container.yaml.j2
@@ -85,13 +85,21 @@ spec:
             - name: OIDC_USE_TLS
               value: "{{ test_scenario['values']['oidc-use-tls'] }}"
       volumes:
-        - name: tls
-          csi:
-            driver: secrets.stackable.tech
-            volumeAttributes:
-              secrets.stackable.tech/class: tls
-              secrets.stackable.tech/scope: pod
         - name: ingestion-check
           configMap:
             name: ingestion-check
+        - name: tls
+          ephemeral:
+            volumeClaimTemplate:
+              metadata:
+                annotations:
+                  secrets.stackable.tech/class: tls
+                  secrets.stackable.tech/scope: pod
+              spec:
+                storageClassName: secrets.stackable.tech
+                accessModes:
+                  - ReadWriteOnce
+                resources:
+                  requests:
+                    storage: "1"
       terminationGracePeriodSeconds: 1