diff --git a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml
index 47f6c5ac666a1..d4e9185248b65 100644
--- a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml
+++ b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml
@@ -32,16 +32,25 @@ resources:
 test_binary_build_commands: "echo \"asdf\" \n"
 tests:
 - as: e2e
+  cluster: build05
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: virt-small
     workflow: cri-o-e2e
 - as: integration
+  cluster: build05
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: virt-small
     workflow: cri-o-integration
 - as: critest
+  cluster: build05
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: virt-small
     workflow: cri-o-critest
 zz_generated_metadata:
   branch: main
diff --git a/ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-main-presubmits.yaml b/ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-main-presubmits.yaml
index 637a546a82089..5d72770abe63f 100644
--- a/ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-main-presubmits.yaml
+++ b/ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-main-presubmits.yaml
@@ -21,7 +21,7 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build04
+    cluster: build05
     context: ci/prow/ci-critest
     decorate: true
     decoration_config:
@@ -29,6 +29,7 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci-operator.openshift.io/variant: ci
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -97,7 +98,7 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build04
+    cluster: build05
     context: ci/prow/ci-e2e
     decorate: true
     decoration_config:
@@ -105,6 +106,7 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci-operator.openshift.io/variant: ci
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -224,7 +226,7 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build04
+    cluster: build05
     context: ci/prow/ci-integration
     decorate: true
     decoration_config:
@@ -232,6 +234,7 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci-operator.openshift.io/variant: ci
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh
index 221d79f5e2c9a..8d7f921b8e6b8 100644
--- a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh
+++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh
@@ -158,26 +158,33 @@ EOF
 
 # We have 2 ofcir servers,
 # the 1st (contents of ${CLUSTER_PROFILE_DIR}/ofcir_laburl)
-#   manages HW in the lab, at the moment this is all baremetal clusters
+#   manages HW in the lab, this has hosts of type cihost (for virtualized jobs),
+#   cihost-small (for general purpose) and cicluster (for baremetal jobs)
 # the 2nd (contents of ${CLUSTER_PROFILE_DIR}/ofcir)
-#   manages HW in equinix, at the moment this is for virt hosts
-# If neither can give us a host to use then we fall back to on demaned
+#   manages HW in equinix, this is for virt hosts only
+# If neither can give us a host to use then we fall back to on demaned from equinix
+case $CLUSTERTYPE in
+    virt-small)
+        CIRTYPE=cihost-small
+        ;;
+    baremetal)
+        CIRTYPE=cicluster
+        ;;
+    *)
+        CIRTYPE=cihost
+        ;;
+esac
 
 CIRTYPE=cihost
-# If baremetal on check the lab ofcir and exit,
-# as equinix doesn't serve baremetal clusters
-if [[ "$CLUSTERTYPE" == "baremetal" ]] ; then
-    CIRTYPE=cicluster
-    if [ -e "${CLUSTER_PROFILE_DIR}/ofcir_laburl" ] ; then
-        getCIR "$(cat ${CLUSTER_PROFILE_DIR}/ofcir_laburl)"
-        exit_with_success
-    fi
-    exit_with_failure
-fi
+[[ "$CLUSTERTYPE" == "baremetal" ]] && CIRTYPE=cicluster
 
 if [ -e "${CLUSTER_PROFILE_DIR}/ofcir_laburl" ] ; then
     getCIR "$(cat ${CLUSTER_PROFILE_DIR}/ofcir_laburl)" && exit_with_success
 fi
+
+# No point in continuing, only ofcir_laburl has cir's of type "cicluster" and "cihost-small"
+[[ "$CLUSTERTYPE" =~ baremetal|cihost-small ]] && exit_with_failure
+
 if [ -e "${CLUSTER_PROFILE_DIR}/ofcir_url" ] ; then
     getCIR "$(cat ${CLUSTER_PROFILE_DIR}/ofcir_url)" && exit_with_success
 fi