diff --git a/e2e-tests/create-cluster_test.go b/e2e-tests/create-cluster_test.go
index 302c2b724..afc62fbe1 100644
--- a/e2e-tests/create-cluster_test.go
+++ b/e2e-tests/create-cluster_test.go
@@ -366,6 +366,8 @@ var _ = Describe("CreateCluster", func() {
 			"NODE_VM_IMAGE_TEMPLATE=quay.io/kubevirtci/fedora-kubeadm:35",
 			"IMAGE_REPO=k8s.gcr.io",
 			"CRI_PATH=/var/run/crio/crio.sock",
+			"ROOT_VOLUME_SIZE=23Gi",
+			"STORAGE_CLASS_NAME=rook-ceph-block",
 		)
 		stdout, _ := tests.RunCmd(cmd)
 		err := os.WriteFile(manifestsFile, stdout, 0644)
diff --git a/kubevirtci b/kubevirtci
index 9dfca7a8f..9fe6f7df7 100755
--- a/kubevirtci
+++ b/kubevirtci
@@ -19,6 +19,7 @@ export KUBEVIRT_DEPLOY_CDI=false
 export KUBEVIRT_NUM_NODES=${KUBEVIRT_NUM_NODES:-1}
 export KUBEVIRT_MEMORY_SIZE=${KUBEVIRT_MEMORY_SIZE:-15360M}
 export KUBEVIRT_DEPLOY_CDI="true"
+export KUBEVIRT_STORAGE="rook-ceph-default"
 
 _default_bin_path=./hack/tools/bin
 _default_clusterctl_path=./hack/tools/bin/clusterctl
diff --git a/templates/cluster-template-persistent-storage.yaml b/templates/cluster-template-persistent-storage.yaml
index 46b08c9a7..8889085f2 100644
--- a/templates/cluster-template-persistent-storage.yaml
+++ b/templates/cluster-template-persistent-storage.yaml
@@ -50,8 +50,8 @@ spec:
                 - ReadWriteOnce
                 resources:
                   requests:
-                    storage: 6Gi
-                storageClassName: local
+                    storage: "${ROOT_VOLUME_SIZE}"
+                storageClassName: "${STORAGE_CLASS_NAME}"
               source:
                 registry:
                   url: "docker://${NODE_VM_IMAGE_TEMPLATE}"
@@ -118,8 +118,8 @@ spec:
                 - ReadWriteOnce
                 resources:
                   requests:
-                    storage: 6Gi
-                storageClassName: local
+                    storage: "${ROOT_VOLUME_SIZE}"
+                storageClassName: "${STORAGE_CLASS_NAME}"
               source:
                 registry:
                   url: "docker://${NODE_VM_IMAGE_TEMPLATE}"