diff --git a/ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml b/ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml
index f55d0de025a5e..ba17d0e7dd9d0 100644
--- a/ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml
@@ -491,6 +491,27 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )services-valid,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    context: ci/prow/step-registry-shellcheck
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-release-master-step-registry-shellcheck
+    rerun_command: /test step-registry-shellcheck
+    spec:
+      containers:
+      - command:
+        - hack/validate-registry-commands.sh
+        image: registry.svc.ci.openshift.org/ci/shellcheck
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+    trigger: (?m)^/test( | .* )step-registry-shellcheck,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/step-registry/ipi/OWNERS b/ci-operator/step-registry/ipi/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/deprovision/OWNERS b/ci-operator/step-registry/ipi/deprovision/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/deprovision/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/OWNERS b/ci-operator/step-registry/ipi/deprovision/artifacts/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/deprovision/artifacts/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/artifacts/OWNERS b/ci-operator/step-registry/ipi/deprovision/artifacts/artifacts/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/deprovision/artifacts/artifacts/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/artifacts/ipi-deprovision-artifacts-artifacts-commands.sh b/ci-operator/step-registry/ipi/deprovision/artifacts/artifacts/ipi-deprovision-artifacts-artifacts-commands.sh
index 0ba4395f30774..dfb7b7487a6a7 100644
--- a/ci-operator/step-registry/ipi/deprovision/artifacts/artifacts/ipi-deprovision-artifacts-artifacts-commands.sh
+++ b/ci-operator/step-registry/ipi/deprovision/artifacts/artifacts/ipi-deprovision-artifacts-artifacts-commands.sh
@@ -2,7 +2,8 @@
 function queue() {
   local TARGET="${1}"
   shift
-  local LIVE="$(jobs | wc -l)"
+  local LIVE
+  LIVE="$(jobs | wc -l)"
   while [[ "${LIVE}" -ge 45 ]]; do
     sleep 1
     LIVE="$(jobs | wc -l)"
@@ -83,4 +84,4 @@ while IFS= read -r i; do
 done < /tmp/containers
 
 echo "Snapshotting prometheus (may take 15s) ..."
-queue ${ARTIFACT_DIR}/metrics/prometheus.tar.gz oc --insecure-skip-tls-verify exec -n openshift-monitoring prometheus-k8s-0 -- tar cvzf - -C /prometheus .
\ No newline at end of file
+queue ${ARTIFACT_DIR}/metrics/prometheus.tar.gz oc --insecure-skip-tls-verify exec -n openshift-monitoring prometheus-k8s-0 -- tar cvzf - -C /prometheus .
diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/OWNERS b/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-commands.sh b/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-commands.sh
index 31d8ff1c387f0..cec61d2ac4011 100644
--- a/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-commands.sh
+++ b/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-commands.sh
@@ -32,8 +32,8 @@ then
       echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
     fi
   fi
-  eval $(ssh-agent)
+  eval "$(ssh-agent)"
   ssh-add /etc/openshift-installer/ssh-privatekey
   ssh -A -o PreferredAuthentications=publickey -o StrictHostKeyChecking=false -o UserKnownHostsFile=/dev/null core@${bootstrap_ip} /bin/bash -x /usr/local/bin/installer-gather.sh
   scp -o PreferredAuthentications=publickey -o StrictHostKeyChecking=false -o UserKnownHostsFile=/dev/null core@${bootstrap_ip}:log-bundle.tar.gz ${ARTIFACT_DIR}/installer/bootstrap-logs.tar.gz
-fi
\ No newline at end of file
+fi
diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/must-gather/OWNERS b/ci-operator/step-registry/ipi/deprovision/artifacts/must-gather/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/deprovision/artifacts/must-gather/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/deprovision/deprovision/OWNERS b/ci-operator/step-registry/ipi/deprovision/deprovision/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/deprovision/deprovision/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/install/OWNERS b/ci-operator/step-registry/ipi/install/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/install/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/install/install/OWNERS b/ci-operator/step-registry/ipi/install/install/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/install/install/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/install/rbac/OWNERS b/ci-operator/step-registry/ipi/install/rbac/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/install/rbac/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/install/rbac/ipi-install-rbac-commands.sh b/ci-operator/step-registry/ipi/install/rbac/ipi-install-rbac-commands.sh
index 81d030d5eccb9..89d7bf072efe5 100644
--- a/ci-operator/step-registry/ipi/install/rbac/ipi-install-rbac-commands.sh
+++ b/ci-operator/step-registry/ipi/install/rbac/ipi-install-rbac-commands.sh
@@ -12,7 +12,7 @@ oc adm policy add-role-to-group system:image-puller system:authenticated   --nam
 oc adm policy add-role-to-user admin system:serviceaccount:ci:ci-chat-bot --namespace "${NAMESPACE}"
 
 # Role for giving the e2e pod permissions to update imagestreams
-cat <<EOF
+cat <<EOF | oc apply -f -
 kind: Role
 apiVersion: authorization.openshift.io/v1
 metadata:
@@ -25,7 +25,7 @@ rules:
 - apiGroups: ["image.openshift.io"]
   resources: ["imagestreams", "imagestreamtags"]
   verbs: ["get", "create", "update", "delete", "list"]
-EOF | oc apply -f -
+EOF
 
 # Give the e2e pod access to the imagestream-updater role
-oc adm policy add-role-to-user ${JOB_NAME_SAFE}-imagestream-updater --serviceaccount default --namespace "${NAMESPACE}"
\ No newline at end of file
+oc adm policy add-role-to-user ${JOB_NAME_SAFE}-imagestream-updater --serviceaccount default --namespace "${NAMESPACE}"
diff --git a/hack/validate-owners.sh b/hack/validate-owners.sh
index 5f4c9f2a15aed..c32c7dcc9feaf 100755
--- a/hack/validate-owners.sh
+++ b/hack/validate-owners.sh
@@ -18,7 +18,10 @@ ci-operator/jobs/openvswitch/ovn-kubernetes
 EOF
 )
 
-no_owners=$(find ci-operator/config/ ci-operator/jobs/ -mindepth 2 -type d ! -exec test -e '{}/OWNERS' \; -print | sort)
+# mindepth for "jobs" and "configs" is 2, while "step-registry" is 1, so do these in separate steps
+no_owners_jobs_configs=$(find ci-operator/config/ ci-operator/jobs/ -mindepth 2 -type d ! -exec test -e '{}/OWNERS' \; -print | sort)
+no_owners_reg=$(find ci-operator/step-registry -mindepth 1 -type d ! -exec test -e '{}/OWNERS' \; -print | sort)
+no_owners=$(echo "${no_owners_jobs_configs}"$'\n'"${no_owners_reg}" | sort)
 false_neg=$(comm -13 <(echo "$WHITELIST") <(echo "$no_owners"))
 false_pos=$(comm -23 <(echo "$WHITELIST") <(echo "$no_owners"))
 
diff --git a/hack/validate-registry-commands.sh b/hack/validate-registry-commands.sh
new file mode 100755
index 0000000000000..7de68920e1349
--- /dev/null
+++ b/hack/validate-registry-commands.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# This script checks all shell scripts in the step registry and errors if shellcheck detects error or warning level syntax issues
+
+find ci-operator/step-registry -name "*.sh" -print0 | xargs -0 -n1 shellcheck -S warning