diff --git a/kuttl/tests/helm/c3-with-apps-private-link/03-install-c3.yaml b/kuttl/tests/helm/c3-with-apps-private-link/03-install-c3.yaml
index d5a3330d1..428664a12 100644
--- a/kuttl/tests/helm/c3-with-apps-private-link/03-install-c3.yaml
+++ b/kuttl/tests/helm/c3-with-apps-private-link/03-install-c3.yaml
@@ -2,5 +2,5 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: helm install splunk-c3 $HELM_REPO_PATH/splunk-enterprise -f c3_config.yaml --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
+  - command: helm install splunk-c3 $HELM_REPO_PATH/splunk-enterprise -f c3_config.yaml  --set splunk-operator.splunkOperator.clusterWideAccess=false  --set splunk-operator.splunkOperator.persistentVolumeClaim.storageClassName=gp2 --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
     namespaced: true
\ No newline at end of file
diff --git a/kuttl/tests/helm/m4-with-operator/00-install-m4.yaml b/kuttl/tests/helm/m4-with-operator/00-install-m4.yaml
index ecbb45a2b..9503d8593 100644
--- a/kuttl/tests/helm/m4-with-operator/00-install-m4.yaml
+++ b/kuttl/tests/helm/m4-with-operator/00-install-m4.yaml
@@ -2,5 +2,5 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: helm install splunk-m4 $HELM_REPO_PATH/splunk-enterprise -f m4_config.yaml --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
+  - command: helm install splunk-m4 $HELM_REPO_PATH/splunk-enterprise -f m4_config.yaml  --set splunk-operator.splunkOperator.clusterWideAccess=false  --set splunk-operator.splunkOperator.persistentVolumeClaim.storageClassName=gp2 --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
     namespaced: true
diff --git a/kuttl/tests/helm/operator-with-ephemeral-volume/01-install-standalone.yaml b/kuttl/tests/helm/operator-with-ephemeral-volume/01-install-standalone.yaml
index 48500e4b5..ba3f06ec6 100644
--- a/kuttl/tests/helm/operator-with-ephemeral-volume/01-install-standalone.yaml
+++ b/kuttl/tests/helm/operator-with-ephemeral-volume/01-install-standalone.yaml
@@ -1,5 +1,5 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: helm install splunk-stdl $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
+  - command: helm install splunk-stdl $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml  --set splunk-operator.splunkOperator.clusterWideAccess=false  --set splunk-operator.splunkOperator.persistentVolumeClaim.storageClassName=gp2 --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
     namespaced: true
diff --git a/kuttl/tests/helm/s1-with-extra-manifests/01-install-standalone.yaml b/kuttl/tests/helm/s1-with-extra-manifests/01-install-standalone.yaml
index 48500e4b5..ba3f06ec6 100644
--- a/kuttl/tests/helm/s1-with-extra-manifests/01-install-standalone.yaml
+++ b/kuttl/tests/helm/s1-with-extra-manifests/01-install-standalone.yaml
@@ -1,5 +1,5 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: helm install splunk-stdl $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
+  - command: helm install splunk-stdl $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml  --set splunk-operator.splunkOperator.clusterWideAccess=false  --set splunk-operator.splunkOperator.persistentVolumeClaim.storageClassName=gp2 --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
     namespaced: true
diff --git a/kuttl/tests/helm/s1-with-operator/01-install-standalone.yaml b/kuttl/tests/helm/s1-with-operator/01-install-standalone.yaml
index 48500e4b5..ba3f06ec6 100644
--- a/kuttl/tests/helm/s1-with-operator/01-install-standalone.yaml
+++ b/kuttl/tests/helm/s1-with-operator/01-install-standalone.yaml
@@ -1,5 +1,5 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: helm install splunk-stdl $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
+  - command: helm install splunk-stdl $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml  --set splunk-operator.splunkOperator.clusterWideAccess=false  --set splunk-operator.splunkOperator.persistentVolumeClaim.storageClassName=gp2 --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
     namespaced: true
diff --git a/kuttl/tests/helm/s1-with-smartstore/03-install-s1.yaml b/kuttl/tests/helm/s1-with-smartstore/03-install-s1.yaml
index 566b0c6cf..27d8e5bde 100644
--- a/kuttl/tests/helm/s1-with-smartstore/03-install-s1.yaml
+++ b/kuttl/tests/helm/s1-with-smartstore/03-install-s1.yaml
@@ -2,5 +2,5 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: helm install splunk-s1 $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
+  - command: helm install splunk-s1 $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE}  --set splunk-operator.splunkOperator.clusterWideAccess=false  --set splunk-operator.splunkOperator.persistentVolumeClaim.storageClassName=gp2 --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
     namespaced: true
\ No newline at end of file
diff --git a/kuttl/tests/helm/s1-with-topology-spread-constraints/01-install-standalone.yaml b/kuttl/tests/helm/s1-with-topology-spread-constraints/01-install-standalone.yaml
index a560ae42d..635fba212 100644
--- a/kuttl/tests/helm/s1-with-topology-spread-constraints/01-install-standalone.yaml
+++ b/kuttl/tests/helm/s1-with-topology-spread-constraints/01-install-standalone.yaml
@@ -1,5 +1,5 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: helm install splunk-stdl $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunkOperator.clusterWideAccess=false  --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
+  - command: helm install splunk-stdl $HELM_REPO_PATH/splunk-enterprise -f s1_config.yaml --set splunk-operator.splunkOperator.image.repository=${KUTTL_SPLUNK_OPERATOR_IMAGE} --set splunk-operator.splunkOperator.clusterWideAccess=false  --set splunk-operator.splunkOperator.persistentVolumeClaim.storageClassName=gp2 --set splunk-operator.image.repository=${KUTTL_SPLUNK_ENTERPRISE_IMAGE}
     namespaced: true