diff --git a/ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml b/ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml
index 9cf32f8f33aca..0d3b1bb8d74bf 100644
--- a/ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml
+++ b/ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml
@@ -4,11 +4,11 @@ workflow:
     pre:
     - chain: ipi-conf-azure
     - ref: ipi-conf-azure-ultrassd
-    - ref: storage-conf-storageclass-pre-set-default-azure-disk-ultrassd
     - chain: azure-provision-service-principal-minimal-permission
     - ref: rhcos-conf-osstream
     - chain: ipi-install
     - ref: ipi-azure-rbac
+    - ref: storage-conf-storageclass-add-azure-disk-ultrassd
     - ref: storage-conf-csi-azure-disk
     - ref: storage-conf-wait-for-csi-driver
     - ref: storage-obj-save
@@ -28,5 +28,5 @@ workflow:
   documentation: |-
     The Openshift E2E Azure CSI UltraSSD workflow executes the openshift/csi end-to-end test
     suite on Azure Disk CSI driver with UltraSSD capability enabled and an UltraSSD_LRS
-    StorageClass set as default. This is required for VolumeAttributesClass tests which only
+    StorageClass. This is required for VolumeAttributesClass tests which only
     work with UltraSSD_LRS or PremiumV2_LRS disk types.
diff --git a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/OWNERS b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/OWNERS
similarity index 100%
rename from ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/OWNERS
rename to ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/OWNERS
diff --git a/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-commands.sh b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-commands.sh
new file mode 100644
index 0000000000000..021396d04ac10
--- /dev/null
+++ b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-commands.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+oc apply -f - <<EOF
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: managed-csi-ultrassd
+provisioner: disk.csi.azure.com
+parameters:
+  skuName: UltraSSD_LRS
+volumeBindingMode: WaitForFirstConsumer
+allowVolumeExpansion: true
+reclaimPolicy: Delete
+EOF
diff --git a/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-ref.metadata.json b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-ref.metadata.json
new file mode 100644
index 0000000000000..2729d7b6febd8
--- /dev/null
+++ b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-ref.metadata.json
@@ -0,0 +1,11 @@
+{
+	"path": "storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-ref.yaml",
+	"owners": {
+		"approvers": [
+			"storage-approvers"
+		],
+		"reviewers": [
+			"storage-reviewers"
+		]
+	}
+}
\ No newline at end of file
diff --git a/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-ref.yaml b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-ref.yaml
new file mode 100644
index 0000000000000..8ba796e9d5be0
--- /dev/null
+++ b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-ref.yaml
@@ -0,0 +1,12 @@
+ref:
+  as: storage-conf-storageclass-add-azure-disk-ultrassd
+  from: cli
+  cli: latest
+  commands: storage-conf-storageclass-add-azure-disk-ultrassd-commands.sh
+  resources:
+    requests:
+      cpu: 10m
+      memory: 100Mi
+  documentation: |-
+    The `storage-conf-storageclass-add-azure-disk-ultrassd` step creates an
+    additional UltraSSD_LRS Azure Disk StorageClass on a running cluster after ipi-install.
diff --git a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh b/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh
deleted file mode 100644
index 85f9810f3fcf4..0000000000000
--- a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-set -o errexit
-set -o nounset
-set -o pipefail
-
-cat << EOF > ${SHARED_DIR}/manifest_storageclass.yaml
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: managed-csi-ultrassd
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
-provisioner: disk.csi.azure.com
-parameters:
-  skuName: UltraSSD_LRS
-volumeBindingMode: WaitForFirstConsumer
-allowVolumeExpansion: true
-reclaimPolicy: Delete
-EOF
-
-cat << EOF > ${SHARED_DIR}/manifest_cluster_csi_driver.yaml
-apiVersion: operator.openshift.io/v1
-kind: "ClusterCSIDriver"
-metadata:
-  name: "disk.csi.azure.com"
-spec:
-  logLevel: Normal
-  managementState: Managed
-  operatorLogLevel: Normal
-  storageClassState: Unmanaged
-EOF
diff --git a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.metadata.json b/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.metadata.json
deleted file mode 100644
index e850cd15be19b..0000000000000
--- a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.yaml",
-	"owners": {
-		"approvers": [
-			"storage-approvers"
-		],
-		"reviewers": [
-			"storage-reviewers"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.yaml b/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.yaml
deleted file mode 100644
index 1597207881546..0000000000000
--- a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-ref:
-  as: storage-conf-storageclass-pre-set-default-azure-disk-ultrassd
-  from: cli
-  cli: latest
-  commands: storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh
-  resources:
-    requests:
-      cpu: 10m
-      memory: 100Mi
-  documentation: |-
-    The `storage-conf-storageclass-pre-set-default-azure-disk-ultrassd` step sets the cluster
-    default storageclass to an UltraSSD_LRS Azure Disk one before ipi-install.