diff --git a/ci/prow-build-test-qemu.sh b/ci/prow-build-test-qemu.sh
index 7c0dd1c67..f05333b03 100755
--- a/ci/prow-build-test-qemu.sh
+++ b/ci/prow-build-test-qemu.sh
@@ -30,7 +30,9 @@ fi
 ocpver=$(rpm-ostree compose tree --print-only src/config/manifest.yaml | jq -r '.["mutate-os-release"]')
 ocpver_mut=$(rpm-ostree compose tree --print-only src/config/manifest.yaml | jq -r '.["mutate-os-release"]' | sed 's|\.|-|')
 prev_build_url=${REDIRECTOR_URL}/rhcos-${ocpver}/
-curl -L http://base-"${ocpver_mut}"-rhel8.ocp.svc.cluster.local > src/config/ocp.repo
+# we want to use RHEL 8.5 for testing until we can start using 8.6
+# see https://github.com/openshift/release/pull/26193
+curl -L http://base-"${ocpver_mut}"-rhel85.ocp.svc.cluster.local > src/config/ocp.repo
 cosa buildfetch --url=${prev_build_url}
 cosa fetch
 cosa build
@@ -44,13 +46,17 @@ cosa buildextend-metal && cosa buildextend-metal4k && cosa buildextend-live
 # installs with the image format we ship
 cosa compress --artifact=metal --artifact=metal4k
 # Running testiso scenarios on metal artifact
-kola testiso -S --scenarios pxe-install,pxe-offline-install,iso-install,iso-offline-install,iso-live-login,iso-as-disk --output-dir tmp/kola-metal
+# Skip the following scenarios: iso-install,iso-offline-install,iso-live-login,iso-as-disk
+# See: https://github.com/openshift/os/issues/666
+kola testiso -S --scenarios pxe-install,pxe-offline-install --output-dir tmp/kola-metal
 # iso-install scenario to sanity-check the metal4k media
-kola testiso -S --qemu-native-4k --qemu-multipath --scenarios iso-install --output-dir tmp/kola-metal4k
-if [ $(uname -i) = x86_64 ] || [ $(uname -i) = aarch64 ]; then
-    mkdir -p tmp/kola-uefi
-    kola testiso -S --qemu-firmware uefi --scenarios iso-live-login,iso-as-disk --output-dir tmp/kola-uefi/insecure
-    if [ $(uname -i) = x86_64 ]; then
-        kola testiso -S --qemu-firmware uefi-secure --scenarios iso-live-login,iso-as-disk --output-dir tmp/kola-uefi/secure
-    fi
-fi
+# Skip all the testiso scenarios for metal4k + UEFI
+# See: https://github.com/openshift/os/issues/666
+# kola testiso -S --qemu-native-4k --qemu-multipath --scenarios iso-install --output-dir tmp/kola-metal4k
+# if [ $(uname -i) = x86_64 ] || [ $(uname -i) = aarch64 ]; then
+#     mkdir -p tmp/kola-uefi
+#     kola testiso -S --qemu-firmware uefi --scenarios iso-live-login,iso-as-disk --output-dir tmp/kola-uefi/insecure
+#     if [ $(uname -i) = x86_64 ]; then
+#         kola testiso -S --qemu-firmware uefi-secure --scenarios iso-live-login,iso-as-disk --output-dir tmp/kola-uefi/secure
+#     fi
+# fi