diff --git a/ci-operator/step-registry/baremetalds/devscripts/gather/baremetalds-devscripts-gather-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/gather/baremetalds-devscripts-gather-commands.sh
index 0a33525a67f7..336ddf82e064 100644
--- a/ci-operator/step-registry/baremetalds/devscripts/gather/baremetalds-devscripts-gather-commands.sh
+++ b/ci-operator/step-registry/baremetalds/devscripts/gather/baremetalds-devscripts-gather-commands.sh
@@ -27,6 +27,9 @@ echo "### Gathering logs..."
 timeout -s 9 15m ssh "${SSHOPTS[@]}" "root@${IP}" bash - <<EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g'
 cd dev-scripts
 
+echo "Testing API access"
+oc get clusterversion || true
+
 echo "Get install-gather, if there is one..."
 cp /root/dev-scripts/ocp/*/log-bundle*.tar.gz /tmp/artifacts/log-bundle-\$HOSTNAME.tar.gz || true
 
diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
index 7aa695dedd07..680ec9a15edb 100644
--- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
+++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
@@ -315,8 +315,17 @@ then
   # There may have only been one disk
   if [ -n "\$DATA_DISK" ] ; then
     mkfs.xfs -f "\${DATA_DISK}"
-    mkdir /opt/dev-scripts
-    mount "\${DATA_DISK}" /opt/dev-scripts
+
+    DATA_DISK_SIZE=\$(lsblk -o size --noheadings --bytes -d \${DATA_DISK})
+    # If there is a data disk but its less the 200G, its not big enough for both
+    # the storage pools and the registry, just place the pool on it.
+    if [ "\$DATA_DISK_SIZE" -lt "$(( 1024 ** 3 * 200 ))" ] ; then
+        mkdir -p /opt/dev-scripts/pool
+        mount "\${DATA_DISK}" /opt/dev-scripts/pool
+    else
+        mkdir /opt/dev-scripts
+        mount "\${DATA_DISK}" /opt/dev-scripts
+    fi
   fi
 elif [ ! -z "${NVME_DEVICE}" ] && [ -e "${NVME_DEVICE}" ] && [[ "\$(mount | grep ${NVME_DEVICE})" == "" ]];
 then