diff --git a/lib/testmap.py b/lib/testmap.py
index 28e2f3fe19..2879e6d6dc 100644
--- a/lib/testmap.py
+++ b/lib/testmap.py
@@ -136,6 +136,7 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             'rhel-8-10',
             'rhel-9-5',
             'rhel-9-6',
+            'rhel-10-0',
         ],
         'rhel-8': [
             'rhel-8-10',
@@ -143,7 +144,6 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
         '_manual': [
             'centos-10',
             'fedora-rawhide',
-            'rhel-10-0',
         ],
     },
     'cockpit-project/cockpit-files': {
diff --git a/naughty/rhel-10/6792-swtpm-and-selinux-again-sigh b/naughty/rhel-10/6792-swtpm-and-selinux-again-sigh
new file mode 100644
index 0000000000..6ba0a3d105
--- /dev/null
+++ b/naughty/rhel-10/6792-swtpm-and-selinux-again-sigh
@@ -0,0 +1,5 @@
+*internal error: Could not run '/usr/bin/swtpm_setup'.*
+*
+Traceback (most recent call last):
+  File "check-machines-create", line *, in testConfigureBeforeInstall
+    testlib.wait(lambda: "VmNotInstalled" in m.execute("virsh list --persistent"), delay=3)
diff --git a/naughty/rhel-10/6792-swtpm-and-selinux-again-sigh-2 b/naughty/rhel-10/6792-swtpm-and-selinux-again-sigh-2
new file mode 100644
index 0000000000..06ad7e8bca
--- /dev/null
+++ b/naughty/rhel-10/6792-swtpm-and-selinux-again-sigh-2
@@ -0,0 +1,5 @@
+*internal error: Could not run '/usr/bin/swtpm_setup'.*
+*
+Traceback (most recent call last):
+  File "check-machines-create", line *, in testConfigureBeforeInstallBiosTPM
+    b.wait_in_text(f"#vm-{vmName}-system-state", "Running")