diff --git a/lib/testmap.py b/lib/testmap.py
index e24a99c521..41b3346e4d 100644
--- a/lib/testmap.py
+++ b/lib/testmap.py
@@ -224,7 +224,7 @@
 # The OSTree variants can't build their own packages, so we build in
 # their non-Atomic siblings.
 OSTREE_BUILD_IMAGE = {
-    "fedora-coreos": "fedora-37",
+    "fedora-coreos": "fedora-38",
     "rhel4edge": "rhel-9-0",
 }
 
diff --git a/naughty/fedora-37/4672-setroubleshootd-timeout b/naughty/fedora-37/4672-setroubleshootd-timeout
new file mode 100644
index 0000000000..064201a694
--- /dev/null
+++ b/naughty/fedora-37/4672-setroubleshootd-timeout
@@ -0,0 +1,5 @@
+> warning: Unable to delete alert *
+*
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+*
+testlib.Error: timeout
diff --git a/naughty/fedora-37/4672-setroubleshootd-timeout-2 b/naughty/fedora-37/4672-setroubleshootd-timeout-2
new file mode 100644
index 0000000000..6a7b18048a
--- /dev/null
+++ b/naughty/fedora-37/4672-setroubleshootd-timeout-2
@@ -0,0 +1,6 @@
+> warning: transport closed: disconnected*
+Traceback (most recent call last):
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+    b.wait_in_text(row_selector + " .pf-c-alert__title", "Solution applied successfully")
+*
+testlib.Error: timeout
diff --git a/naughty/fedora-38/4672-setroubleshootd-timeout b/naughty/fedora-38/4672-setroubleshootd-timeout
new file mode 100644
index 0000000000..064201a694
--- /dev/null
+++ b/naughty/fedora-38/4672-setroubleshootd-timeout
@@ -0,0 +1,5 @@
+> warning: Unable to delete alert *
+*
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+*
+testlib.Error: timeout
diff --git a/naughty/fedora-38/4672-setroubleshootd-timeout-2 b/naughty/fedora-38/4672-setroubleshootd-timeout-2
new file mode 100644
index 0000000000..6a7b18048a
--- /dev/null
+++ b/naughty/fedora-38/4672-setroubleshootd-timeout-2
@@ -0,0 +1,6 @@
+> warning: transport closed: disconnected*
+Traceback (most recent call last):
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+    b.wait_in_text(row_selector + " .pf-c-alert__title", "Solution applied successfully")
+*
+testlib.Error: timeout
diff --git a/naughty/fedora-39/4672-setroubleshootd-timeout b/naughty/fedora-39/4672-setroubleshootd-timeout
new file mode 100644
index 0000000000..064201a694
--- /dev/null
+++ b/naughty/fedora-39/4672-setroubleshootd-timeout
@@ -0,0 +1,5 @@
+> warning: Unable to delete alert *
+*
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+*
+testlib.Error: timeout
diff --git a/naughty/fedora-39/4672-setroubleshootd-timeout-2 b/naughty/fedora-39/4672-setroubleshootd-timeout-2
new file mode 100644
index 0000000000..6a7b18048a
--- /dev/null
+++ b/naughty/fedora-39/4672-setroubleshootd-timeout-2
@@ -0,0 +1,6 @@
+> warning: transport closed: disconnected*
+Traceback (most recent call last):
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+    b.wait_in_text(row_selector + " .pf-c-alert__title", "Solution applied successfully")
+*
+testlib.Error: timeout
diff --git a/naughty/fedora-coreos b/naughty/fedora-coreos
index 731959a81b..20d5d608fc 120000
--- a/naughty/fedora-coreos
+++ b/naughty/fedora-coreos
@@ -1 +1 @@
-fedora-37
\ No newline at end of file
+fedora-38
\ No newline at end of file
diff --git a/naughty/rhel-8/4672-setroubleshootd-timeout b/naughty/rhel-8/4672-setroubleshootd-timeout
new file mode 100644
index 0000000000..064201a694
--- /dev/null
+++ b/naughty/rhel-8/4672-setroubleshootd-timeout
@@ -0,0 +1,5 @@
+> warning: Unable to delete alert *
+*
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+*
+testlib.Error: timeout
diff --git a/naughty/rhel-8/4672-setroubleshootd-timeout-2 b/naughty/rhel-8/4672-setroubleshootd-timeout-2
new file mode 100644
index 0000000000..6a7b18048a
--- /dev/null
+++ b/naughty/rhel-8/4672-setroubleshootd-timeout-2
@@ -0,0 +1,6 @@
+> warning: transport closed: disconnected*
+Traceback (most recent call last):
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+    b.wait_in_text(row_selector + " .pf-c-alert__title", "Solution applied successfully")
+*
+testlib.Error: timeout
diff --git a/naughty/rhel-9/4672-setroubleshootd-timeout b/naughty/rhel-9/4672-setroubleshootd-timeout
new file mode 100644
index 0000000000..064201a694
--- /dev/null
+++ b/naughty/rhel-9/4672-setroubleshootd-timeout
@@ -0,0 +1,5 @@
+> warning: Unable to delete alert *
+*
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+*
+testlib.Error: timeout
diff --git a/naughty/rhel-9/4672-setroubleshootd-timeout-2 b/naughty/rhel-9/4672-setroubleshootd-timeout-2
new file mode 100644
index 0000000000..6a7b18048a
--- /dev/null
+++ b/naughty/rhel-9/4672-setroubleshootd-timeout-2
@@ -0,0 +1,6 @@
+> warning: transport closed: disconnected*
+Traceback (most recent call last):
+  File "test/verify/check-selinux", line *, in testTroubleshootAlerts
+    b.wait_in_text(row_selector + " .pf-c-alert__title", "Solution applied successfully")
+*
+testlib.Error: timeout