diff --git a/awx/ui_next/src/components/PaginatedDataList/__snapshots__/ToolbarDeleteButton.test.jsx.snap b/awx/ui_next/src/components/PaginatedDataList/__snapshots__/ToolbarDeleteButton.test.jsx.snap
index e837c39658..1b146c628b 100644
--- a/awx/ui_next/src/components/PaginatedDataList/__snapshots__/ToolbarDeleteButton.test.jsx.snap
+++ b/awx/ui_next/src/components/PaginatedDataList/__snapshots__/ToolbarDeleteButton.test.jsx.snap
@@ -8,62 +8,13 @@ exports[`<ToolbarDeleteButton /> should render button 1`] = `
   pluralizedItemName="Items"
 >
   <Tooltip
-    appendTo={[Function]}
-    aria="describedby"
-    boundary="window"
-    className=""
     content="Select a row to delete"
-    distance={15}
-    enableFlip={true}
-    entryDelay={500}
-    exitDelay={500}
-    flipBehavior={
-      Array [
-        "top",
-        "right",
-        "bottom",
-        "left",
-        "top",
-        "right",
-        "bottom",
-      ]
-    }
-    id=""
-    isAppLauncher={false}
-    isContentLeftAligned={false}
-    isVisible={false}
-    maxWidth="18.75rem"
     position="top"
-    tippyProps={Object {}}
-    trigger="mouseenter focus"
-    zIndex={9999}
   >
-    <PopoverBase
+    <Popper
       appendTo={[Function]}
-      aria="describedby"
-      arrow={true}
-      boundary="window"
-      content={
-        <div
-          className=""
-          id=""
-          role="tooltip"
-        >
-          <TooltipContent
-            isLeftAligned={false}
-          >
-            Select a row to delete
-          </TooltipContent>
-        </div>
-      }
-      delay={
-        Array [
-          500,
-          500,
-        ]
-      }
       distance={15}
-      flip={true}
+      enableFlip={true}
       flipBehavior={
         Array [
           "top",
@@ -76,83 +27,90 @@ exports[`<ToolbarDeleteButton /> should render button 1`] = `
         ]
       }
       isVisible={false}
-      lazy={true}
-      maxWidth="18.75rem"
-      onCreate={[Function]}
+      onBlur={[Function]}
+      onDocumentClick={false}
+      onDocumentKeyDown={[Function]}
+      onFocus={[Function]}
+      onMouseEnter={[Function]}
+      onMouseLeave={[Function]}
+      onTriggerEnter={[Function]}
       placement="top"
-      popperOptions={
-        Object {
-          "modifiers": Object {
-            "hide": Object {
-              "enabled": true,
-            },
-            "preventOverflow": Object {
-              "enabled": true,
-            },
-          },
-        }
-      }
-      theme="pf-tooltip"
-      trigger="mouseenter focus"
-      zIndex={9999}
-    >
-      <div>
-        <Button
-          aria-label="Delete"
-          isDisabled={true}
-          onClick={[Function]}
-          variant="danger"
-        >
-          <button
-            aria-disabled={null}
-            aria-label="Delete"
-            className="pf-c-button pf-m-danger"
-            data-ouia-component-id={null}
-            data-ouia-component-type="PF4/Button"
-            data-ouia-safe={true}
-            disabled={true}
-            onClick={[Function]}
-            tabIndex={null}
-            type="button"
-          >
-            Delete
-          </button>
-        </Button>
-      </div>
-      <Portal
-        containerInfo={
-          <div>
-            <div
-              class=""
-              id=""
-              role="tooltip"
-            >
-              <div
-                class="pf-c-tooltip__content"
-              >
-                Select a row to delete
-              </div>
-            </div>
-          </div>
-        }
-      >
+      popper={
         <div
-          className=""
-          id=""
+          className="pf-c-tooltip"
+          id="pf-tooltip-1"
           role="tooltip"
+          style={
+            Object {
+              "maxWidth": null,
+              "opacity": 0,
+              "transition": "opacity 300ms cubic-bezier(.54, 1.5, .38, 1.11)",
+            }
+          }
         >
+          <TooltipArrow />
           <TooltipContent
             isLeftAligned={false}
           >
-            <div
-              className="pf-c-tooltip__content"
-            >
-              Select a row to delete
-            </div>
+            Select a row to delete
           </TooltipContent>
         </div>
-      </Portal>
-    </PopoverBase>
+      }
+      popperMatchesTriggerWidth={false}
+      positionModifiers={
+        Object {
+          "bottom": "pf-m-bottom",
+          "left": "pf-m-left",
+          "right": "pf-m-right",
+          "top": "pf-m-top",
+        }
+      }
+      trigger={
+        <div
+          aria-describedby="pf-tooltip-1"
+        >
+          <Button
+            aria-label="Delete"
+            isDisabled={true}
+            onClick={[Function]}
+            variant="danger"
+          >
+            Delete
+          </Button>
+        </div>
+      }
+      zIndex={9999}
+    >
+      <FindRefWrapper
+        onFoundRef={[Function]}
+      >
+        <div
+          aria-describedby="pf-tooltip-1"
+        >
+          <Button
+            aria-label="Delete"
+            isDisabled={true}
+            onClick={[Function]}
+            variant="danger"
+          >
+            <button
+              aria-disabled={true}
+              aria-label="Delete"
+              className="pf-c-button pf-m-danger pf-m-disabled"
+              data-ouia-component-id={0}
+              data-ouia-component-type="PF4/Button"
+              data-ouia-safe={true}
+              disabled={true}
+              onClick={[Function]}
+              tabIndex={null}
+              type="button"
+            >
+              Delete
+            </button>
+          </Button>
+        </div>
+      </FindRefWrapper>
+    </Popper>
   </Tooltip>
 </ToolbarDeleteButton>
 `;
diff --git a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap
index 130f418117..d010f43f4c 100644
--- a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap
+++ b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap
@@ -103,12 +103,17 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                       aria-labelledby="pf-modal-part-0 alert-modal-header-label pf-modal-part-1"
                       aria-modal="true"
                       class="pf-c-modal-box pf-m-sm"
+                      data-ouia-component-id="0"
+                      data-ouia-component-type="PF4/ModalContent"
+                      data-ouia-safe="true"
                       id="pf-modal-part-0"
                       role="dialog"
                     >
                       <button
+                        aria-disabled="false"
                         aria-label="Close"
                         class="pf-c-button pf-m-plain"
+                        data-ouia-component-id="1"
                         data-ouia-component-type="PF4/Button"
                         data-ouia-safe="true"
                         type="button"
@@ -170,8 +175,10 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                         class="pf-c-modal-box__footer"
                       >
                         <button
+                          aria-disabled="false"
                           aria-label="Confirm delete"
                           class="pf-c-button pf-m-danger"
+                          data-ouia-component-id="2"
                           data-ouia-component-type="PF4/Button"
                           data-ouia-safe="true"
                           type="button"
@@ -179,7 +186,9 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                           Delete
                         </button>
                         <button
+                          aria-disabled="false"
                           class="pf-c-button pf-m-secondary"
+                          data-ouia-component-id="3"
                           data-ouia-component-type="PF4/Button"
                           data-ouia-safe="true"
                           type="button"
@@ -214,6 +223,7 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
           }
           isOpen={true}
           onClose={[Function]}
+          ouiaSafe={true}
           showClose={true}
           title="Remove Team Access"
           variant="small"
@@ -233,12 +243,17 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                       aria-labelledby="pf-modal-part-0 alert-modal-header-label pf-modal-part-1"
                       aria-modal="true"
                       class="pf-c-modal-box pf-m-sm"
+                      data-ouia-component-id="0"
+                      data-ouia-component-type="PF4/ModalContent"
+                      data-ouia-safe="true"
                       id="pf-modal-part-0"
                       role="dialog"
                     >
                       <button
+                        aria-disabled="false"
                         aria-label="Close"
                         class="pf-c-button pf-m-plain"
+                        data-ouia-component-id="1"
                         data-ouia-component-type="PF4/Button"
                         data-ouia-safe="true"
                         type="button"
@@ -300,8 +315,10 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                         class="pf-c-modal-box__footer"
                       >
                         <button
+                          aria-disabled="false"
                           aria-label="Confirm delete"
                           class="pf-c-button pf-m-danger"
+                          data-ouia-component-id="2"
                           data-ouia-component-type="PF4/Button"
                           data-ouia-safe="true"
                           type="button"
@@ -309,7 +326,9 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                           Delete
                         </button>
                         <button
+                          aria-disabled="false"
                           class="pf-c-button pf-m-secondary"
+                          data-ouia-component-id="3"
                           data-ouia-component-type="PF4/Button"
                           data-ouia-safe="true"
                           type="button"
@@ -365,6 +384,7 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
               isOpen={true}
               labelId="pf-modal-part-1"
               onClose={[Function]}
+              ouiaSafe={true}
               showClose={true}
               title="Remove Team Access"
               variant="small"
@@ -391,6 +411,9 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                         aria-label="Alert modal"
                         aria-labelledby="pf-modal-part-0 alert-modal-header-label pf-modal-part-1"
                         className=""
+                        data-ouia-component-id={0}
+                        data-ouia-component-type="PF4/ModalContent"
+                        data-ouia-safe={true}
                         id="pf-modal-part-0"
                         style={Object {}}
                         variant="small"
@@ -401,6 +424,9 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                           aria-labelledby="pf-modal-part-0 alert-modal-header-label pf-modal-part-1"
                           aria-modal="true"
                           className="pf-c-modal-box pf-m-sm"
+                          data-ouia-component-id={0}
+                          data-ouia-component-type="PF4/ModalContent"
+                          data-ouia-safe={true}
                           id="pf-modal-part-0"
                           role="dialog"
                           style={Object {}}
@@ -415,15 +441,14 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                               variant="plain"
                             >
                               <button
-                                aria-disabled={null}
+                                aria-disabled={false}
                                 aria-label="Close"
                                 className="pf-c-button pf-m-plain"
-                                data-ouia-component-id={null}
+                                data-ouia-component-id={1}
                                 data-ouia-component-type="PF4/Button"
                                 data-ouia-safe={true}
                                 disabled={false}
                                 onClick={[Function]}
-                                tabIndex={null}
                                 type="button"
                               >
                                 <TimesIcon
@@ -586,15 +611,14 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                                 variant="danger"
                               >
                                 <button
-                                  aria-disabled={null}
+                                  aria-disabled={false}
                                   aria-label="Confirm delete"
                                   className="pf-c-button pf-m-danger"
-                                  data-ouia-component-id={null}
+                                  data-ouia-component-id={2}
                                   data-ouia-component-type="PF4/Button"
                                   data-ouia-safe={true}
                                   disabled={false}
                                   onClick={[Function]}
-                                  tabIndex={null}
                                   type="button"
                                 >
                                   Delete
@@ -606,15 +630,14 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                                 variant="secondary"
                               >
                                 <button
-                                  aria-disabled={null}
+                                  aria-disabled={false}
                                   aria-label={null}
                                   className="pf-c-button pf-m-secondary"
-                                  data-ouia-component-id={null}
+                                  data-ouia-component-id={3}
                                   data-ouia-component-type="PF4/Button"
                                   data-ouia-safe={true}
                                   disabled={false}
                                   onClick={[Function]}
-                                  tabIndex={null}
                                   type="button"
                                 >
                                   Cancel
diff --git a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap
index f26a2377cb..7c8126fb4d 100644
--- a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap
+++ b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap
@@ -862,7 +862,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                                                                   >
                                                                     <div
                                                                       className="pf-c-chip"
-                                                                      data-ouia-component-id={1}
+                                                                      data-ouia-component-id={2}
                                                                       data-ouia-component-type="PF4/Chip"
                                                                       data-ouia-safe={true}
                                                                     >
@@ -880,17 +880,16 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                                                                         variant="plain"
                                                                       >
                                                                         <button
-                                                                          aria-disabled={null}
+                                                                          aria-disabled={false}
                                                                           aria-label="close"
                                                                           aria-labelledby="remove_pf-random-id-1 pf-random-id-1"
                                                                           className="pf-c-button pf-m-plain"
-                                                                          data-ouia-component-id={null}
+                                                                          data-ouia-component-id={3}
                                                                           data-ouia-component-type="PF4/Button"
                                                                           data-ouia-safe={true}
                                                                           disabled={false}
                                                                           id="remove_pf-random-id-1"
                                                                           onClick={[Function]}
-                                                                          tabIndex={null}
                                                                           type="button"
                                                                         >
                                                                           <TimesIcon
diff --git a/awx/ui_next/src/screens/Job/JobOutput/shared/HostStatusBar.test.jsx b/awx/ui_next/src/screens/Job/JobOutput/shared/HostStatusBar.test.jsx
index 5174501386..7e4237ba60 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/shared/HostStatusBar.test.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/shared/HostStatusBar.test.jsx
@@ -45,7 +45,7 @@ describe('<HostStatusBar />', () => {
   test('empty host counts should display tooltip and one bar segment', () => {
     wrapper = mountWithContexts(<HostStatusBar />);
     expect(wrapper.find('BarSegment').length).toBe(1);
-    expect(wrapper.find('TooltipContent').text()).toEqual(
+    expect(wrapper.find('Tooltip').prop('content')).toEqual(
       'Host status information for this job is unavailable.'
     );
   });