diff --git a/pkg/lib/patternfly/patternfly-5-overrides.scss b/pkg/lib/patternfly/patternfly-5-overrides.scss
index 960e7dcc8dfd..8077b23d9def 100644
--- a/pkg/lib/patternfly/patternfly-5-overrides.scss
+++ b/pkg/lib/patternfly/patternfly-5-overrides.scss
@@ -69,13 +69,6 @@ select.pf-v5-c-form-control {
   }
 }
 
-// Workaround the transparent background for HTML select options
-// https://github.com/patternfly/patternfly/issues/5695
-.pf-v5-c-form-control option {
-  background-color: var(--pf-v5-c-form-control--BackgroundColor);
-  color: var(--pf-v5-c-form-control--Color);
-}
-
 // Fix the double-spacing issue in the non-deprecated split buttons
 // https://github.com/patternfly/patternfly/issues/6632
 .pf-m-split-button .pf-v5-c-menu-toggle__controls {
diff --git a/pkg/systemd/overview.scss b/pkg/systemd/overview.scss
index a711bdba263f..215dbde694ec 100644
--- a/pkg/systemd/overview.scss
+++ b/pkg/systemd/overview.scss
@@ -10,12 +10,6 @@
   // Set the right padding so that the button aligns with the other alerts in the page on the side
   padding-inline-end: var(--pf-v5-c-page__main-section--PaddingRight);
 
-  // Fix vertical alignment
-  // Unset the H4 line-height (as PF3/Bootstrap/etc. sets it; PF4 doesn't)
-  > .pf-v5-c-alert__title {
-    line-height: unset;
-  }
-
   // Deconstruct nicely on small screen sizes (especially mobile)
   // This will not be needed in a future PF4 update
   //
diff --git a/test/verify/check-metrics b/test/verify/check-metrics
index f3955e911889..3ee5d569517f 100755
--- a/test/verify/check-metrics
+++ b/test/verify/check-metrics
@@ -86,8 +86,7 @@ class TestHistoryMetrics(testlib.MachineCase):
         super().setUp()
         # start with a clean slate and avoid running into restart limits
         self.machine.execute("systemctl stop pmlogger pmproxy; systemctl reset-failed pmlogger pmproxy 2>/dev/null || true")
-        # HACK: PF modal can have multiple id's in certain scenario's https://github.com/patternfly/patternfly-react/issues/9399
-        self.pcp_dialog_selector = "#pcp-settings-modal:first-child"
+        self.pcp_dialog_selector = "#pcp-settings-modal"
 
     def waitStream(self, current_max):
         # should only have at most <current_max> valid minutes, the rest should be empty
@@ -1249,8 +1248,7 @@ BEGIN {{
 
 @testlib.skipImage("TODO: Arch Linux packagekit support", "arch")
 class TestMetricsPackages(packagelib.PackageCase):
-    # HACK: PF modal can have multiple id's in certain scenario's https://github.com/patternfly/patternfly-react/issues/9399
-    pcp_dialog_selector = "#pcp-settings-modal:first-child"
+    pcp_dialog_selector = "#pcp-settings-modal"
 
     def testBasic(self):
         b = self.browser
@@ -1441,9 +1439,7 @@ class TestGrafanaClient(testlib.MachineCase):
         m = self.machine
         b = self.browser
         mg = self.machines['services']
-
-        # HACK: PF modal can have multiple id's in certain scenario's https://github.com/patternfly/patternfly-react/issues/9399
-        pcp_dialog_selector = "#pcp-settings-modal:first-child"
+        pcp_dialog_selector = "#pcp-settings-modal"
 
         # avoid dynamic host name changes during PCP data collection, and start from clean slate
         m.execute("""systemctl stop pmlogger || true