diff --git a/ui/webui/src/components/AnacondaWizard.jsx b/ui/webui/src/components/AnacondaWizard.jsx
index 4865172f275..92588544e60 100644
--- a/ui/webui/src/components/AnacondaWizard.jsx
+++ b/ui/webui/src/components/AnacondaWizard.jsx
@@ -20,13 +20,14 @@ import React, { useState, useMemo } from "react";
 import {
     ActionList,
     Button,
+    HelperText,
+    HelperTextItem,
     Modal,
     ModalVariant,
     PageSection,
     PageSectionTypes,
     PageSectionVariants,
     Stack,
-    Tooltip,
     Wizard,
     WizardFooter,
     WizardContextConsumer,
@@ -359,6 +360,13 @@ const Footer = ({
                               setQuitWaitsConfirmation={setQuitWaitsConfirmation}
                               isBootIso={isBootIso}
                             />}
+                            {activeStep.id === "storage-devices" && !isFormValid &&
+                                <HelperText id="next-helper-text">
+                                    <HelperTextItem
+                                      variant="indeterminate">
+                                        {_("To continue, select the devices to install to.")}
+                                    </HelperTextItem>
+                                </HelperText>}
                             <ActionList>
                                 <Button
                                   variant="secondary"
@@ -368,7 +376,6 @@ const Footer = ({
                                 </Button>
                                 <Button
                                   id="installation-next-btn"
-                                  aria-describedby="next-tooltip-ref"
                                   variant={nextButtonVariant}
                                   isDisabled={
                                       !isFormValid ||
@@ -377,21 +384,6 @@ const Footer = ({
                                   onClick={() => goToNextStep(activeStep, onNext)}>
                                     {nextButtonText}
                                 </Button>
-                                {activeStep.id === "storage-devices" &&
-                                    <Tooltip
-                                      id="next-tooltip-ref"
-                                      content={
-                                          <div>
-                                              {_("To continue, select the devices to install to.")}
-                                          </div>
-                                      }
-                                      // Only show the tooltip on installation destination spoke that is not valid (no disks selected).
-                                      // NOTE: As PatternFly Button with isDisabled set apprently does not get any mouse events anymore,
-                                      //       we need to manually trigger the tooltip.
-                                      reference={() => document.getElementById("installation-next-btn")}
-                                      trigger="manual"
-                                      isVisible={!isFormValid}
-                                    />}
                                 <Button
                                   id="installation-quit-btn"
                                   style={{ marginLeft: "var(--pf-c-wizard__footer-cancel--MarginLeft)" }}
diff --git a/ui/webui/test/helpers/storage.py b/ui/webui/test/helpers/storage.py
index e4be99d1cdc..38824f65d7f 100644
--- a/ui/webui/test/helpers/storage.py
+++ b/ui/webui/test/helpers/storage.py
@@ -85,7 +85,7 @@ def check_disk_selected(self, disk, selected=True):
 
     @log_step()
     def wait_no_disks(self):
-        self.browser.wait_in_text("#next-tooltip-ref",
+        self.browser.wait_in_text("#next-helper-text",
                                   "To continue, select the devices to install to.")
 
     @log_step()
diff --git a/ui/webui/test/reference b/ui/webui/test/reference
index 26fd024c936..67ea57a8f14 160000
--- a/ui/webui/test/reference
+++ b/ui/webui/test/reference
@@ -1 +1 @@
-Subproject commit 26fd024c936966f906bd5eea0d35c5259c73a667
+Subproject commit 67ea57a8f1419e862a0ef9134a8b182584bcf5ee