diff --git a/examples/superset-with-ldap.yaml b/examples/superset-with-ldap.yaml
index b63c3700..d1bfe404 100644
--- a/examples/superset-with-ldap.yaml
+++ b/examples/superset-with-ldap.yaml
@@ -64,11 +64,19 @@ spec:
               mountPath: /tls
       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/ldap/20-install-openldap.yaml.j2 b/tests/templates/kuttl/ldap/20-install-openldap.yaml.j2
index 6a541f0e..83080cdd 100644
--- a/tests/templates/kuttl/ldap/20-install-openldap.yaml.j2
+++ b/tests/templates/kuttl/ldap/20-install-openldap.yaml.j2
@@ -76,11 +76,19 @@ commands:
                     port: 1389
             volumes:
               - name: tls
-                csi:
-                  driver: secrets.stackable.tech
-                  volumeAttributes:
-                    secrets.stackable.tech/class: openldap-tls-$NAMESPACE
-                    secrets.stackable.tech/scope: pod
+                ephemeral:
+                  volumeClaimTemplate:
+                    metadata:
+                      annotations:
+                        secrets.stackable.tech/class: openldap-tls-$NAMESPACE
+                        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/30_install-keycloak.yaml.j2 b/tests/templates/kuttl/oidc/30_install-keycloak.yaml.j2
index 5509b5c5..f9098fc2 100644
--- a/tests/templates/kuttl/oidc/30_install-keycloak.yaml.j2
+++ b/tests/templates/kuttl/oidc/30_install-keycloak.yaml.j2
@@ -101,11 +101,19 @@ spec:
           configMap:
             name: $INSTANCE_NAME-realms
         - name: tls
-          csi:
-            driver: secrets.stackable.tech
-            volumeAttributes:
-              secrets.stackable.tech/class: tls
-              secrets.stackable.tech/scope: service=$INSTANCE_NAME
+          ephemeral:
+            volumeClaimTemplate:
+              metadata:
+                annotations:
+                  secrets.stackable.tech/class: tls
+                  secrets.stackable.tech/scope: service=$INSTANCE_NAME
+              spec:
+                storageClassName: secrets.stackable.tech
+                accessModes:
+                  - ReadWriteOnce
+                resources:
+                  requests:
+                    storage: "1"
 ---
 apiVersion: v1
 kind: Service
diff --git a/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2 b/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2
index 5119ca9b..aa975b37 100644
--- a/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2
+++ b/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2
@@ -73,8 +73,16 @@ spec:
               value: /stackable/tls/ca.crt
       volumes:
         - name: tls
-          csi:
-            driver: secrets.stackable.tech
-            volumeAttributes:
-              secrets.stackable.tech/class: tls
-              secrets.stackable.tech/scope: pod
+          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"
diff --git a/tests/templates/kuttl/opa/51-install-test-container.yaml.j2 b/tests/templates/kuttl/opa/51-install-test-container.yaml.j2
index 1aff92de..f875d3c2 100644
--- a/tests/templates/kuttl/opa/51-install-test-container.yaml.j2
+++ b/tests/templates/kuttl/opa/51-install-test-container.yaml.j2
@@ -76,12 +76,20 @@ spec:
             - name: SUPERSET_BASE_URL
               value: superset-node.$NAMESPACE.svc.cluster.local:8088
       volumes:
-        - name: tls
-          csi:
-            driver: secrets.stackable.tech
-            volumeAttributes:
-              secrets.stackable.tech/class: tls
-              secrets.stackable.tech/scope: pod
         - name: get-user-roles-script
           configMap:
             name: get-user-roles-script
+        - 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"