diff --git a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml b/examples/simple-airflow-cluster-ldap-insecure-tls.yaml
index 06c307b8..72dd0a36 100644
--- a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml
+++ b/examples/simple-airflow-cluster-ldap-insecure-tls.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/examples/simple-airflow-cluster-ldap.yaml b/examples/simple-airflow-cluster-ldap.yaml
index 0704048e..faa9c54a 100644
--- a/examples/simple-airflow-cluster-ldap.yaml
+++ b/examples/simple-airflow-cluster-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/30-install-openldap.yaml.j2 b/tests/templates/kuttl/ldap/30-install-openldap.yaml.j2
index df6bb0de..749e0e18 100644
--- a/tests/templates/kuttl/ldap/30-install-openldap.yaml.j2
+++ b/tests/templates/kuttl/ldap/30-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/50-install-test-container.yaml.j2 b/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2
index 9329f4d5..a42a83e4 100644
--- a/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2
+++ b/tests/templates/kuttl/oidc/50-install-test-container.yaml.j2
@@ -85,8 +85,16 @@ spec:
 
       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/oidc/install-keycloak.yaml.j2 b/tests/templates/kuttl/oidc/install-keycloak.yaml.j2
index 7197df2f..1770f432 100644
--- a/tests/templates/kuttl/oidc/install-keycloak.yaml.j2
+++ b/tests/templates/kuttl/oidc/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/opa/40-install-test-container.yaml.j2 b/tests/templates/kuttl/opa/40-install-test-container.yaml.j2
index 939fb1cf..1726ef8b 100644
--- a/tests/templates/kuttl/opa/40-install-test-container.yaml.j2
+++ b/tests/templates/kuttl/opa/40-install-test-container.yaml.j2
@@ -74,8 +74,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"