diff --git a/ci/prow-build-test-qemu.sh b/ci/prow-build-test-qemu.sh
index f05333b03..a5bbb6202 100755
--- a/ci/prow-build-test-qemu.sh
+++ b/ci/prow-build-test-qemu.sh
@@ -32,12 +32,17 @@ ocpver_mut=$(rpm-ostree compose tree --print-only src/config/manifest.yaml | jq
 prev_build_url=${REDIRECTOR_URL}/rhcos-${ocpver}/
 # 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
+curl -L http://base-"${ocpver_mut}"-rhel86.ocp.svc.cluster.local > src/config/ocp.repo
 cosa buildfetch --url=${prev_build_url}
 cosa fetch
 cosa build
 cosa buildextend-extensions
-cosa kola --basic-qemu-scenarios
+# Manually exclude Secure Boot testing for pre-release RHEL content.
+# This will be removed once RHEL 8.6 is GA.
+# See https://github.com/openshift/os/pull/756
+# cosa kola --basic-qemu-scenarios
+cosa kola run --qemu-nvme=true basic
+cosa kola run --qemu-firmware=uefi basic
 kola run-upgrade -b rhcos -v --find-parent-image --qemu-image-dir tmp/ --output-dir tmp/kola-upgrade
 cosa kola run --parallel 2
 # Build metal + installer now so we can test them
diff --git a/manifest.yaml b/manifest.yaml
index 0a4bfb806..488609495 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -46,7 +46,7 @@ repos:
 rpmdb: bdb
 
 # We include hours/minutes to avoid version number reuse
-automatic-version-prefix: "411.85.<date:%Y%m%d%H%M>"
+automatic-version-prefix: "411.86.<date:%Y%m%d%H%M>"
 # This ensures we're semver-compatible which OpenShift wants
 automatic-version-suffix: "-"
 # Keep this is sync with the version in postprocess
diff --git a/overlay.d/25rhcos-azure-udev-rules/usr/lib/udev/rules.d/50-azure-ptp.rules b/overlay.d/25rhcos-azure-udev-rules/usr/lib/udev/rules.d/50-azure-ptp.rules
deleted file mode 100644
index 32660fbee..000000000
--- a/overlay.d/25rhcos-azure-udev-rules/usr/lib/udev/rules.d/50-azure-ptp.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# Manual backport of:
-# https://github.com/systemd/systemd/commit/32e868f058da8b90add00b2958c516241c532b70
-# Can drop once we get to RHEL 8.6:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1991834
-SUBSYSTEM=="ptp", ATTR{clock_name}=="hyperv", SYMLINK += "ptp_hyperv"
diff --git a/tests/kola/version/drop-azure-ptp b/tests/kola/version/drop-azure-ptp
deleted file mode 100755
index 6e0fb1cd0..000000000
--- a/tests/kola/version/drop-azure-ptp
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# kola: { "exclusive": false }
-set -xeuo pipefail
-
-fatal() {
-    echo "$@" >&2
-    exit 1
-}
-
-if [ -e /usr/lib/udev/rules.d/50-azure-ptp.rules ] && \
-    grep ptp_hyperv /usr/lib/udev/rules.d/50-udev-default.rules; then
-  fatal "50-udev-default.rules includes ptp_hyperv symlink; drop 50-azure-ptp.rules"
-fi