diff --git a/awx/ui_next/src/components/AppContainer/AppContainer.jsx b/awx/ui_next/src/components/AppContainer/AppContainer.jsx
index 690d7fae72..87559924ff 100644
--- a/awx/ui_next/src/components/AppContainer/AppContainer.jsx
+++ b/awx/ui_next/src/components/AppContainer/AppContainer.jsx
@@ -82,7 +82,7 @@ function AppContainer({ i18n, navRouteConfig = [], children }) {
       onNavToggle={handleNavToggle}
       logo={<BrandLogo />}
       logoProps={{ href: '/' }}
-      toolbar={
+      headerTools={
         <PageHeaderToolbar
           loggedInUser={config?.me}
           isAboutDisabled={!config?.version}
diff --git a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx
index 229136c23b..8db7305494 100644
--- a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx
+++ b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx
@@ -7,9 +7,9 @@ import {
   DropdownItem,
   DropdownToggle,
   DropdownPosition,
-  Toolbar,
-  ToolbarGroup,
-  ToolbarItem,
+  PageHeaderTools,
+  PageHeaderToolsGroup,
+  PageHeaderToolsItem,
   Tooltip,
 } from '@patternfly/react-core';
 import { QuestionCircleIcon, UserIcon } from '@patternfly/react-icons';
@@ -62,10 +62,10 @@ class PageHeaderToolbar extends Component {
     } = this.props;
 
     return (
-      <Toolbar>
-        <ToolbarGroup>
+      <PageHeaderTools>
+        <PageHeaderToolsGroup>
           <Tooltip position="left" content={<div>{i18n._(t`Info`)}</div>}>
-            <ToolbarItem>
+            <PageHeaderToolsItem>
               <Dropdown
                 isPlain
                 isOpen={isHelpOpen}
@@ -93,10 +93,10 @@ class PageHeaderToolbar extends Component {
                   </DropdownItem>,
                 ]}
               />
-            </ToolbarItem>
+            </PageHeaderToolsItem>
           </Tooltip>
           <Tooltip position="left" content={<div>{i18n._(t`User`)}</div>}>
-            <ToolbarItem>
+            <PageHeaderToolsItem>
               <Dropdown
                 id="toolbar-user-dropdown"
                 isPlain
@@ -134,10 +134,10 @@ class PageHeaderToolbar extends Component {
                   </DropdownItem>,
                 ]}
               />
-            </ToolbarItem>
+            </PageHeaderToolsItem>
           </Tooltip>
-        </ToolbarGroup>
-      </Toolbar>
+        </PageHeaderToolsGroup>
+      </PageHeaderTools>
     );
   }
 }