diff --git a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master.yaml b/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master.yaml
index a7c92dbc8f9a8..2bd9051bee641 100644
--- a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master.yaml
+++ b/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master.yaml
@@ -18,6 +18,9 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9
   to: csi-driver-manila-operator
+- dockerfile_path: Dockerfile.test
+  from: src
+  to: manila-csi-driver-operator-test
 promotion:
   name: "4.9"
   namespace: ocp
@@ -42,6 +45,10 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml
   container:
     from: src
+- as: e2e-openstack-csi
+  steps:
+    cluster_profile: openstack-vh-mecha
+    workflow: openshift-e2e-openstack-csi-manila
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-presubmits.yaml
index a683fef7e59c5..d2b9ec55e6cf4 100644
--- a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-presubmits.yaml
@@ -75,6 +75,71 @@ presubmits:
         secret:
           secretName: registry-pull-credentials
     trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: build02
+    context: ci/prow/e2e-openstack-csi
+    decorate: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-csi-driver-manila-operator-master-e2e-openstack-csi
+    optional: true
+    rerun_command: /test e2e-openstack-csi
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/usr/local/e2e-openstack-csi-cluster-profile
+        - --target=e2e-openstack-csi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-csi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack-vh-mecha
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/step-registry/openshift/e2e/openstack/csi/manila/OWNERS b/ci-operator/step-registry/openshift/e2e/openstack/csi/manila/OWNERS
new file mode 100644
index 0000000000000..98221046253ba
--- /dev/null
+++ b/ci-operator/step-registry/openshift/e2e/openstack/csi/manila/OWNERS
@@ -0,0 +1,15 @@
+approvers:
+- openstack-approvers
+- bertinatto
+- gnufied
+- huffmanca
+- jsafrane
+- tsmetana
+
+reviewers:
+- openstack-reviewers
+- bertinatto
+- gnufied
+- huffmanca
+- jsafrane
+- tsmetana
diff --git a/ci-operator/step-registry/openshift/e2e/openstack/csi/manila/openshift-e2e-openstack-csi-manila-workflow.metadata.json b/ci-operator/step-registry/openshift/e2e/openstack/csi/manila/openshift-e2e-openstack-csi-manila-workflow.metadata.json
new file mode 100644
index 0000000000000..6baf4854c2972
--- /dev/null
+++ b/ci-operator/step-registry/openshift/e2e/openstack/csi/manila/openshift-e2e-openstack-csi-manila-workflow.metadata.json
@@ -0,0 +1,21 @@
+{
+	"path": "openshift/e2e/openstack/csi/manila/openshift-e2e-openstack-csi-manila-workflow.yaml",
+	"owners": {
+		"approvers": [
+			"openstack-approvers",
+			"bertinatto",
+			"gnufied",
+			"huffmanca",
+			"jsafrane",
+			"tsmetana"
+		],
+		"reviewers": [
+			"openstack-reviewers",
+			"bertinatto",
+			"gnufied",
+			"huffmanca",
+			"jsafrane",
+			"tsmetana"
+		]
+	}
+}
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift/e2e/openstack/csi/manila/openshift-e2e-openstack-csi-manila-workflow.yaml b/ci-operator/step-registry/openshift/e2e/openstack/csi/manila/openshift-e2e-openstack-csi-manila-workflow.yaml
new file mode 100644
index 0000000000000..09226531c0a97
--- /dev/null
+++ b/ci-operator/step-registry/openshift/e2e/openstack/csi/manila/openshift-e2e-openstack-csi-manila-workflow.yaml
@@ -0,0 +1,19 @@
+workflow:
+  as: openshift-e2e-openstack-csi-manila
+  steps:
+    pre:
+    - chain: ipi-openstack-pre
+    - ref: storage-pv-save
+    - ref: storage-conf-csi-openstack-manila
+    test:
+    - ref: openshift-e2e-test
+    post:
+    - ref: storage-pv-check
+    - chain: ipi-openstack-post
+    env:
+      CONFIG_TYPE: "minimal"
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      TEST_CSI_DRIVER_MANIFEST: manifest-openstack-manila.yaml
+      TEST_SUITE: openshift/csi
+  documentation: |-
+    The Openshift E2E OpenStack `csi manila` workflow installs OpenStack Manila CSI driver and executes the `openshift/csi` end-to-end test suite on OpenStack with a default cluster configuration and a manifest to test Manila resources.
diff --git a/ci-operator/step-registry/storage/conf/csi-openstack-manila/OWNERS b/ci-operator/step-registry/storage/conf/csi-openstack-manila/OWNERS
new file mode 100644
index 0000000000000..1201ba9f24b1a
--- /dev/null
+++ b/ci-operator/step-registry/storage/conf/csi-openstack-manila/OWNERS
@@ -0,0 +1,13 @@
+approvers:
+- bertinatto
+- gnufied
+- huffmanca
+- jsafrane
+- tsmetana
+
+reviewers:
+- bertinatto
+- gnufied
+- huffmanca
+- jsafrane
+- tsmetana
diff --git a/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-commands.sh b/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-commands.sh
new file mode 100644
index 0000000000000..fec2f93bc4583
--- /dev/null
+++ b/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-commands.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cd /go/src/github.com/openshift/csi-driver-manila-operator
+cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
+
+# For debugging
+echo "Using ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}:"
+cat ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
diff --git a/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-ref.metadata.json b/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-ref.metadata.json
new file mode 100644
index 0000000000000..ea10f5e15a920
--- /dev/null
+++ b/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-ref.metadata.json
@@ -0,0 +1,19 @@
+{
+	"path": "storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-ref.yaml",
+	"owners": {
+		"approvers": [
+			"bertinatto",
+			"gnufied",
+			"huffmanca",
+			"jsafrane",
+			"tsmetana"
+		],
+		"reviewers": [
+			"bertinatto",
+			"gnufied",
+			"huffmanca",
+			"jsafrane",
+			"tsmetana"
+		]
+	}
+}
\ No newline at end of file
diff --git a/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-ref.yaml b/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-ref.yaml
new file mode 100644
index 0000000000000..371ce3e8c548a
--- /dev/null
+++ b/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-ref.yaml
@@ -0,0 +1,18 @@
+ref:
+  as: storage-conf-csi-openstack-manila
+  # Canonical location of the CSI driver manifest
+  from: manila-csi-driver-operator-test
+  commands: storage-conf-csi-openstack-manila-commands.sh
+  resources:
+    requests:
+      cpu: 10m
+      memory: 100Mi
+  env:
+  - name: TEST_CSI_DRIVER_MANIFEST
+    documentation: |-
+      The CSI driver manifest to create.  Used by the `openshift-tests` as a
+      manifest for openshift/csi tests. The file must be in ${SHARED_DIR}.
+  documentation: |-
+    The csi-openstack-manila step creates ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST} for
+    OpenStack Manila CSI driver, which is consumed by openshift-e2e-test step to
+    run CSI driver certification suite.