diff --git a/ci-operator/step-registry/ipi/deprovision/deprovision/OWNERS b/ci-operator/step-registry/ipi/deprovision/deprovision/OWNERS
deleted file mode 120000
index ec405d65a79df..0000000000000
--- a/ci-operator/step-registry/ipi/deprovision/deprovision/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-../OWNERS
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-chain.yaml b/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-chain.yaml
index 9628d9b15653d..1fcc8fd44842c 100644
--- a/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-chain.yaml
+++ b/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-chain.yaml
@@ -2,6 +2,6 @@ chain:
   as: ipi-deprovision
   steps:
   - chain: gather
-  - ref: ipi-deprovision-deprovision
+  - ref: ipi-deprovision
   documentation: |-
     The IPI deprovision step chain contains all the individual steps necessary to gather and deprovision an OpenShift cluster.
diff --git a/ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-commands.sh b/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-commands.sh
similarity index 100%
rename from ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-commands.sh
rename to ci-operator/step-registry/ipi/deprovision/ipi-deprovision-commands.sh
diff --git a/ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-ref.yaml b/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-ref.yaml
similarity index 65%
rename from ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-ref.yaml
rename to ci-operator/step-registry/ipi/deprovision/ipi-deprovision-ref.yaml
index 5df3d6716c066..6e37b62593b13 100644
--- a/ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-ref.yaml
+++ b/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-ref.yaml
@@ -1,7 +1,7 @@
 ref:
-  as: ipi-deprovision-deprovision
+  as: ipi-deprovision
   from: installer
-  commands: ipi-deprovision-deprovision-commands.sh
+  commands: ipi-deprovision-commands.sh
   resources:
     requests:
       cpu: 1000m
diff --git a/ci-operator/step-registry/ipi/deprovision/vsphere/ipi-deprovision-vsphere-commands.sh b/ci-operator/step-registry/ipi/deprovision/vsphere/ipi-deprovision-vsphere-commands.sh
index 1456fc593e684..499a14c568ed4 120000
--- a/ci-operator/step-registry/ipi/deprovision/vsphere/ipi-deprovision-vsphere-commands.sh
+++ b/ci-operator/step-registry/ipi/deprovision/vsphere/ipi-deprovision-vsphere-commands.sh
@@ -1 +1 @@
-../deprovision/ipi-deprovision-deprovision-commands.sh
\ No newline at end of file
+../ipi-deprovision-commands.sh
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/install/install/OWNERS b/ci-operator/step-registry/ipi/install/install/OWNERS
deleted file mode 120000
index ec405d65a79df..0000000000000
--- a/ci-operator/step-registry/ipi/install/install/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-../OWNERS
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/install/ipi-install-chain.yaml b/ci-operator/step-registry/ipi/install/ipi-install-chain.yaml
index 156e071e69fc1..26e9cb3a39706 100644
--- a/ci-operator/step-registry/ipi/install/ipi-install-chain.yaml
+++ b/ci-operator/step-registry/ipi/install/ipi-install-chain.yaml
@@ -2,6 +2,6 @@ chain:
   as: ipi-install
   steps:
   - ref: ipi-install-rbac
-  - ref: ipi-install-install
+  - ref: ipi-install
   documentation: |-
-    The IPI install step chain contains all the individual steps necessary to install an OpenShift cluster.
\ No newline at end of file
+    The IPI install step chain contains all the individual steps necessary to install an OpenShift cluster.
diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh b/ci-operator/step-registry/ipi/install/ipi-install-commands.sh
similarity index 100%
rename from ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
rename to ci-operator/step-registry/ipi/install/ipi-install-commands.sh
diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml b/ci-operator/step-registry/ipi/install/ipi-install-ref.yaml
similarity index 87%
rename from ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
rename to ci-operator/step-registry/ipi/install/ipi-install-ref.yaml
index 67eebe50f90d2..a0e552207188d 100644
--- a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
+++ b/ci-operator/step-registry/ipi/install/ipi-install-ref.yaml
@@ -1,7 +1,7 @@
 ref:
-  as: ipi-install-install
+  as: ipi-install
   from: installer
-  commands: ipi-install-install-commands.sh
+  commands: ipi-install-commands.sh
   resources:
     requests:
       cpu: 1000m
diff --git a/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-commands.sh b/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-commands.sh
index b27c3a0d97c88..5572d9bd81ba4 120000
--- a/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-commands.sh
+++ b/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-commands.sh
@@ -1 +1 @@
-../install/ipi-install-install-commands.sh
\ No newline at end of file
+../ipi-install-commands.sh
\ No newline at end of file
diff --git a/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-ref.yaml b/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-ref.yaml
index 55c4cd9cb8417..fce760c6dc39d 100644
--- a/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-ref.yaml
+++ b/ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-ref.yaml
@@ -7,4 +7,4 @@ ref:
       cpu: 10m
       memory: 100Mi
   documentation: |-
-          The SDN multi-manifest step adds the configuration for SDN multi-tenant networking to set of manifests for installation.  The script creates the manifest_cluster-network-03-config.yml file that is consumed by ipi-install-install.
+          The SDN multi-manifest step adds the configuration for SDN multi-tenant networking to set of manifests for installation.  The script creates the manifest_cluster-network-03-config.yml file that is consumed by ipi-install.
diff --git a/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-ref.yaml b/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-ref.yaml
index de4e7be7ca244..bfbd294df5477 100644
--- a/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-ref.yaml
+++ b/ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-ref.yaml
@@ -7,4 +7,4 @@ ref:
       cpu: 10m
       memory: 100Mi
   documentation: |-
-    The SDN single-manifest step adds the configuration for SDN single-tenant networking to set of manifests for installation. The script creates the manifest_cluster-network-03-config.yml file that is consumed by ipi-install-install.
+    The SDN single-manifest step adds the configuration for SDN single-tenant networking to set of manifests for installation. The script creates the manifest_cluster-network-03-config.yml file that is consumed by ipi-install.