diff --git a/cmd/config/egressip/egressip.yml b/cmd/config/egressip/egressip.yml
index 3e21a11a..1785e4a6 100644
--- a/cmd/config/egressip/egressip.yml
+++ b/cmd/config/egressip/egressip.yml
@@ -1,3 +1,6 @@
+# This workload has special hardware requirements.
+# In order to meet those requirements we have added CI tests in e2e-benchmarking: 
+# https://github.com/openshift/release/tree/master/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking
 ---
 global:
   gc: {{.GC}}
diff --git a/cmd/config/rds-core/rds-core.yml b/cmd/config/rds-core/rds-core.yml
index ad45e8e1..767cba8c 100644
--- a/cmd/config/rds-core/rds-core.yml
+++ b/cmd/config/rds-core/rds-core.yml
@@ -1,3 +1,6 @@
+# This workload has special hardware requirements.
+# In order to meet those requirements we have added CI tests in e2e-benchmarking: 
+# https://github.com/openshift/release/tree/master/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking
 ---
 global:
   gc: {{.GC}}
diff --git a/cmd/config/udn-density-pods/udn-density-pods.yml b/cmd/config/udn-density-pods/udn-density-pods.yml
index 8c38325e..6b6e3724 100644
--- a/cmd/config/udn-density-pods/udn-density-pods.yml
+++ b/cmd/config/udn-density-pods/udn-density-pods.yml
@@ -1,3 +1,6 @@
+# This workload has special hardware requirements.
+# In order to meet those requirements we have added CI tests in e2e-benchmarking: 
+# https://github.com/openshift/release/tree/master/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking
 ---
 global:
   gc: {{.GC}}
diff --git a/cmd/config/web-burner-cluster-density/web-burner-cluster-density.yml b/cmd/config/web-burner-cluster-density/web-burner-cluster-density.yml
index 444c51a9..844e4297 100644
--- a/cmd/config/web-burner-cluster-density/web-burner-cluster-density.yml
+++ b/cmd/config/web-burner-cluster-density/web-burner-cluster-density.yml
@@ -1,3 +1,5 @@
+# This feature is under the deprecation path and will be removed in a future release.
+---
 global:
   gc: {{.GC}}
   gcMetrics: {{.GC_METRICS}}
diff --git a/cmd/config/web-burner-init/web-burner-init.yml b/cmd/config/web-burner-init/web-burner-init.yml
index 06272e53..898fa752 100644
--- a/cmd/config/web-burner-init/web-burner-init.yml
+++ b/cmd/config/web-burner-init/web-burner-init.yml
@@ -1,3 +1,4 @@
+# This feature is under the deprecation path and will be removed in a future release.
 ---
 global:
   gc: {{.GC}}
diff --git a/cmd/config/web-burner-node-density/web-burner-node-density.yml b/cmd/config/web-burner-node-density/web-burner-node-density.yml
index 1bcd242b..01f3ac3c 100644
--- a/cmd/config/web-burner-node-density/web-burner-node-density.yml
+++ b/cmd/config/web-burner-node-density/web-burner-node-density.yml
@@ -1,3 +1,4 @@
+# This feature is under the deprecation path and will be removed in a future release.
 ---
 global:
   gc: {{.GC}}
diff --git a/pvc-density.go b/pvc-density.go
index cfecac80..84e835bf 100644
--- a/pvc-density.go
+++ b/pvc-density.go
@@ -33,6 +33,7 @@ var dynamicStorageProvisioners = map[string]string{
 	"gce":        "kubernetes.io/gce-pd",
 	"ibm":        "powervs.csi.ibm.com",
 	"vsphere":    "kubernetes.io/vsphere-volume",
+	"oci":        "blockvolume.csi.oraclecloud.com",
 }
 
 // NewPVCDensity holds pvc-density workload
@@ -57,7 +58,7 @@ func NewPVCDensity(wh *workloads.WorkloadHelper) *cobra.Command {
 			for key := range dynamicStorageProvisioners {
 				storageProvisioners = append(storageProvisioners, key)
 			}
-			re := regexp.MustCompile(`(?sm)^(cinder|azure\-disk|azure\-file|gce|ibm|vsphere|aws)$`)
+			re := regexp.MustCompile(`(?sm)^(cinder|azure\-disk|azure\-file|gce|ibm|vsphere|aws|oci)$`)
 			if !re.MatchString(provisioner) {
 				log.Fatal(fmt.Errorf("%s does not match one of %s", provisioner, storageProvisioners))
 			}
diff --git a/test/test-ocp.bats b/test/test-ocp.bats
index e4efb31d..5342bc54 100755
--- a/test/test-ocp.bats
+++ b/test/test-ocp.bats
@@ -81,22 +81,44 @@ teardown_file() {
 }
 
 @test "index: metrics-endpoints=true; es-indexing=true" {
-  run_cmd kube-burner-ocp index --uuid="${UUID}" --metrics-endpoint metrics-endpoints.yaml --metrics-profile metrics.yml --es-server=https://search-perfscale-dev-chmf5l4sh66lvxbnadi4bznl3a.us-west-2.es.amazonaws.com:443 --es-index=ripsaw-kube-burner --user-metadata user-metadata.yml
+  run_cmd kube-burner-ocp index --uuid="${UUID}" --metrics-endpoint metrics-endpoints.yaml --metrics-profile metrics.yml --es-server=$PERFSCALE_PROD_ES_SERVER --es-index=ripsaw-kube-burner --user-metadata user-metadata.yml
+}
+
+@test "networkpolicy" {
+  run_cmd kube-burner-ocp network-policy --iterations 2 ${COMMON_FLAGS} --uuid=${UUID}
+}
+
+@test "networkpolicy-matchexpressions" {
+  run_cmd kube-burner-ocp networkpolicy-matchexpressions --iterations 2 ${COMMON_FLAGS} --uuid=${UUID}
+}
+
+@test "networkpolicy-matchlabels" {
+  run_cmd kube-burner-ocp networkpolicy-matchlabels --iterations 2 ${COMMON_FLAGS} --uuid=${UUID}
 }
 
 @test "networkpolicy-multitenant" {
   run_cmd kube-burner-ocp networkpolicy-multitenant --iterations 5 ${COMMON_FLAGS} --uuid=${UUID}
 }
 
+@test "whereabouts" {
+  run_cmd kube-burner-ocp whereabouts --iterations 2 ${COMMON_FLAGS} --uuid=${UUID}
+}
+
 @test "crd-scale; alerting=false" {
-  run_cmd kube-burner-ocp crd-scale --iterations=10 --alerting=false
+  run_cmd kube-burner-ocp crd-scale --iterations=2 --alerting=false
+}
+
+@test "pvc-density" {
+  PVC_DENSITY_STORAGE_CLASS=${PVC_DENSITY_STORAGE_CLASS:-oci}
+  run_cmd kube-burner-ocp pvc-density --iterations=2 --provisioner $PVC_DENSITY_STORAGE_CLASS
 }
 
 @test "virt-density" {
-  run_cmd kube-burner-ocp virt-density --vms-per-node=10 --uuid=${UUID} ${COMMON_FLAGS}
+  run_cmd kube-burner-ocp virt-density --vms-per-node=2 --uuid=${UUID} ${COMMON_FLAGS}
   check_metric_value jobSummary vmiLatencyMeasurement vmiLatencyQuantilesMeasurement
 }
 
+# This test is under the deprecation path and will be removed in a future update.
 @test "web-burner-node-density" {
   LB_WORKER=$(oc get node | grep worker | head -n 1 | cut -f 1 -d' ')
   run_cmd oc label node $LB_WORKER node-role.kubernetes.io/worker-spk="" --overwrite
@@ -108,6 +130,7 @@ teardown_file() {
   run_cmd oc delete project served-ns-0 serving-ns-0
 }
 
+# This test is under the deprecation path and will be removed in a future update.
 @test "web-burner-cluster-density" {
   LB_WORKER=$(oc get node | grep worker | head -n 1 | cut -f 1 -d' ')
   run_cmd oc label node $LB_WORKER node-role.kubernetes.io/worker-spk="" --overwrite