diff --git a/awx/ui_next/CONTRIBUTING.md b/awx/ui_next/CONTRIBUTING.md
index f6207abd26..05ce336063 100644
--- a/awx/ui_next/CONTRIBUTING.md
+++ b/awx/ui_next/CONTRIBUTING.md
@@ -336,16 +336,14 @@ Internationalization leans on the [lingui](https://github.com/lingui/js-lingui)
 
 The lingui library provides various React helpers for dealing with both marking strings for translation, and replacing strings that have been translated. For consistency and ease of use, we have consolidated on one pattern for the codebase. To set strings to be translated in the UI:
 
-- import the withI18n function and wrap the export of your component in it (i.e. `export default withI18n()(Foo)`)
-- doing the above gives you access to the i18n object on props. Make sure to put it in the scope of the function that contains strings needed to be translated (i.e. `const { i18n } = this.props;`)
 - import the t template tag function from the @lingui/macro package.
-- wrap your string using the following format: `` i18n._(t`String to be translated`) ``
+- wrap your string using the following format: `` t`String to be translated` ``
 
-**Note:** Variables that are put inside the t-marked template tag will not be translated. If you have a variable string with text that needs translating, you must wrap it in ` i18n._(t``) ` where it is defined.
+**Note:** If you have a variable string with text that needs translating, you must wrap it in `` t`${variable} string` `` where it is defined. Then you must run `npm run extract-strings` to generate new `.po` files and submit those files along with your pull request.
 
-**Note:** We try to avoid the `I18n` consumer, `i18nMark` function, or `<Trans>` component lingui gives us access to in this repo. i18nMark does not actually replace the string in the UI (leading to the potential for untranslated bugs), and the other helpers are redundant. Settling on a consistent, single pattern helps us ease the mental overhead of the need to understand the ins and outs of the lingui API.
+**Note:** We try to avoid the `I18n` consumer, or `i18nMark` function lingui gives us access to in this repo. i18nMark does not actually replace the string in the UI (leading to the potential for untranslated bugs), and the other helpers are redundant. Settling on a consistent, single pattern helps us ease the mental overhead of the need to understand the ins and outs of the lingui API.
 
-**Note:** Pluralization can be complicated so it is best to allow lingui handle cases where we have a string that may need to be pluralized based on number of items, or count. In that case lingui provides a `<Plural>` component, and a `plural()` function. See documentation [here](https://lingui.js.org/guides/plurals.html?highlight=pluralization).
+**Note:** Pluralization can be complicated so it is best to allow lingui handle cases where we have a string that may need to be pluralized based on number of items, or count. In that case lingui provides a `<Plural>` component, and a `plural()` function. When adding or updating strings in a `<Plural/>` tag you must run `npm run extra-strings` and submit the new `.po` files with your pull request. See documentation [here](https://lingui.js.org/guides/plurals.html?highlight=pluralization).
 
 You can learn more about the ways lingui and its React helpers at [this link](https://lingui.js.org/tutorials/react-patterns.html).
 
diff --git a/awx/ui_next/src/App.jsx b/awx/ui_next/src/App.jsx
index a6f1718a0e..2ae8adf284 100644
--- a/awx/ui_next/src/App.jsx
+++ b/awx/ui_next/src/App.jsx
@@ -105,8 +105,8 @@ function App() {
           </Route>
           <ProtectedRoute>
             <ConfigProvider>
-              <AppContainer navRouteConfig={getRouteConfig(i18n)}>
-                <AuthorizedRoutes routeConfig={getRouteConfig(i18n)} />
+              <AppContainer navRouteConfig={getRouteConfig()}>
+                <AuthorizedRoutes routeConfig={getRouteConfig()} />
               </AppContainer>
             </ConfigProvider>
           </ProtectedRoute>
diff --git a/awx/ui_next/src/components/About/About.jsx b/awx/ui_next/src/components/About/About.jsx
index 2aebbfd6a5..f0730742e2 100644
--- a/awx/ui_next/src/components/About/About.jsx
+++ b/awx/ui_next/src/components/About/About.jsx
@@ -1,12 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { AboutModal } from '@patternfly/react-core';
 
 import { BrandName } from '../../variables';
 
-function About({ version, isOpen, onClose, i18n }) {
+function About({ version, isOpen, onClose }) {
   const createSpeechBubble = () => {
     let text = `${BrandName} ${version}`;
     let top = '';
@@ -25,8 +24,8 @@ function About({ version, isOpen, onClose, i18n }) {
   };
 
   const speechBubble = createSpeechBubble();
-  const copyright = i18n._(t`Copyright`);
-  const redHatInc = i18n._(t`Red Hat, Inc.`);
+  const copyright = t`Copyright`;
+  const redHatInc = t`Red Hat, Inc.`;
 
   return (
     <AboutModal
@@ -35,7 +34,7 @@ function About({ version, isOpen, onClose, i18n }) {
       productName={`Ansible ${BrandName}`}
       trademark={`${copyright} ${new Date().getFullYear()} ${redHatInc}`}
       brandImageSrc="/static/media/logo-header.svg"
-      brandImageAlt={i18n._(t`Brand Image`)}
+      brandImageAlt={t`Brand Image`}
     >
       <pre>
         {speechBubble}
@@ -63,4 +62,4 @@ About.defaultProps = {
   version: null,
 };
 
-export default withI18n()(About);
+export default About;
diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx
index fb8ed89f84..f85120f8f7 100644
--- a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx
+++ b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState, useContext } from 'react';
 import { useHistory, useParams } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Button, DropdownItem } from '@patternfly/react-core';
@@ -14,7 +14,7 @@ import AdHocCommandsWizard from './AdHocCommandsWizard';
 import { KebabifiedContext } from '../../contexts/Kebabified';
 import ContentError from '../ContentError';
 
-function AdHocCommands({ adHocItems, i18n, hasListItems, onLaunchLoading }) {
+function AdHocCommands({ adHocItems, hasListItems, onLaunchLoading }) {
   const history = useHistory();
   const { id } = useParams();
 
@@ -22,11 +22,11 @@ function AdHocCommands({ adHocItems, i18n, hasListItems, onLaunchLoading }) {
   const { isKebabified, onKebabModalChange } = useContext(KebabifiedContext);
 
   const verbosityOptions = [
-    { value: '0', key: '0', label: i18n._(t`0 (Normal)`) },
-    { value: '1', key: '1', label: i18n._(t`1 (Verbose)`) },
-    { value: '2', key: '2', label: i18n._(t`2 (More Verbose)`) },
-    { value: '3', key: '3', label: i18n._(t`3 (Debug)`) },
-    { value: '4', key: '4', label: i18n._(t`4 (Connection Debug)`) },
+    { value: '0', key: '0', label: t`0 (Normal)` },
+    { value: '1', key: '1', label: t`1 (Verbose)` },
+    { value: '2', key: '2', label: t`2 (More Verbose)` },
+    { value: '3', key: '3', label: t`3 (Debug)` },
+    { value: '4', key: '4', label: t`4 (Connection Debug)` },
   ];
   useEffect(() => {
     if (isKebabified) {
@@ -102,7 +102,7 @@ function AdHocCommands({ adHocItems, i18n, hasListItems, onLaunchLoading }) {
       <AlertModal
         isOpen={error}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => {
           dismissError();
           setIsWizardOpen(false);
@@ -110,7 +110,7 @@ function AdHocCommands({ adHocItems, i18n, hasListItems, onLaunchLoading }) {
       >
         {launchError ? (
           <>
-            {i18n._(t`Failed to launch job.`)}
+            {t`Failed to launch job.`}
             <ErrorDetail error={error} />
           </>
         ) : (
@@ -128,20 +128,20 @@ function AdHocCommands({ adHocItems, i18n, hasListItems, onLaunchLoading }) {
           key="cancel-job"
           isDisabled={isAdHocDisabled || !hasListItems}
           component="button"
-          aria-label={i18n._(t`Run Command`)}
+          aria-label={t`Run Command`}
           onClick={() => setIsWizardOpen(true)}
         >
-          {i18n._(t`Run Command`)}
+          {t`Run Command`}
         </DropdownItem>
       ) : (
         <Button
           ouiaId="run-command-button"
           variant="secondary"
-          aria-label={i18n._(t`Run Command`)}
+          aria-label={t`Run Command`}
           onClick={() => setIsWizardOpen(true)}
           isDisabled={isAdHocDisabled || !hasListItems}
         >
-          {i18n._(t`Run Command`)}
+          {t`Run Command`}
         </Button>
       )}
 
@@ -166,4 +166,4 @@ AdHocCommands.propTypes = {
   hasListItems: PropTypes.bool.isRequired,
 };
 
-export default withI18n()(AdHocCommands);
+export default AdHocCommands;
diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.jsx
index e95f0b05cb..29ae4e6827 100644
--- a/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.jsx
+++ b/awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { useField } from 'formik';
@@ -21,7 +21,7 @@ const QS_CONFIG = getQSConfig('credentials', {
   order_by: 'name',
 });
 
-function AdHocCredentialStep({ i18n, credentialTypeId, onEnableLaunch }) {
+function AdHocCredentialStep({ credentialTypeId, onEnableLaunch }) {
   const history = useHistory();
   const {
     error,
@@ -52,7 +52,7 @@ function AdHocCredentialStep({ i18n, credentialTypeId, onEnableLaunch }) {
 
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
-    validate: required(null, i18n),
+    validate: required(null),
   });
   if (error) {
     return <ContentError error={error} />;
@@ -64,8 +64,8 @@ function AdHocCredentialStep({ i18n, credentialTypeId, onEnableLaunch }) {
     <Form>
       <FormGroup
         fieldId="credential"
-        label={i18n._(t`Machine Credential`)}
-        aria-label={i18n._(t`Machine Credential`)}
+        label={t`Machine Credential`}
+        aria-label={t`Machine Credential`}
         isRequired
         validated={
           !credentialMeta.touched || !credentialMeta.error ? 'default' : 'error'
@@ -73,9 +73,7 @@ function AdHocCredentialStep({ i18n, credentialTypeId, onEnableLaunch }) {
         helperTextInvalid={credentialMeta.error}
         labelIcon={
           <Popover
-            content={i18n._(
-              t`Select the credential you want to use when accessing the remote hosts to run the command. Choose the credential containing the username and SSH key or password that Ansible will need to log into the remote hosts.`
-            )}
+            content={t`Select the credential you want to use when accessing the remote hosts to run the command. Choose the credential containing the username and SSH key or password that Ansible will need to log into the remote hosts.`}
           />
         }
       >
@@ -83,27 +81,27 @@ function AdHocCredentialStep({ i18n, credentialTypeId, onEnableLaunch }) {
           value={credentialField.value || []}
           options={credentials}
           optionCount={credentialCount}
-          header={i18n._(t`Machine Credential`)}
+          header={t`Machine Credential`}
           readOnly
           qsConfig={QS_CONFIG}
           searchColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: 'name',
               isDefault: true,
             },
             {
-              name: i18n._(t`Created By (Username)`),
+              name: t`Created By (Username)`,
               key: 'created_by__username',
             },
             {
-              name: i18n._(t`Modified By (Username)`),
+              name: t`Modified By (Username)`,
               key: 'modified_by__username',
             },
           ]}
           sortColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: 'name',
             },
           ]}
@@ -125,4 +123,4 @@ AdHocCredentialStep.propTypes = {
   credentialTypeId: PropTypes.number.isRequired,
   onEnableLaunch: PropTypes.func.isRequired,
 };
-export default withI18n()(AdHocCredentialStep);
+export default AdHocCredentialStep;
diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.jsx
index 229024bfbe..4c5f6aad70 100644
--- a/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.jsx
+++ b/awx/ui_next/src/components/AdHocCommands/AdHocDetailsStep.jsx
@@ -1,6 +1,6 @@
 /* eslint-disable react/no-unescaped-entities */
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { useField } from 'formik';
@@ -28,10 +28,10 @@ const TooltipWrapper = styled.div`
 // in failing tests.
 const brandName = BrandName;
 
-function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
+function AdHocDetailsStep({ verbosityOptions, moduleOptions }) {
   const [moduleNameField, moduleNameMeta, moduleNameHelpers] = useField({
     name: 'module_name',
-    validate: required(null, i18n),
+    validate: required(null),
   });
 
   const [variablesField] = useField('extra_vars');
@@ -41,14 +41,14 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
   );
   const [verbosityField, verbosityMeta, verbosityHelpers] = useField({
     name: 'verbosity',
-    validate: required(null, i18n),
+    validate: required(null),
   });
 
   const argumentsRequired =
     moduleNameField.value === 'command' || moduleNameField.value === 'shell';
   const [, argumentsMeta, argumentsHelpers] = useField({
     name: 'module_args',
-    validate: argumentsRequired && required(null, i18n),
+    validate: argumentsRequired && required(null),
   });
 
   const isValid = !argumentsMeta.error || !argumentsMeta.touched;
@@ -59,8 +59,8 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
         <FormFullWidthLayout>
           <FormGroup
             fieldId="module_name"
-            aria-label={i18n._(t`select module`)}
-            label={i18n._(t`Module`)}
+            aria-label={t`select module`}
+            label={t`Module`}
             isRequired
             helperTextInvalid={moduleNameMeta.error}
             validated={
@@ -70,22 +70,20 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
             }
             labelIcon={
               <Popover
-                content={i18n._(
-                  t`These are the modules that ${brandName} supports running commands against.`
-                )}
+                content={t`These are the modules that ${brandName} supports running commands against.`}
               />
             }
           >
             <AnsibleSelect
               {...moduleNameField}
-              placeHolder={i18n._(t`Select a module`)}
+              placeHolder={t`Select a module`}
               isValid={!moduleNameMeta.touched || !moduleNameMeta.error}
               id="module_name"
               data={[
                 {
                   value: '',
                   key: '',
-                  label: i18n._(t`Choose a module`),
+                  label: t`Choose a module`,
                   isDisabled: true,
                 },
                 ...moduleOptions.map(value => ({
@@ -105,9 +103,9 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
           <FormField
             id="module_args"
             name="module_args"
-            aria-label={i18n._(t`Arguments`)}
+            aria-label={t`Arguments`}
             type="text"
-            label={i18n._(t`Arguments`)}
+            label={t`Arguments`}
             validated={isValid ? 'default' : 'error'}
             onBlur={() => argumentsHelpers.setTouched(true)}
             isRequired={
@@ -117,27 +115,25 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
             tooltip={
               moduleNameField.value ? (
                 <>
-                  {i18n._(
-                    t`These arguments are used with the specified module. You can find information about ${moduleNameField.value} by clicking `
-                  )}
+                  {t`These arguments are used with the specified module. You can find information about ${moduleNameField.value} by clicking `}
                   <a
                     href={`https://docs.ansible.com/ansible/latest/modules/${moduleNameField.value}_module.html`}
                     target="_blank"
                     rel="noopener noreferrer"
                   >
                     {' '}
-                    {i18n._(t`here.`)}
+                    {t`here.`}
                   </a>
                 </>
               ) : (
-                i18n._(t`These arguments are used with the specified module.`)
+                t`These arguments are used with the specified module.`
               )
             }
           />
           <FormGroup
             fieldId="verbosity"
-            aria-label={i18n._(t`select verbosity`)}
-            label={i18n._(t`Verbosity`)}
+            aria-label={t`select verbosity`}
+            label={t`Verbosity`}
             isRequired
             validated={
               !verbosityMeta.touched || !verbosityMeta.error
@@ -147,9 +143,7 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
             helperTextInvalid={verbosityMeta.error}
             labelIcon={
               <Popover
-                content={i18n._(
-                  t`These are the verbosity levels for standard out of the command run that are supported.`
-                )}
+                content={t`These are the verbosity levels for standard out of the command run that are supported.`}
               />
             }
           >
@@ -167,19 +161,17 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
             id="limit"
             name="limit"
             type="text"
-            label={i18n._(t`Limit`)}
-            aria-label={i18n._(t`Limit`)}
+            label={t`Limit`}
+            aria-label={t`Limit`}
             tooltip={
               <span>
-                {i18n._(
-                  t`The pattern used to target hosts in the inventory. Leaving the field blank, all, and * will all target all hosts in the inventory. You can find more information about Ansible's host patterns`
-                )}{' '}
+                {t`The pattern used to target hosts in the inventory. Leaving the field blank, all, and * will all target all hosts in the inventory. You can find more information about Ansible's host patterns`}{' '}
                 <a
                   href="https://docs.ansible.com/ansible/latest/user_guide/intro_patterns.html"
                   target="_blank"
                   rel="noopener noreferrer"
                 >
-                  {i18n._(t`here`)}
+                  {t`here`}
                 </a>
               </span>
             }
@@ -189,67 +181,63 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
             name="forks"
             type="number"
             min="0"
-            label={i18n._(t`Forks`)}
-            aria-label={i18n._(t`Forks`)}
+            label={t`Forks`}
+            aria-label={t`Forks`}
             tooltip={
               <span>
-                {i18n._(
-                  t`The number of parallel or simultaneous processes to use while executing the playbook. Inputting no value will use the default value from the ansible configuration file.  You can find more information`
-                )}{' '}
+                {t`The number of parallel or simultaneous processes to use while executing the playbook. Inputting no value will use the default value from the ansible configuration file.  You can find more information`}{' '}
                 <a
                   href="https://docs.ansible.com/ansible/latest/installation_guide/intro_configuration.html#the-ansible-configuration-file"
                   target="_blank"
                   rel="noopener noreferrer"
                 >
-                  {i18n._(t`here.`)}
+                  {t`here.`}
                 </a>
               </span>
             }
           />
           <FormColumnLayout>
             <FormGroup
-              label={i18n._(t`Show changes`)}
-              aria-label={i18n._(t`Show changes`)}
+              label={t`Show changes`}
+              aria-label={t`Show changes`}
               labelIcon={
                 <Popover
-                  content={i18n._(
-                    t`If enabled, show the changes made by Ansible tasks, where supported. This is equivalent to Ansible’s --diff mode.`
-                  )}
+                  content={t`If enabled, show the changes made by Ansible tasks, where supported. This is equivalent to Ansible’s --diff mode.`}
                 />
               }
             >
               <Switch
                 css="display: inline-flex;"
                 id="diff_mode"
-                label={i18n._(t`On`)}
-                labelOff={i18n._(t`Off`)}
+                label={t`On`}
+                labelOff={t`Off`}
                 isChecked={diffModeField.value}
                 onChange={() => {
                   diffModeHelpers.setValue(!diffModeField.value);
                 }}
-                aria-label={i18n._(t`toggle changes`)}
+                aria-label={t`toggle changes`}
               />
             </FormGroup>
             <FormGroup name="become_enabled" fieldId="become_enabled">
               <FormCheckboxLayout>
                 <Checkbox
-                  aria-label={i18n._(t`Enable privilege escalation`)}
+                  aria-label={t`Enable privilege escalation`}
                   label={
                     <span>
-                      {i18n._(t`Enable privilege escalation`)}
+                      {t`Enable privilege escalation`}
                       &nbsp;
                       <Popover
                         content={
                           <p>
-                            {i18n._(t`Enables creation of a provisioning
+                            {t`Enables creation of a provisioning
                               callback URL. Using the URL a host can contact ${brandName}
                               and request a configuration update using this job
-                              template`)}
+                              template`}
                             &nbsp;
                             <code>--become </code>
-                            {i18n._(t`option to the`)} &nbsp;
+                            {t`option to the`} &nbsp;
                             <code>ansible </code>
-                            {i18n._(t`command`)}
+                            {t`command`}
                           </p>
                         }
                       />
@@ -275,14 +263,12 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
             tooltip={
               <TooltipWrapper>
                 <p>
-                  {i18n._(
-                    t`Pass extra command line changes. There are two ansible command line parameters: `
-                  )}
+                  {t`Pass extra command line changes. There are two ansible command line parameters: `}
                   <br />
                   <code>-e</code>, <code>--extra-vars </code>
                   <br />
-                  {i18n._(t`Provide key/value pairs using either
-                  YAML or JSON.`)}
+                  {t`Provide key/value pairs using either
+                  YAML or JSON.`}
                 </p>
                 JSON:
                 <br />
@@ -306,8 +292,8 @@ function AdHocDetailsStep({ i18n, verbosityOptions, moduleOptions }) {
                 </code>
               </TooltipWrapper>
             }
-            label={i18n._(t`Extra variables`)}
-            aria-label={i18n._(t`Extra variables`)}
+            label={t`Extra variables`}
+            aria-label={t`Extra variables`}
           />
         </FormFullWidthLayout>
       </FormColumnLayout>
@@ -320,4 +306,4 @@ AdHocDetailsStep.propTypes = {
   verbosityOptions: PropTypes.arrayOf(PropTypes.object).isRequired,
 };
 
-export default withI18n()(AdHocDetailsStep);
+export default AdHocDetailsStep;
diff --git a/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx b/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx
index c78bac17fb..8c2351110e 100644
--- a/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx
+++ b/awx/ui_next/src/components/AddDropDownButton/AddDropDownButton.jsx
@@ -1,12 +1,11 @@
 import React, { useState, useRef, useEffect, Fragment } from 'react';
-import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Dropdown, DropdownPosition } from '@patternfly/react-core';
 import { ToolbarAddButton } from '../PaginatedDataList';
 import { useKebabifiedMenu } from '../../contexts/Kebabified';
 
-function AddDropDownButton({ dropdownItems, i18n }) {
+function AddDropDownButton({ dropdownItems }) {
   const { isKebabified } = useKebabifiedMenu();
   const [isOpen, setIsOpen] = useState(false);
   const element = useRef(null);
@@ -36,7 +35,7 @@ function AddDropDownButton({ dropdownItems, i18n }) {
         position={DropdownPosition.right}
         toggle={
           <ToolbarAddButton
-            aria-label={i18n._(t`Add`)}
+            aria-label={t`Add`}
             showToggleIndicator
             onClick={() => setIsOpen(!isOpen)}
           />
@@ -52,4 +51,4 @@ AddDropDownButton.propTypes = {
 };
 
 export { AddDropDownButton as _AddDropDownButton };
-export default withI18n()(AddDropDownButton);
+export default AddDropDownButton;
diff --git a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx
index b07a1cd39c..b30f21b35f 100644
--- a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx
+++ b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx
@@ -1,7 +1,6 @@
 import React, { Fragment, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import SelectableCard from '../SelectableCard';
 import Wizard from '../Wizard';
@@ -18,7 +17,7 @@ const readTeams = async queryParams => TeamsAPI.read(queryParams);
 
 const readTeamsOptions = async () => TeamsAPI.readOptions();
 
-function AddResourceRole({ onSave, onClose, roles, i18n, resource, onError }) {
+function AddResourceRole({ onSave, onClose, roles, resource, onError }) {
   const history = useHistory();
 
   const [selectedResource, setSelectedResource] = useState(null);
@@ -122,52 +121,52 @@ function AddResourceRole({ onSave, onClose, roles, i18n, resource, onError }) {
 
   const userSearchColumns = [
     {
-      name: i18n._(t`Username`),
+      name: t`Username`,
       key: 'username__icontains',
       isDefault: true,
     },
     {
-      name: i18n._(t`First Name`),
+      name: t`First Name`,
       key: 'first_name__icontains',
     },
     {
-      name: i18n._(t`Last Name`),
+      name: t`Last Name`,
       key: 'last_name__icontains',
     },
   ];
   const userSortColumns = [
     {
-      name: i18n._(t`Username`),
+      name: t`Username`,
       key: 'username',
     },
     {
-      name: i18n._(t`First Name`),
+      name: t`First Name`,
       key: 'first_name',
     },
     {
-      name: i18n._(t`Last Name`),
+      name: t`Last Name`,
       key: 'last_name',
     },
   ];
   const teamSearchColumns = [
     {
-      name: i18n._(t`Name`),
+      name: t`Name`,
       key: 'name',
       isDefault: true,
     },
     {
-      name: i18n._(t`Created By (Username)`),
+      name: t`Created By (Username)`,
       key: 'created_by__username',
     },
     {
-      name: i18n._(t`Modified By (Username)`),
+      name: t`Modified By (Username)`,
       key: 'modified_by__username',
     },
   ];
 
   const teamSortColumns = [
     {
-      name: i18n._(t`Name`),
+      name: t`Name`,
       key: 'name',
     },
   ];
@@ -176,30 +175,28 @@ function AddResourceRole({ onSave, onClose, roles, i18n, resource, onError }) {
 
   switch (selectedResource) {
     case 'users':
-      wizardTitle = i18n._(t`Add User Roles`);
+      wizardTitle = t`Add User Roles`;
       break;
     case 'teams':
-      wizardTitle = i18n._(t`Add Team Roles`);
+      wizardTitle = t`Add Team Roles`;
       break;
     default:
-      wizardTitle = i18n._(t`Add Roles`);
+      wizardTitle = t`Add Roles`;
   }
 
   const steps = [
     {
       id: 1,
-      name: i18n._(t`Select a Resource Type`),
+      name: t`Select a Resource Type`,
       component: (
         <div style={{ display: 'flex', flexWrap: 'wrap' }}>
           <div style={{ width: '100%', marginBottom: '10px' }}>
-            {i18n._(
-              t`Choose the type of resource that will be receiving new roles.  For example, if you'd like to add new roles to a set of users please choose Users and click Next.  You'll be able to select the specific resources in the next step.`
-            )}
+            {t`Choose the type of resource that will be receiving new roles.  For example, if you'd like to add new roles to a set of users please choose Users and click Next.  You'll be able to select the specific resources in the next step.`}
           </div>
           <SelectableCard
             isSelected={selectedResource === 'users'}
-            label={i18n._(t`Users`)}
-            ariaLabel={i18n._(t`Users`)}
+            label={t`Users`}
+            ariaLabel={t`Users`}
             dataCy="add-role-users"
             onClick={() => handleResourceSelect('users')}
           />
@@ -208,8 +205,8 @@ function AddResourceRole({ onSave, onClose, roles, i18n, resource, onError }) {
             !resource?.organization) ? null : (
             <SelectableCard
               isSelected={selectedResource === 'teams'}
-              label={i18n._(t`Teams`)}
-              ariaLabel={i18n._(t`Teams`)}
+              label={t`Teams`}
+              ariaLabel={t`Teams`}
               dataCy="add-role-teams"
               onClick={() => handleResourceSelect('teams')}
             />
@@ -220,7 +217,7 @@ function AddResourceRole({ onSave, onClose, roles, i18n, resource, onError }) {
     },
     {
       id: 2,
-      name: i18n._(t`Select Items from List`),
+      name: t`Select Items from List`,
       component: (
         <Fragment>
           {selectedResource === 'users' && (
@@ -231,7 +228,7 @@ function AddResourceRole({ onSave, onClose, roles, i18n, resource, onError }) {
               onRowClick={handleResourceCheckboxClick}
               fetchItems={readUsers}
               fetchOptions={readUsersOptions}
-              selectedLabel={i18n._(t`Selected`)}
+              selectedLabel={t`Selected`}
               selectedResourceRows={selectedResourceRows}
               sortedColumnKey="username"
             />
@@ -243,7 +240,7 @@ function AddResourceRole({ onSave, onClose, roles, i18n, resource, onError }) {
               onRowClick={handleResourceCheckboxClick}
               fetchItems={readTeams}
               fetchOptions={readTeamsOptions}
-              selectedLabel={i18n._(t`Selected`)}
+              selectedLabel={t`Selected`}
               selectedResourceRows={selectedResourceRows}
             />
           )}
@@ -254,18 +251,18 @@ function AddResourceRole({ onSave, onClose, roles, i18n, resource, onError }) {
     },
     {
       id: 3,
-      name: i18n._(t`Select Roles to Apply`),
+      name: t`Select Roles to Apply`,
       component: (
         <SelectRoleStep
           onRolesClick={handleRoleCheckboxClick}
           roles={selectableRoles}
           selectedListKey={selectedResource === 'users' ? 'username' : 'name'}
-          selectedListLabel={i18n._(t`Selected`)}
+          selectedListLabel={t`Selected`}
           selectedResourceRows={selectedResourceRows}
           selectedRoleRows={selectedRoleRows}
         />
       ),
-      nextButtonText: i18n._(t`Save`),
+      nextButtonText: t`Save`,
       enableNext: selectedRoleRows.length > 0,
       canJumpTo: maxEnabledStep >= 3,
     },
@@ -285,8 +282,8 @@ function AddResourceRole({ onSave, onClose, roles, i18n, resource, onError }) {
       steps={steps}
       title={wizardTitle}
       nextButtonText={currentStep.nextButtonText || undefined}
-      backButtonText={i18n._(t`Back`)}
-      cancelButtonText={i18n._(t`Cancel`)}
+      backButtonText={t`Back`}
+      cancelButtonText={t`Cancel`}
     />
   );
 }
@@ -304,4 +301,4 @@ AddResourceRole.defaultProps = {
 };
 
 export { AddResourceRole as _AddResourceRole };
-export default withI18n()(AddResourceRole);
+export default AddResourceRole;
diff --git a/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx b/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx
index f9a73d24ce..3a0ec2c5fe 100644
--- a/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx
+++ b/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx
@@ -1,7 +1,6 @@
 import React, { Fragment, useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { withRouter, useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import useRequest from '../../util/useRequest';
 
@@ -30,7 +29,6 @@ function SelectResourceStep({
   selectedResourceRows,
   fetchItems,
   fetchOptions,
-  i18n,
 }) {
   const location = useLocation();
 
@@ -78,9 +76,7 @@ function SelectResourceStep({
   return (
     <Fragment>
       <div>
-        {i18n._(
-          t`Choose the resources that will be receiving new roles.  You'll be able to select the roles to apply in the next step.  Note that the resources chosen here will receive all roles chosen in the next step.`
-        )}
+        {t`Choose the resources that will be receiving new roles.  You'll be able to select the roles to apply in the next step.  Note that the resources chosen here will receive all roles chosen in the next step.`}
       </div>
       {selectedResourceRows.length > 0 && (
         <SelectedList
@@ -139,4 +135,4 @@ SelectResourceStep.defaultProps = {
 };
 
 export { SelectResourceStep as _SelectResourceStep };
-export default withI18n()(withRouter(SelectResourceStep));
+export default withRouter(SelectResourceStep);
diff --git a/awx/ui_next/src/components/AddRole/SelectRoleStep.jsx b/awx/ui_next/src/components/AddRole/SelectRoleStep.jsx
index 32f0e6a96c..09fea55174 100644
--- a/awx/ui_next/src/components/AddRole/SelectRoleStep.jsx
+++ b/awx/ui_next/src/components/AddRole/SelectRoleStep.jsx
@@ -1,7 +1,6 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 
-import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 
 import CheckboxCard from './CheckboxCard';
@@ -14,21 +13,18 @@ function RolesStep({
   selectedListLabel,
   selectedResourceRows,
   selectedRoleRows,
-  i18n,
 }) {
   return (
     <Fragment>
       <div>
-        {i18n._(
-          t`Choose roles to apply to the selected resources.  Note that all selected roles will be applied to all selected resources.`
-        )}
+        {t`Choose roles to apply to the selected resources.  Note that all selected roles will be applied to all selected resources.`}
       </div>
       <div>
         {selectedResourceRows.length > 0 && (
           <SelectedList
             displayKey={selectedListKey}
             isReadOnly
-            label={selectedListLabel || i18n._(t`Selected`)}
+            label={selectedListLabel || t`Selected`}
             selected={selectedResourceRows}
           />
         )}
@@ -75,4 +71,4 @@ RolesStep.defaultProps = {
   selectedRoleRows: [],
 };
 
-export default withI18n()(RolesStep);
+export default RolesStep;
diff --git a/awx/ui_next/src/components/AlertModal/AlertModal.jsx b/awx/ui_next/src/components/AlertModal/AlertModal.jsx
index 0c443300be..3d3c7394d3 100644
--- a/awx/ui_next/src/components/AlertModal/AlertModal.jsx
+++ b/awx/ui_next/src/components/AlertModal/AlertModal.jsx
@@ -8,7 +8,7 @@ import {
   InfoCircleIcon,
   TimesCircleIcon,
 } from '@patternfly/react-icons';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 
@@ -20,13 +20,11 @@ const Header = styled.div`
 `;
 
 function AlertModal({
-  i18n,
   isOpen = null,
   title,
   label,
   variant,
   children,
-  i18nHash,
   ...props
 }) {
   const variantIcons = {
@@ -74,7 +72,7 @@ function AlertModal({
   return (
     <Modal
       header={customHeader}
-      aria-label={label || i18n._(t`Alert modal`)}
+      aria-label={label || t`Alert modal`}
       aria-labelledby="alert-modal-header-label"
       isOpen={Boolean(isOpen)}
       variant="small"
@@ -86,4 +84,4 @@ function AlertModal({
   );
 }
 
-export default withI18n()(AlertModal);
+export default AlertModal;
diff --git a/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx b/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx
index 62b8983eb4..2c63abf9e8 100644
--- a/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx
+++ b/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx
@@ -8,14 +8,14 @@ import {
   shape,
   bool,
 } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { FormSelect, FormSelectOption } from '@patternfly/react-core';
 
 function AnsibleSelect({
   id,
   data,
-  i18n,
+
   isValid,
   onBlur,
   value,
@@ -35,7 +35,7 @@ function AnsibleSelect({
       value={value}
       onChange={onSelectChange}
       onBlur={onBlur}
-      aria-label={i18n._(t`Select Input`)}
+      aria-label={t`Select Input`}
       validated={isValid ? 'default' : 'error'}
       className={className}
       isDisabled={isDisabled}
@@ -79,4 +79,4 @@ AnsibleSelect.propTypes = {
 };
 
 export { AnsibleSelect as _AnsibleSelect };
-export default withI18n()(AnsibleSelect);
+export default AnsibleSelect;
diff --git a/awx/ui_next/src/components/AppContainer/AppContainer.jsx b/awx/ui_next/src/components/AppContainer/AppContainer.jsx
index ede56b2862..18db51495b 100644
--- a/awx/ui_next/src/components/AppContainer/AppContainer.jsx
+++ b/awx/ui_next/src/components/AppContainer/AppContainer.jsx
@@ -12,7 +12,7 @@ import {
   PageSidebar,
 } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import styled from 'styled-components';
 
 import { MeAPI, RootAPI } from '../../api';
@@ -85,7 +85,7 @@ function useStorage(key) {
   return [storageVal, setValue];
 }
 
-function AppContainer({ i18n, navRouteConfig = [], children }) {
+function AppContainer({ navRouteConfig = [], children }) {
   const history = useHistory();
   const config = useConfig();
 
@@ -139,7 +139,7 @@ function AppContainer({ i18n, navRouteConfig = [], children }) {
   }, [handleLogout, timeRemaining]);
 
   const brandName = config?.license_info?.product_name;
-  const alt = brandName ? i18n._(t`${brandName} logo`) : i18n._(t`brand logo`);
+  const alt = brandName ? t`${brandName} logo` : t`brand logo`;
 
   const header = (
     <PageHeader
@@ -165,7 +165,7 @@ function AppContainer({ i18n, navRouteConfig = [], children }) {
           <PageHeaderToolsGroup>
             <PageHeaderToolsItem>
               <Button onClick={handleLogout} variant="tertiary" ouiaId="logout">
-                {i18n._(t`Logout`)}
+                {t`Logout`}
               </Button>
             </PageHeaderToolsItem>
           </PageHeaderToolsGroup>
@@ -178,7 +178,7 @@ function AppContainer({ i18n, navRouteConfig = [], children }) {
     <PageSidebar
       theme="dark"
       nav={
-        <Nav aria-label={i18n._(t`Navigation`)} theme="dark">
+        <Nav aria-label={t`Navigation`} theme="dark">
           <NavList>
             {navRouteConfig.map(({ groupId, groupTitle, routes }) => (
               <NavExpandableGroup
@@ -210,7 +210,7 @@ function AppContainer({ i18n, navRouteConfig = [], children }) {
       />
       <AlertModal
         ouiaId="session-expiration-modal"
-        title={i18n._(t`Your session is about to expire`)}
+        title={t`Your session is about to expire`}
         isOpen={timeoutWarning && sessionTimeout > 0 && timeRemaining !== null}
         onClose={handleLogout}
         showClose={false}
@@ -222,7 +222,7 @@ function AppContainer({ i18n, navRouteConfig = [], children }) {
             variant="primary"
             onClick={handleSessionContinue}
           >
-            {i18n._(t`Continue`)}
+            {t`Continue`}
           </Button>,
           <Button
             ouiaId="session-expiration-logout-button"
@@ -230,19 +230,17 @@ function AppContainer({ i18n, navRouteConfig = [], children }) {
             variant="secondary"
             onClick={handleLogout}
           >
-            {i18n._(t`Logout`)}
+            {t`Logout`}
           </Button>,
         ]}
       >
-        {i18n._(
-          t`You will be logged out in ${Number(
-            Math.max(Math.floor(timeRemaining / 1000), 0)
-          )} seconds due to inactivity.`
-        )}
+        {t`You will be logged out in ${Number(
+          Math.max(Math.floor(timeRemaining / 1000), 0)
+        )} seconds due to inactivity.`}
       </AlertModal>
     </>
   );
 }
 
 export { AppContainer as _AppContainer };
-export default withI18n()(withRouter(AppContainer));
+export default withRouter(AppContainer);
diff --git a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx
index cb4da26130..297276ae82 100644
--- a/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx
+++ b/awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
@@ -42,7 +42,6 @@ function PageHeaderToolbar({
   onAboutClick,
   onLogoutClick,
   loggedInUser,
-  i18n,
 }) {
   const [isHelpOpen, setIsHelpOpen] = useState(false);
   const [isUserOpen, setIsUserOpen] = useState(false);
@@ -83,10 +82,7 @@ function PageHeaderToolbar({
   return (
     <PageHeaderTools>
       <PageHeaderToolsGroup>
-        <Tooltip
-          position="bottom"
-          content={i18n._(t`Pending Workflow Approvals`)}
-        >
+        <Tooltip position="bottom" content={t`Pending Workflow Approvals`}>
           <PageHeaderToolsItem>
             <Link to="/workflow_approvals?workflow_approvals.status=pending">
               <PendingWorkflowApprovals>
@@ -108,10 +104,7 @@ function PageHeaderToolbar({
             position={DropdownPosition.right}
             onSelect={handleHelpSelect}
             toggle={
-              <DropdownToggle
-                onToggle={setIsHelpOpen}
-                aria-label={i18n._(t`Info`)}
-              >
+              <DropdownToggle onToggle={setIsHelpOpen} aria-label={t`Info`}>
                 <QuestionCircleIcon />
               </DropdownToggle>
             }
@@ -121,7 +114,7 @@ function PageHeaderToolbar({
                 target="_blank"
                 href={`${getDocsBaseUrl(config)}/html/userguide/index.html`}
               >
-                {i18n._(t`Help`)}
+                {t`Help`}
               </DropdownItem>,
               <DropdownItem
                 key="about"
@@ -129,12 +122,12 @@ function PageHeaderToolbar({
                 isDisabled={isAboutDisabled}
                 onClick={onAboutClick}
               >
-                {i18n._(t`About`)}
+                {t`About`}
               </DropdownItem>,
             ]}
           />
         </PageHeaderToolsItem>
-        <Tooltip position="left" content={<div>{i18n._(t`User`)}</div>}>
+        <Tooltip position="left" content={<div>{t`User`}</div>}>
           <PageHeaderToolsItem>
             <Dropdown
               id="toolbar-user-dropdown"
@@ -155,14 +148,14 @@ function PageHeaderToolbar({
               dropdownItems={[
                 <DropdownItem
                   key="user"
-                  aria-label={i18n._(t`User details`)}
+                  aria-label={t`User details`}
                   href={
                     loggedInUser
                       ? `/#/users/${loggedInUser.id}/details`
                       : '/#/home'
                   }
                 >
-                  {i18n._(t`User Details`)}
+                  {t`User Details`}
                 </DropdownItem>,
                 <DropdownItem
                   key="logout"
@@ -170,7 +163,7 @@ function PageHeaderToolbar({
                   onClick={onLogoutClick}
                   id="logout-button"
                 >
-                  {i18n._(t`Logout`)}
+                  {t`Logout`}
                 </DropdownItem>,
               ]}
             />
@@ -191,4 +184,4 @@ PageHeaderToolbar.defaultProps = {
   isAboutDisabled: false,
 };
 
-export default withI18n()(PageHeaderToolbar);
+export default PageHeaderToolbar;
diff --git a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx
index c95d09ab06..a2f9663861 100644
--- a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx
+++ b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Modal } from '@patternfly/react-core';
 import OptionsList from '../OptionsList';
@@ -17,9 +17,8 @@ const QS_CONFIG = (order_by = 'name') => {
 };
 
 function AssociateModal({
-  i18n,
-  header = i18n._(t`Items`),
-  title = i18n._(t`Select Items`),
+  header = t`Items`,
+  title = t`Select Items`,
   onClose,
   onAssociate,
   fetchRequest,
@@ -96,28 +95,28 @@ function AssociateModal({
       <Modal
         variant="large"
         title={title}
-        aria-label={i18n._(t`Association modal`)}
+        aria-label={t`Association modal`}
         isOpen={isModalOpen}
         onClose={handleClose}
         actions={[
           <Button
             ouiaId="associate-modal-save"
-            aria-label={i18n._(t`Save`)}
+            aria-label={t`Save`}
             key="select"
             variant="primary"
             onClick={handleSave}
             isDisabled={selected.length === 0}
           >
-            {i18n._(t`Save`)}
+            {t`Save`}
           </Button>,
           <Button
             ouiaId="associate-modal-cancel"
-            aria-label={i18n._(t`Cancel`)}
+            aria-label={t`Cancel`}
             key="cancel"
             variant="link"
             onClick={handleClose}
           >
-            {i18n._(t`Cancel`)}
+            {t`Cancel`}
           </Button>,
         ]}
       >
@@ -136,22 +135,22 @@ function AssociateModal({
           value={selected}
           searchColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: `${displayKey}__icontains`,
               isDefault: true,
             },
             {
-              name: i18n._(t`Created By (Username)`),
+              name: t`Created By (Username)`,
               key: 'created_by__username__icontains',
             },
             {
-              name: i18n._(t`Modified By (Username)`),
+              name: t`Modified By (Username)`,
               key: 'modified_by__username__icontains',
             },
           ]}
           sortColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: `${displayKey}`,
             },
           ]}
@@ -163,4 +162,4 @@ function AssociateModal({
   );
 }
 
-export default withI18n()(AssociateModal);
+export default AssociateModal;
diff --git a/awx/ui_next/src/components/ChipGroup/ChipGroup.jsx b/awx/ui_next/src/components/ChipGroup/ChipGroup.jsx
index c16ee052fe..a4ad262b89 100644
--- a/awx/ui_next/src/components/ChipGroup/ChipGroup.jsx
+++ b/awx/ui_next/src/components/ChipGroup/ChipGroup.jsx
@@ -1,16 +1,16 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { ChipGroup as PFChipGroup } from '@patternfly/react-core';
-import { number, shape } from 'prop-types';
+import { number } from 'prop-types';
 
-function ChipGroup({ i18n, numChips, totalChips, i18nHash, ...props }) {
+function ChipGroup({ numChips, totalChips, ...props }) {
   return (
     <PFChipGroup
       {...props}
       numChips={numChips}
-      expandedText={i18n._(t`Show less`)}
-      collapsedText={i18n._(t`${totalChips - numChips} more`)}
+      expandedText={t`Show less`}
+      collapsedText={t`${totalChips - numChips} more`}
     />
   );
 }
@@ -18,7 +18,6 @@ function ChipGroup({ i18n, numChips, totalChips, i18nHash, ...props }) {
 ChipGroup.propTypes = {
   numChips: number.isRequired,
   totalChips: number.isRequired,
-  i18n: shape({}).isRequired,
 };
 
-export default withI18n()(ChipGroup);
+export default ChipGroup;
diff --git a/awx/ui_next/src/components/CodeEditor/CodeEditor.jsx b/awx/ui_next/src/components/CodeEditor/CodeEditor.jsx
index 501ece5bdb..23932b0056 100644
--- a/awx/ui_next/src/components/CodeEditor/CodeEditor.jsx
+++ b/awx/ui_next/src/components/CodeEditor/CodeEditor.jsx
@@ -8,7 +8,7 @@ import 'ace-builds/src-noconflict/mode-javascript';
 import 'ace-builds/src-noconflict/mode-yaml';
 import 'ace-builds/src-noconflict/mode-django';
 import 'ace-builds/src-noconflict/theme-github';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import debounce from '../../util/debounce';
@@ -81,7 +81,6 @@ function CodeEditor({
   rows,
   fullHeight,
   className,
-  i18n,
 }) {
   if (rows && typeof rows !== 'number' && rows !== 'auto') {
     // eslint-disable-next-line no-console
@@ -185,7 +184,7 @@ function CodeEditor({
           className="pf-c-form__helper-text keyboard-help-text"
           aria-live="polite"
         >
-          {i18n._(t`Press Enter to edit. Press ESC to stop editing.`)}
+          {t`Press Enter to edit. Press ESC to stop editing.`}
         </div>
       )}
     </>
@@ -210,4 +209,4 @@ CodeEditor.defaultProps = {
   className: '',
 };
 
-export default withI18n()(CodeEditor);
+export default CodeEditor;
diff --git a/awx/ui_next/src/components/CodeEditor/VariablesDetail.jsx b/awx/ui_next/src/components/CodeEditor/VariablesDetail.jsx
index 3e8b08f69e..1f5e4c7231 100644
--- a/awx/ui_next/src/components/CodeEditor/VariablesDetail.jsx
+++ b/awx/ui_next/src/components/CodeEditor/VariablesDetail.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { useState } from 'react';
 import { node, number, oneOfType, shape, string, arrayOf } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Split,
@@ -23,15 +23,7 @@ import {
 import CodeEditor from './CodeEditor';
 import { JSON_MODE, YAML_MODE } from './constants';
 
-function VariablesDetail({
-  dataCy,
-  helpText,
-  value,
-  label,
-  rows,
-  fullHeight,
-  i18n,
-}) {
+function VariablesDetail({ dataCy, helpText, value, label, rows, fullHeight }) {
   const [mode, setMode] = useState(
     isJsonObject(value) || isJsonString(value) ? JSON_MODE : YAML_MODE
   );
@@ -84,7 +76,6 @@ function VariablesDetail({
           setMode={setMode}
           currentValue={currentValue}
           onExpand={() => setIsExpanded(true)}
-          i18n={i18n}
         />
       </DetailName>
       <DetailValue
@@ -107,7 +98,7 @@ function VariablesDetail({
             css="color: var(--pf-global--danger-color--100);
             font-size: var(--pf-global--FontSize--sm"
           >
-            {i18n._(t`Error:`)} {error.message}
+            {t`Error:`} {error.message}
           </div>
         )}
       </DetailValue>
@@ -118,13 +109,13 @@ function VariablesDetail({
         onClose={() => setIsExpanded(false)}
         actions={[
           <Button
-            aria-label={i18n._(t`Done`)}
+            aria-label={t`Done`}
             key="select"
             variant="primary"
             onClick={() => setIsExpanded(false)}
             ouiaId={`${dataCy}-unexpand`}
           >
-            {i18n._(t`Done`)}
+            {t`Done`}
           </Button>,
         ]}
       >
@@ -137,7 +128,6 @@ function VariablesDetail({
             mode={mode}
             setMode={setMode}
             currentValue={currentValue}
-            i18n={i18n}
           />
           <CodeEditor
             id={`${dataCy}-preview-expanded`}
@@ -166,16 +156,7 @@ VariablesDetail.defaultProps = {
   helpText: '',
 };
 
-function ModeToggle({
-  id,
-  label,
-  helpText,
-  dataCy,
-  mode,
-  setMode,
-  onExpand,
-  i18n,
-}) {
+function ModeToggle({ id, label, helpText, dataCy, mode, setMode, onExpand }) {
   return (
     <Split hasGutter>
       <SplitItem isFilled>
@@ -211,7 +192,7 @@ function ModeToggle({
         <SplitItem>
           <Button
             variant="plain"
-            aria-label={i18n._(t`Expand input`)}
+            aria-label={t`Expand input`}
             onClick={onExpand}
             ouiaId={`${dataCy}-expand`}
           >
@@ -223,4 +204,4 @@ function ModeToggle({
   );
 }
 
-export default withI18n()(VariablesDetail);
+export default VariablesDetail;
diff --git a/awx/ui_next/src/components/CodeEditor/VariablesField.jsx b/awx/ui_next/src/components/CodeEditor/VariablesField.jsx
index 58fee94765..ef9a551561 100644
--- a/awx/ui_next/src/components/CodeEditor/VariablesField.jsx
+++ b/awx/ui_next/src/components/CodeEditor/VariablesField.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { string, bool } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import styled from 'styled-components';
@@ -24,15 +24,7 @@ const StyledCheckboxField = styled(CheckboxField)`
   margin-left: auto;
 `;
 
-function VariablesField({
-  i18n,
-  id,
-  name,
-  label,
-  readOnly,
-  promptId,
-  tooltip,
-}) {
+function VariablesField({ id, name, label, readOnly, promptId, tooltip }) {
   // track focus manually, because the Code Editor library doesn't wire
   // into Formik completely
   const [shouldValidate, setShouldValidate] = useState(false);
@@ -112,7 +104,6 @@ function VariablesField({
   return (
     <div>
       <VariablesFieldInternals
-        i18n={i18n}
         id={id}
         name={name}
         label={label}
@@ -132,19 +123,18 @@ function VariablesField({
         onClose={() => setIsExpanded(false)}
         actions={[
           <Button
-            aria-label={i18n._(t`Done`)}
+            aria-label={t`Done`}
             key="select"
             variant="primary"
             onClick={() => setIsExpanded(false)}
             ouiaId={`${id}-variables-unexpand`}
           >
-            {i18n._(t`Done`)}
+            {t`Done`}
           </Button>,
         ]}
       >
         <div className="pf-c-form">
           <VariablesFieldInternals
-            i18n={i18n}
             id={`${id}-expanded`}
             name={name}
             label={label}
@@ -180,7 +170,6 @@ VariablesField.defaultProps = {
 };
 
 function VariablesFieldInternals({
-  i18n,
   id,
   name,
   label,
@@ -227,14 +216,14 @@ function VariablesFieldInternals({
         {promptId && (
           <StyledCheckboxField
             id="template-ask-variables-on-launch"
-            label={i18n._(t`Prompt on launch`)}
+            label={t`Prompt on launch`}
             name="ask_variables_on_launch"
           />
         )}
         {onExpand && (
           <Button
             variant="plain"
-            aria-label={i18n._(t`Expand input`)}
+            aria-label={t`Expand input`}
             onClick={onExpand}
             ouiaId={`${id}-variables-expand`}
           >
@@ -257,4 +246,4 @@ function VariablesFieldInternals({
   );
 }
 
-export default withI18n()(VariablesField);
+export default VariablesField;
diff --git a/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx b/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx
index 58b34e0dcd..a1d88be425 100644
--- a/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx
+++ b/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import {
   Title,
   EmptyState,
@@ -9,15 +9,15 @@ import {
 } from '@patternfly/react-core';
 import { CubesIcon } from '@patternfly/react-icons';
 
-const ContentEmpty = ({ i18n, title = '', message = '' }) => (
+const ContentEmpty = ({ title = '', message = '' }) => (
   <EmptyState variant="full">
     <EmptyStateIcon icon={CubesIcon} />
     <Title size="lg" headingLevel="h3">
-      {title || i18n._(t`No items found.`)}
+      {title || t`No items found.`}
     </Title>
     <EmptyStateBody>{message}</EmptyStateBody>
   </EmptyState>
 );
 
 export { ContentEmpty as _ContentEmpty };
-export default withI18n()(ContentEmpty);
+export default ContentEmpty;
diff --git a/awx/ui_next/src/components/ContentError/ContentError.jsx b/awx/ui_next/src/components/ContentError/ContentError.jsx
index 3c56a2630d..3cd939b17b 100644
--- a/awx/ui_next/src/components/ContentError/ContentError.jsx
+++ b/awx/ui_next/src/components/ContentError/ContentError.jsx
@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
 import { Link, Redirect } from 'react-router-dom';
 import { bool, instanceOf } from 'prop-types';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import {
   Title,
   EmptyState,
@@ -18,7 +18,7 @@ async function logout() {
   window.location.replace('/#/login');
 }
 
-function ContentError({ error, children, isNotFound, i18n }) {
+function ContentError({ error, children, isNotFound }) {
   if (error && error.response && error.response.status === 401) {
     if (!error.response.headers['session-timeout']) {
       logout();
@@ -36,17 +36,13 @@ function ContentError({ error, children, isNotFound, i18n }) {
         <EmptyState variant="full">
           <EmptyStateIcon icon={ExclamationTriangleIcon} />
           <Title size="lg" headingLevel="h3">
-            {is404 ? i18n._(t`Not Found`) : i18n._(t`Something went wrong...`)}
+            {is404 ? t`Not Found` : t`Something went wrong...`}
           </Title>
           <EmptyStateBody>
             {is404
-              ? i18n._(t`The page you requested could not be found.`)
-              : i18n._(
-                  t`There was an error loading this content. Please reload the page.`
-                )}{' '}
-            {children || (
-              <Link to="/home">{i18n._(t`Back to Dashboard.`)}</Link>
-            )}
+              ? t`The page you requested could not be found.`
+              : t`There was an error loading this content. Please reload the page.`}{' '}
+            {children || <Link to="/home">{t`Back to Dashboard.`}</Link>}
           </EmptyStateBody>
           {error && <ErrorDetail error={error} />}
         </EmptyState>
@@ -64,4 +60,4 @@ ContentError.defaultProps = {
 };
 
 export { ContentError as _ContentError };
-export default withI18n()(ContentError);
+export default ContentError;
diff --git a/awx/ui_next/src/components/CopyButton/CopyButton.jsx b/awx/ui_next/src/components/CopyButton/CopyButton.jsx
index 1f5dd9cff4..f8a53eedf7 100644
--- a/awx/ui_next/src/components/CopyButton/CopyButton.jsx
+++ b/awx/ui_next/src/components/CopyButton/CopyButton.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 
@@ -16,7 +16,7 @@ function CopyButton({
   onCopyStart,
   onCopyFinish,
   errorMessage,
-  i18n,
+
   ouiaId,
 }) {
   const { isLoading, error: copyError, request: copyItemToAPI } = useRequest(
@@ -38,17 +38,17 @@ function CopyButton({
         id={id}
         ouiaId={ouiaId}
         isDisabled={isLoading || isDisabled}
-        aria-label={i18n._(t`Copy`)}
+        aria-label={t`Copy`}
         variant="plain"
         onClick={copyItemToAPI}
       >
         <CopyIcon />
       </Button>
       <AlertModal
-        aria-label={i18n._(t`Copy Error`)}
+        aria-label={t`Copy Error`}
         isOpen={error}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={dismissError}
       >
         {errorMessage}
@@ -72,4 +72,4 @@ CopyButton.defaultProps = {
   ouiaId: null,
 };
 
-export default withI18n()(CopyButton);
+export default CopyButton;
diff --git a/awx/ui_next/src/components/CredentialChip/CredentialChip.jsx b/awx/ui_next/src/components/CredentialChip/CredentialChip.jsx
index 7dd5b055b5..04f7894730 100644
--- a/awx/ui_next/src/components/CredentialChip/CredentialChip.jsx
+++ b/awx/ui_next/src/components/CredentialChip/CredentialChip.jsx
@@ -1,15 +1,14 @@
 import React from 'react';
-import { shape } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Chip } from '@patternfly/react-core';
 import { Credential } from '../../types';
 import { toTitleCase } from '../../util/strings';
 
-function CredentialChip({ credential, i18n, i18nHash, ...props }) {
+function CredentialChip({ credential, ...props }) {
   let type;
   if (credential.cloud) {
-    type = i18n._(t`Cloud`);
+    type = t`Cloud`;
   } else if (credential.kind === 'aws' || credential.kind === 'ssh') {
     type = credential.kind.toUpperCase();
   } else {
@@ -32,8 +31,7 @@ function CredentialChip({ credential, i18n, i18nHash, ...props }) {
 }
 CredentialChip.propTypes = {
   credential: Credential.isRequired,
-  i18n: shape({}).isRequired,
 };
 
 export { CredentialChip as _CredentialChip };
-export default withI18n()(CredentialChip);
+export default CredentialChip;
diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx
index e52ae1c2cb..44351ebfd7 100644
--- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx
+++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Checkbox,
@@ -37,7 +37,7 @@ function DataListToolbar({
   onExpand,
   onSelectAll,
   additionalControls,
-  i18n,
+
   qsConfig,
   pagination,
 }) {
@@ -62,7 +62,7 @@ function DataListToolbar({
       id={`${qsConfig.namespace}-list-toolbar`}
       clearAllFilters={clearAllFilters}
       collapseListedFiltersBreakpoint="lg"
-      clearFiltersButtonText={i18n._(t`Clear all filters`)}
+      clearFiltersButtonText={t`Clear all filters`}
     >
       <ToolbarContent>
         {showSelectAll && (
@@ -71,7 +71,7 @@ function DataListToolbar({
               <Checkbox
                 isChecked={isAllSelected}
                 onChange={onSelectAll}
-                aria-label={i18n._(t`Select all`)}
+                aria-label={t`Select all`}
                 id="select-all"
               />
             </ToolbarItem>
@@ -83,7 +83,7 @@ function DataListToolbar({
               qsConfig={qsConfig}
               columns={[
                 ...searchColumns,
-                { name: i18n._(t`Advanced`), key: 'advanced' },
+                { name: t`Advanced`, key: 'advanced' },
               ]}
               searchableKeys={searchableKeys}
               relatedSearchableKeys={relatedSearchableKeys}
@@ -190,4 +190,4 @@ DataListToolbar.defaultProps = {
   additionalControls: [],
 };
 
-export default withI18n()(DataListToolbar);
+export default DataListToolbar;
diff --git a/awx/ui_next/src/components/DeleteButton/DeleteButton.jsx b/awx/ui_next/src/components/DeleteButton/DeleteButton.jsx
index d2b236ad81..24a7f24fd5 100644
--- a/awx/ui_next/src/components/DeleteButton/DeleteButton.jsx
+++ b/awx/ui_next/src/components/DeleteButton/DeleteButton.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import { Button, Badge, Alert, Tooltip } from '@patternfly/react-core';
@@ -20,7 +20,7 @@ function DeleteButton({
   onConfirm,
   modalTitle,
   name,
-  i18n,
+
   variant,
   children,
   isDisabled,
@@ -54,7 +54,7 @@ function DeleteButton({
     return (
       <AlertModal
         isOpen={deleteMessageError}
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => {
           toggleModal(false);
           setDeleteMessageError();
@@ -73,12 +73,12 @@ function DeleteButton({
               isLoading={isLoading}
               spinnerAriaValueText={isLoading ? 'Loading' : undefined}
               variant={variant || 'secondary'}
-              aria-label={i18n._(t`Delete`)}
+              aria-label={t`Delete`}
               isDisabled={isDisabled}
               onClick={() => toggleModal(true)}
               ouiaId={ouiaId}
             >
-              {children || i18n._(t`Delete`)}
+              {children || t`Delete`}
             </Button>
           </div>
         </Tooltip>
@@ -88,11 +88,11 @@ function DeleteButton({
           isLoading={isLoading}
           spinnerAriaValueText={isLoading ? 'Loading' : undefined}
           variant={variant || 'secondary'}
-          aria-label={i18n._(t`Delete`)}
+          aria-label={t`Delete`}
           isDisabled={isDisabled}
           onClick={() => toggleModal(true)}
         >
-          {children || i18n._(t`Delete`)}
+          {children || t`Delete`}
         </Button>
       )}
       <AlertModal
@@ -105,27 +105,27 @@ function DeleteButton({
             ouiaId="delete-modal-confirm"
             key="delete"
             variant="danger"
-            aria-label={i18n._(t`Confirm Delete`)}
+            aria-label={t`Confirm Delete`}
             isDisabled={isDisabled}
             onClick={() => {
               onConfirm();
               toggleModal(false);
             }}
           >
-            {i18n._(t`Delete`)}
+            {t`Delete`}
           </Button>,
           <Button
             ouiaId="delete-modal-cancel"
             key="cancel"
             variant="link"
-            aria-label={i18n._(t`Cancel`)}
+            aria-label={t`Cancel`}
             onClick={() => toggleModal(false)}
           >
-            {i18n._(t`Cancel`)}
+            {t`Cancel`}
           </Button>,
         ]}
       >
-        {i18n._(t`Are you sure you want to delete:`)}
+        {t`Are you sure you want to delete:`}
         <br />
         <strong>{name}</strong>
         {Object.values(deleteDetails).length > 0 && (
@@ -158,4 +158,4 @@ DeleteButton.defaultProps = {
   ouiaId: null,
 };
 
-export default withI18n()(DeleteButton);
+export default DeleteButton;
diff --git a/awx/ui_next/src/components/DetailList/DeletedDetail.jsx b/awx/ui_next/src/components/DetailList/DeletedDetail.jsx
index e71fc183bd..60cf2f883c 100644
--- a/awx/ui_next/src/components/DetailList/DeletedDetail.jsx
+++ b/awx/ui_next/src/components/DetailList/DeletedDetail.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { node } from 'prop-types';
 import styled from 'styled-components';
@@ -11,12 +11,12 @@ const Detail = styled(_Detail)`
   }
 `;
 
-function DeletedDetail({ i18n, label }) {
-  return <Detail label={label} value={i18n._(t`Deleted`)} />;
+function DeletedDetail({ label }) {
+  return <Detail label={label} value={t`Deleted`} />;
 }
 
 DeletedDetail.propTypes = {
   label: node.isRequired,
 };
 
-export default withI18n()(DeletedDetail);
+export default DeletedDetail;
diff --git a/awx/ui_next/src/components/DetailList/LaunchedByDetail.jsx b/awx/ui_next/src/components/DetailList/LaunchedByDetail.jsx
index 6c451a3e51..7708feadc9 100644
--- a/awx/ui_next/src/components/DetailList/LaunchedByDetail.jsx
+++ b/awx/ui_next/src/components/DetailList/LaunchedByDetail.jsx
@@ -32,13 +32,13 @@ const getLaunchedByDetails = ({ summary_fields = {}, related = {} }) => {
   return { link, value };
 };
 
-export default function LaunchedByDetail({ job, i18n }) {
+export default function LaunchedByDetail({ job }) {
   const { value: launchedByValue, link: launchedByLink } =
     getLaunchedByDetails(job) || {};
 
   return (
     <Detail
-      label={i18n._(t`Launched By`)}
+      label={t`Launched By`}
       value={
         launchedByLink ? (
           <Link to={`${launchedByLink}`}>{launchedByValue}</Link>
diff --git a/awx/ui_next/src/components/DisassociateButton/DisassociateButton.jsx b/awx/ui_next/src/components/DisassociateButton/DisassociateButton.jsx
index 220a242c34..697dc6b304 100644
--- a/awx/ui_next/src/components/DisassociateButton/DisassociateButton.jsx
+++ b/awx/ui_next/src/components/DisassociateButton/DisassociateButton.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext } from 'react';
 import { arrayOf, func, shape, string, oneOfType, number } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Tooltip, DropdownItem } from '@patternfly/react-core';
 import styled from 'styled-components';
@@ -13,10 +13,9 @@ const ModalNote = styled.div`
 `;
 
 function DisassociateButton({
-  i18n,
   itemsToDisassociate = [],
   modalNote = '',
-  modalTitle = i18n._(t`Disassociate?`),
+  modalTitle = t`Disassociate?`,
   onDisassociate,
   verifyCannotDisassociate = true,
 }) {
@@ -48,18 +47,16 @@ function DisassociateButton({
       if (itemsToDisassociate.some(cannotDisassociate)) {
         return (
           <div>
-            {i18n._(
-              t`You do not have permission to disassociate the following: ${itemsUnableToDisassociate}`
-            )}
+            {t`You do not have permission to disassociate the following: ${itemsUnableToDisassociate}`}
           </div>
         );
       }
     }
 
     if (itemsToDisassociate.length) {
-      return i18n._(t`Disassociate`);
+      return t`Disassociate`;
     }
-    return i18n._(t`Select a row to disassociate`);
+    return t`Select a row to disassociate`;
   }
 
   let isDisabled = false;
@@ -79,12 +76,12 @@ function DisassociateButton({
       {isKebabified ? (
         <DropdownItem
           key="add"
-          aria-label={i18n._(t`disassociate`)}
+          aria-label={t`disassociate`}
           isDisabled={isDisabled}
           component="button"
           onClick={() => setIsOpen(true)}
         >
-          {i18n._(t`Disassociate`)}
+          {t`Disassociate`}
         </DropdownItem>
       ) : (
         <Tooltip content={renderTooltip()} position="top">
@@ -92,11 +89,11 @@ function DisassociateButton({
             <Button
               ouiaId="disassociate-button"
               variant="secondary"
-              aria-label={i18n._(t`Disassociate`)}
+              aria-label={t`Disassociate`}
               onClick={() => setIsOpen(true)}
               isDisabled={isDisabled}
             >
-              {i18n._(t`Disassociate`)}
+              {t`Disassociate`}
             </Button>
           </div>
         </Tooltip>
@@ -113,25 +110,25 @@ function DisassociateButton({
               ouiaId="disassociate-modal-confirm"
               key="disassociate"
               variant="danger"
-              aria-label={i18n._(t`confirm disassociate`)}
+              aria-label={t`confirm disassociate`}
               onClick={handleDisassociate}
             >
-              {i18n._(t`Disassociate`)}
+              {t`Disassociate`}
             </Button>,
             <Button
               ouiaId="disassociate-modal-cancel"
               key="cancel"
               variant="link"
-              aria-label={i18n._(t`Cancel`)}
+              aria-label={t`Cancel`}
               onClick={() => setIsOpen(false)}
             >
-              {i18n._(t`Cancel`)}
+              {t`Cancel`}
             </Button>,
           ]}
         >
           {modalNote && <ModalNote>{modalNote}</ModalNote>}
 
-          <div>{i18n._(t`This action will disassociate the following:`)}</div>
+          <div>{t`This action will disassociate the following:`}</div>
 
           {itemsToDisassociate.map(item => (
             <span key={item.id}>
@@ -171,4 +168,4 @@ DisassociateButton.propTypes = {
   onDisassociate: func.isRequired,
 };
 
-export default withI18n()(DisassociateButton);
+export default DisassociateButton;
diff --git a/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx b/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx
index 3b05ba47d5..2118fdfc9e 100644
--- a/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx
+++ b/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx
@@ -1,7 +1,7 @@
 import React, { useState, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import {
@@ -32,7 +32,7 @@ const Expandable = styled(PFExpandable)`
   }
 `;
 
-function ErrorDetail({ error, i18n }) {
+function ErrorDetail({ error }) {
   const { response } = error;
   const [isExpanded, setIsExpanded] = useState(false);
 
@@ -70,7 +70,7 @@ function ErrorDetail({ error, i18n }) {
 
   return (
     <Expandable
-      toggleText={i18n._(t`Details`)}
+      toggleText={t`Details`}
       onToggle={handleToggle}
       isExpanded={isExpanded}
     >
@@ -87,4 +87,4 @@ ErrorDetail.propTypes = {
   error: PropTypes.instanceOf(Error).isRequired,
 };
 
-export default withI18n()(ErrorDetail);
+export default ErrorDetail;
diff --git a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
index 593812c2d5..415a855d9f 100644
--- a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
+++ b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { bool, string } from 'prop-types';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Tooltip } from '@patternfly/react-core';
 import styled from 'styled-components';
@@ -20,11 +20,10 @@ function ExecutionEnvironmentDetail({
   virtualEnvironment,
   executionEnvironment,
   isDefaultEnvironment,
-  i18n,
 }) {
   const label = isDefaultEnvironment
-    ? i18n._(t`Default Execution Environment`)
-    : i18n._(t`Execution Environment`);
+    ? t`Default Execution Environment`
+    : t`Execution Environment`;
 
   if (executionEnvironment) {
     return (
@@ -47,12 +46,10 @@ function ExecutionEnvironmentDetail({
         label={label}
         value={
           <>
-            {i18n._(t`Missing resource`)}
+            {t`Missing resource`}
             <span>
               <Tooltip
-                content={i18n._(
-                  t`Custom virtual environment ${virtualEnvironment} must be replaced by an execution environment.`
-                )}
+                content={t`Custom virtual environment ${virtualEnvironment} must be replaced by an execution environment.`}
                 position="right"
               >
                 <ExclamationTriangleIcon />
@@ -79,4 +76,4 @@ ExecutionEnvironmentDetail.defaultProps = {
   virtualEnvironment: '',
 };
 
-export default withI18n()(ExecutionEnvironmentDetail);
+export default ExecutionEnvironmentDetail;
diff --git a/awx/ui_next/src/components/ExpandCollapse/ExpandCollapse.jsx b/awx/ui_next/src/components/ExpandCollapse/ExpandCollapse.jsx
index 251ad86354..d1ee17dac4 100644
--- a/awx/ui_next/src/components/ExpandCollapse/ExpandCollapse.jsx
+++ b/awx/ui_next/src/components/ExpandCollapse/ExpandCollapse.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Button as PFButton,
@@ -31,14 +31,14 @@ const ToolbarItem = styled(PFToolbarItem)`
 
 // TODO: Recommend renaming this component to avoid confusion
 // with ExpandingContainer
-function ExpandCollapse({ isCompact, onCompact, onExpand, i18n }) {
+function ExpandCollapse({ isCompact, onCompact, onExpand }) {
   return (
     <Fragment>
       <ToolbarItem>
         <Button
           ouiaId="toolbar-collapse-button"
           variant="plain"
-          aria-label={i18n._(t`Collapse`)}
+          aria-label={t`Collapse`}
           onClick={onCompact}
           isActive={isCompact}
         >
@@ -49,7 +49,7 @@ function ExpandCollapse({ isCompact, onCompact, onExpand, i18n }) {
         <Button
           ouiaId="toolbar-expand-button"
           variant="plain"
-          aria-label={i18n._(t`Expand`)}
+          aria-label={t`Expand`}
           onClick={onExpand}
           isActive={!isCompact}
         >
@@ -70,4 +70,4 @@ ExpandCollapse.defaultProps = {
   isCompact: true,
 };
 
-export default withI18n()(ExpandCollapse);
+export default ExpandCollapse;
diff --git a/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx b/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx
index 4617d0284c..bf3b3661c9 100644
--- a/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx
+++ b/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { bool, node, string } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import { CheckboxField } from '../FormField';
@@ -19,7 +19,7 @@ const StyledCheckboxField = styled(CheckboxField)`
 function FieldWithPrompt({
   children,
   fieldId,
-  i18n,
+
   isRequired,
   label,
   promptId,
@@ -44,7 +44,7 @@ function FieldWithPrompt({
         <StyledCheckboxField
           isDisabled={isDisabled}
           id={promptId}
-          label={i18n._(t`Prompt on launch`)}
+          label={t`Prompt on launch`}
           name={promptName}
         />
       </FieldHeader>
@@ -67,4 +67,4 @@ FieldWithPrompt.defaultProps = {
   tooltip: null,
 };
 
-export default withI18n()(FieldWithPrompt);
+export default FieldWithPrompt;
diff --git a/awx/ui_next/src/components/FormActionGroup/FormActionGroup.jsx b/awx/ui_next/src/components/FormActionGroup/FormActionGroup.jsx
index 1d59a2de78..a28dcb25c3 100644
--- a/awx/ui_next/src/components/FormActionGroup/FormActionGroup.jsx
+++ b/awx/ui_next/src/components/FormActionGroup/FormActionGroup.jsx
@@ -1,32 +1,32 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { ActionGroup, Button } from '@patternfly/react-core';
 import { FormFullWidthLayout } from '../FormLayout';
 
-const FormActionGroup = ({ onCancel, onSubmit, submitDisabled, i18n }) => {
+const FormActionGroup = ({ onCancel, onSubmit, submitDisabled }) => {
   return (
     <FormFullWidthLayout>
       <ActionGroup>
         <Button
           ouiaId="form-save-button"
-          aria-label={i18n._(t`Save`)}
+          aria-label={t`Save`}
           variant="primary"
           type="button"
           onClick={onSubmit}
           isDisabled={submitDisabled}
         >
-          {i18n._(t`Save`)}
+          {t`Save`}
         </Button>
         <Button
           ouiaId="form-cancel-button"
-          aria-label={i18n._(t`Cancel`)}
+          aria-label={t`Cancel`}
           variant="link"
           type="button"
           onClick={onCancel}
         >
-          {i18n._(t`Cancel`)}
+          {t`Cancel`}
         </Button>
       </ActionGroup>
     </FormFullWidthLayout>
@@ -43,4 +43,4 @@ FormActionGroup.defaultProps = {
   submitDisabled: false,
 };
 
-export default withI18n()(FormActionGroup);
+export default FormActionGroup;
diff --git a/awx/ui_next/src/components/FormField/PasswordInput.jsx b/awx/ui_next/src/components/FormField/PasswordInput.jsx
index 3c406dcba0..4747ef1319 100644
--- a/awx/ui_next/src/components/FormField/PasswordInput.jsx
+++ b/awx/ui_next/src/components/FormField/PasswordInput.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import {
@@ -12,15 +12,7 @@ import {
 import { EyeIcon, EyeSlashIcon } from '@patternfly/react-icons';
 
 function PasswordInput(props) {
-  const {
-    autocomplete,
-    id,
-    name,
-    validate,
-    isRequired,
-    isDisabled,
-    i18n,
-  } = props;
+  const { autocomplete, id, name, validate, isRequired, isDisabled } = props;
   const [inputType, setInputType] = useState('password');
   const [field, meta] = useField({ name, validate });
 
@@ -32,13 +24,11 @@ function PasswordInput(props) {
 
   return (
     <>
-      <Tooltip
-        content={inputType === 'password' ? i18n._(t`Show`) : i18n._(t`Hide`)}
-      >
+      <Tooltip content={inputType === 'password' ? t`Show` : t`Hide`}>
         <Button
           ouiaId={`${id}-toggle`}
           variant={ButtonVariant.control}
-          aria-label={i18n._(t`Toggle Password`)}
+          aria-label={t`Toggle Password`}
           onClick={handlePasswordToggle}
           isDisabled={isDisabled}
         >
@@ -80,4 +70,4 @@ PasswordInput.defaultProps = {
   isDisabled: false,
 };
 
-export default withI18n()(PasswordInput);
+export default PasswordInput;
diff --git a/awx/ui_next/src/components/HostForm/HostForm.jsx b/awx/ui_next/src/components/HostForm/HostForm.jsx
index ca116b566e..75615df214 100644
--- a/awx/ui_next/src/components/HostForm/HostForm.jsx
+++ b/awx/ui_next/src/components/HostForm/HostForm.jsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { bool, func, shape } from 'prop-types';
 import { Formik, useField } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import { Form, FormGroup } from '@patternfly/react-core';
@@ -13,24 +13,22 @@ import { FormColumnLayout, FormFullWidthLayout } from '../FormLayout';
 import Popover from '../Popover';
 import { required } from '../../util/validators';
 
-const InventoryLookupField = withI18n()(({ i18n, host }) => {
+const InventoryLookupField = ({ host }) => {
   const [inventory, setInventory] = useState(
     host ? host.summary_fields.inventory : ''
   );
 
   const [, inventoryMeta, inventoryHelpers] = useField({
     name: 'inventory',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   return (
     <FormGroup
-      label={i18n._(t`Inventory`)}
+      label={t`Inventory`}
       labelIcon={
         <Popover
-          content={i18n._(
-            t`Select the inventory that this host will belong to.`
-          )}
+          content={t`Select the inventory that this host will belong to.`}
         />
       }
       isRequired
@@ -44,7 +42,7 @@ const InventoryLookupField = withI18n()(({ i18n, host }) => {
         fieldId="inventory-lookup"
         value={inventory}
         onBlur={() => inventoryHelpers.setTouched()}
-        tooltip={i18n._(t`Select the inventory that this host will belong to.`)}
+        tooltip={t`Select the inventory that this host will belong to.`}
         isValid={!inventoryMeta.touched || !inventoryMeta.error}
         helperTextInvalid={inventoryMeta.error}
         onChange={value => {
@@ -57,14 +55,14 @@ const InventoryLookupField = withI18n()(({ i18n, host }) => {
       />
     </FormGroup>
   );
-});
+};
 
 const HostForm = ({
   handleCancel,
   handleSubmit,
   host,
   isInventoryVisible,
-  i18n,
+
   submitError,
 }) => {
   return (
@@ -84,22 +82,22 @@ const HostForm = ({
               id="host-name"
               name="name"
               type="text"
-              label={i18n._(t`Name`)}
-              validate={required(null, i18n)}
+              label={t`Name`}
+              validate={required(null)}
               isRequired
             />
             <FormField
               id="host-description"
               name="description"
               type="text"
-              label={i18n._(t`Description`)}
+              label={t`Description`}
             />
             {isInventoryVisible && <InventoryLookupField host={host} />}
             <FormFullWidthLayout>
               <VariablesField
                 id="host-variables"
                 name="variables"
-                label={i18n._(t`Variables`)}
+                label={t`Variables`}
               />
             </FormFullWidthLayout>
             {submitError && <FormSubmitError error={submitError} />}
@@ -137,4 +135,4 @@ HostForm.defaultProps = {
 };
 
 export { HostForm as _HostForm };
-export default withI18n()(HostForm);
+export default HostForm;
diff --git a/awx/ui_next/src/components/HostToggle/HostToggle.jsx b/awx/ui_next/src/components/HostToggle/HostToggle.jsx
index 638ccb2347..4a7b03d55a 100644
--- a/awx/ui_next/src/components/HostToggle/HostToggle.jsx
+++ b/awx/ui_next/src/components/HostToggle/HostToggle.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React, { Fragment, useState, useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Switch, Tooltip } from '@patternfly/react-core';
 import AlertModal from '../AlertModal';
@@ -9,16 +9,13 @@ import useRequest from '../../util/useRequest';
 import { HostsAPI } from '../../api';
 
 function HostToggle({
-  i18n,
   className,
   host,
   isDisabled = false,
   onToggle,
-  tooltip = i18n._(
-    t`Indicates if a host is available and should be included in running
+  tooltip = t`Indicates if a host is available and should be included in running
     jobs.  For hosts that are part of an external inventory, this may be
-    reset by the inventory sync process.`
-  ),
+    reset by the inventory sync process.`,
 }) {
   const [isEnabled, setIsEnabled] = useState(host.enabled);
   const [showError, setShowError] = useState(false);
@@ -55,8 +52,8 @@ function HostToggle({
           className={className}
           css="display: inline-flex;"
           id={`host-${host.id}-toggle`}
-          label={i18n._(t`On`)}
-          labelOff={i18n._(t`Off`)}
+          label={t`On`}
+          labelOff={t`Off`}
           isChecked={isEnabled}
           isDisabled={
             isLoading ||
@@ -64,17 +61,17 @@ function HostToggle({
             !host.summary_fields.user_capabilities.edit
           }
           onChange={toggleHost}
-          aria-label={i18n._(t`Toggle host`)}
+          aria-label={t`Toggle host`}
         />
       </Tooltip>
       {showError && error && !isLoading && (
         <AlertModal
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           isOpen={error && !isLoading}
           onClose={() => setShowError(false)}
         >
-          {i18n._(t`Failed to toggle host.`)}
+          {t`Failed to toggle host.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -82,4 +79,4 @@ function HostToggle({
   );
 }
 
-export default withI18n()(HostToggle);
+export default HostToggle;
diff --git a/awx/ui_next/src/components/InstanceToggle/InstanceToggle.jsx b/awx/ui_next/src/components/InstanceToggle/InstanceToggle.jsx
index f3c08f64a6..7865d2d312 100644
--- a/awx/ui_next/src/components/InstanceToggle/InstanceToggle.jsx
+++ b/awx/ui_next/src/components/InstanceToggle/InstanceToggle.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Switch, Tooltip } from '@patternfly/react-core';
 import AlertModal from '../AlertModal';
@@ -8,13 +8,7 @@ import useRequest from '../../util/useRequest';
 import { InstancesAPI } from '../../api';
 import { useConfig } from '../../contexts/Config';
 
-function InstanceToggle({
-  className,
-  fetchInstances,
-  instance,
-  onToggle,
-  i18n,
-}) {
+function InstanceToggle({ className, fetchInstances, instance, onToggle }) {
   const { me = {} } = useConfig();
   const [isEnabled, setIsEnabled] = useState(instance.enabled);
   const [showError, setShowError] = useState(false);
@@ -46,31 +40,29 @@ function InstanceToggle({
   return (
     <>
       <Tooltip
-        content={i18n._(
-          t`Set the instance online or offline. If offline, jobs will not be assigned to this instance.`
-        )}
+        content={t`Set the instance online or offline. If offline, jobs will not be assigned to this instance.`}
         position="top"
       >
         <Switch
           className={className}
           css="display: inline-flex;"
           id={`host-${instance.id}-toggle`}
-          label={i18n._(t`On`)}
-          labelOff={i18n._(t`Off`)}
+          label={t`On`}
+          labelOff={t`Off`}
           isChecked={isEnabled}
           isDisabled={isLoading || !me?.is_superuser}
           onChange={toggleInstance}
-          aria-label={i18n._(t`Toggle instance`)}
+          aria-label={t`Toggle instance`}
         />
       </Tooltip>
       {showError && error && !isLoading && (
         <AlertModal
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           isOpen={error && !isLoading}
           onClose={() => setShowError(false)}
         >
-          {i18n._(t`Failed to toggle instance.`)}
+          {t`Failed to toggle instance.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -78,4 +70,4 @@ function InstanceToggle({
   );
 }
 
-export default withI18n()(InstanceToggle);
+export default InstanceToggle;
diff --git a/awx/ui_next/src/components/JobList/JobListCancelButton.jsx b/awx/ui_next/src/components/JobList/JobListCancelButton.jsx
index cfa18a43ef..225acadf45 100644
--- a/awx/ui_next/src/components/JobList/JobListCancelButton.jsx
+++ b/awx/ui_next/src/components/JobList/JobListCancelButton.jsx
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect, useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t, Plural } from '@lingui/macro';
 import { arrayOf, func } from 'prop-types';
 import { Button, DropdownItem, Tooltip } from '@patternfly/react-core';
@@ -18,7 +18,7 @@ function cannotCancelBecauseNotRunning(job) {
   return !isJobRunning(job.status);
 }
 
-function JobListCancelButton({ i18n, jobsToCancel, onCancel }) {
+function JobListCancelButton({ jobsToCancel, onCancel }) {
   const { isKebabified, onKebabModalChange } = useContext(KebabifiedContext);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const numJobsToCancel = jobsToCancel.length;
@@ -90,12 +90,12 @@ function JobListCancelButton({ i18n, jobsToCancel, onCancel }) {
       return (
         <Plural
           value={numJobsToCancel}
-          one={i18n._(t`Cancel selected job`)}
-          other={i18n._(t`Cancel selected jobs`)}
+          one={t`Cancel selected job`}
+          other={t`Cancel selected jobs`}
         />
       );
     }
-    return i18n._(t`Select a job to cancel`);
+    return t`Select a job to cancel`;
   };
 
   const isDisabled =
@@ -156,10 +156,10 @@ function JobListCancelButton({ i18n, jobsToCancel, onCancel }) {
               id="cancel-job-return-button"
               key="cancel"
               variant="secondary"
-              aria-label={i18n._(t`Return`)}
+              aria-label={t`Return`}
               onClick={toggleModal}
             >
-              {i18n._(t`Return`)}
+              {t`Return`}
             </Button>,
           ]}
         >
@@ -192,4 +192,4 @@ JobListCancelButton.defaultProps = {
   onCancel: () => {},
 };
 
-export default withI18n()(JobListCancelButton);
+export default JobListCancelButton;
diff --git a/awx/ui_next/src/components/JobList/JobListItem.jsx b/awx/ui_next/src/components/JobList/JobListItem.jsx
index 0a248b93d5..ad1215f8c6 100644
--- a/awx/ui_next/src/components/JobList/JobListItem.jsx
+++ b/awx/ui_next/src/components/JobList/JobListItem.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Chip } from '@patternfly/react-core';
 import { Tr, Td, ExpandableRowContent } from '@patternfly/react-table';
@@ -18,7 +18,6 @@ import { JOB_TYPE_URL_SEGMENTS } from '../../constants';
 
 const Dash = styled.span``;
 function JobListItem({
-  i18n,
   job,
   rowIndex,
   isSelected,
@@ -29,12 +28,12 @@ function JobListItem({
   const [isExpanded, setIsExpanded] = useState(false);
 
   const jobTypes = {
-    project_update: i18n._(t`Source Control Update`),
-    inventory_update: i18n._(t`Inventory Sync`),
-    job: i18n._(t`Playbook Run`),
-    ad_hoc_command: i18n._(t`Command`),
-    system_job: i18n._(t`Management Job`),
-    workflow_job: i18n._(t`Workflow Job`),
+    project_update: t`Source Control Update`,
+    inventory_update: t`Inventory Sync`,
+    job: t`Playbook Run`,
+    ad_hoc_command: t`Command`,
+    system_job: t`Management Job`,
+    workflow_job: t`Workflow Job`,
   };
 
   const {
@@ -64,9 +63,9 @@ function JobListItem({
             isSelected,
             onSelect,
           }}
-          dataLabel={i18n._(t`Select`)}
+          dataLabel={t`Select`}
         />
-        <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+        <Td id={labelId} dataLabel={t`Name`}>
           <span>
             <Link to={`/jobs/${JOB_TYPE_URL_SEGMENTS[job.type]}/${job.id}`}>
               <b>
@@ -75,19 +74,15 @@ function JobListItem({
             </Link>
           </span>
         </Td>
-        <Td dataLabel={i18n._(t`Status`)}>
+        <Td dataLabel={t`Status`}>
           {job.status && <StatusLabel status={job.status} />}
         </Td>
-        {showTypeColumn && (
-          <Td dataLabel={i18n._(t`Type`)}>{jobTypes[job.type]}</Td>
-        )}
-        <Td dataLabel={i18n._(t`Start Time`)}>
-          {formatDateString(job.started)}
-        </Td>
-        <Td dataLabel={i18n._(t`Finish Time`)}>
+        {showTypeColumn && <Td dataLabel={t`Type`}>{jobTypes[job.type]}</Td>}
+        <Td dataLabel={t`Start Time`}>{formatDateString(job.started)}</Td>
+        <Td dataLabel={t`Finish Time`}>
           {job.finished ? formatDateString(job.finished) : ''}
         </Td>
-        <ActionsTd dataLabel={i18n._(t`Actions`)}>
+        <ActionsTd dataLabel={t`Actions`}>
           <ActionItem
             visible={
               job.type !== 'system_job' &&
@@ -95,8 +90,8 @@ function JobListItem({
             }
             tooltip={
               job.status === 'failed' && job.type === 'job'
-                ? i18n._(t`Relaunch using host parameters`)
-                : i18n._(t`Relaunch Job`)
+                ? t`Relaunch using host parameters`
+                : t`Relaunch Job`
             }
           >
             {job.status === 'failed' && job.type === 'job' ? (
@@ -115,7 +110,7 @@ function JobListItem({
                     ouiaId={`${job.id}-relaunch-button`}
                     variant="plain"
                     onClick={handleRelaunch}
-                    aria-label={i18n._(t`Relaunch`)}
+                    aria-label={t`Relaunch`}
                     isDisabled={isLaunching}
                   >
                     <RocketIcon />
@@ -131,10 +126,10 @@ function JobListItem({
         <Td colSpan={showTypeColumn ? 6 : 5}>
           <ExpandableRowContent>
             <DetailList>
-              <LaunchedByDetail job={job} i18n={i18n} />
+              <LaunchedByDetail job={job} />
               {job_template && (
                 <Detail
-                  label={i18n._(t`Job Template`)}
+                  label={t`Job Template`}
                   value={
                     <Link to={`/templates/job_template/${job_template.id}`}>
                       {job_template.name}
@@ -144,7 +139,7 @@ function JobListItem({
               )}
               {workflow_job_template && (
                 <Detail
-                  label={i18n._(t`Workflow Job Template`)}
+                  label={t`Workflow Job Template`}
                   value={
                     <Link
                       to={`/templates/workflow_job_template/${workflow_job_template.id}`}
@@ -156,7 +151,7 @@ function JobListItem({
               )}
               {source_workflow_job && (
                 <Detail
-                  label={i18n._(t`Source Workflow Job`)}
+                  label={t`Source Workflow Job`}
                   value={
                     <Link to={`/jobs/workflow/${source_workflow_job.id}`}>
                       {source_workflow_job.id} - {source_workflow_job.name}
@@ -166,7 +161,7 @@ function JobListItem({
               )}
               {inventory && (
                 <Detail
-                  label={i18n._(t`Inventory`)}
+                  label={t`Inventory`}
                   value={
                     <Link
                       to={
@@ -182,7 +177,7 @@ function JobListItem({
               )}
               {project && (
                 <Detail
-                  label={i18n._(t`Project`)}
+                  label={t`Project`}
                   value={
                     <Link to={`/projects/${project.id}/details`}>
                       {project.name}
@@ -198,7 +193,7 @@ function JobListItem({
               {credentials && credentials.length > 0 && (
                 <Detail
                   fullWidth
-                  label={i18n._(t`Credentials`)}
+                  label={t`Credentials`}
                   value={
                     <ChipGroup numChips={5} totalChips={credentials.length}>
                       {credentials.map(c => (
@@ -211,7 +206,7 @@ function JobListItem({
               {labels && labels.count > 0 && (
                 <Detail
                   fullWidth
-                  label={i18n._(t`Labels`)}
+                  label={t`Labels`}
                   value={
                     <ChipGroup numChips={5} totalChips={labels.results.length}>
                       {labels.results.map(l => (
@@ -226,7 +221,7 @@ function JobListItem({
               {job.job_explanation && (
                 <Detail
                   fullWidth
-                  label={i18n._(t`Explanation`)}
+                  label={t`Explanation`}
                   value={job.job_explanation}
                 />
               )}
@@ -239,4 +234,4 @@ function JobListItem({
 }
 
 export { JobListItem as _JobListItem };
-export default withI18n()(JobListItem);
+export default JobListItem;
diff --git a/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx b/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
index ab292ee976..7424c8d35a 100644
--- a/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
+++ b/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
@@ -1,7 +1,7 @@
 import React, { Fragment, useState } from 'react';
 import { withRouter } from 'react-router-dom';
 import { number, shape } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import AlertModal from '../AlertModal';
@@ -32,7 +32,7 @@ function canLaunchWithoutPrompt(launchData) {
   );
 }
 
-function LaunchButton({ resource, i18n, children, history }) {
+function LaunchButton({ resource, children, history }) {
   const [showLaunchPrompt, setShowLaunchPrompt] = useState(false);
   const [launchConfig, setLaunchConfig] = useState(null);
   const [surveyConfig, setSurveyConfig] = useState(null);
@@ -168,10 +168,10 @@ function LaunchButton({ resource, i18n, children, history }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={() => setError(null)}
         >
-          {i18n._(t`Failed to launch job.`)}
+          {t`Failed to launch job.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -195,4 +195,4 @@ LaunchButton.propTypes = {
   }).isRequired,
 };
 
-export default withI18n()(withRouter(LaunchButton));
+export default withRouter(LaunchButton);
diff --git a/awx/ui_next/src/components/LaunchButton/ReLaunchDropDown.jsx b/awx/ui_next/src/components/LaunchButton/ReLaunchDropDown.jsx
index 1dfca545f7..a215fa5246 100644
--- a/awx/ui_next/src/components/LaunchButton/ReLaunchDropDown.jsx
+++ b/awx/ui_next/src/components/LaunchButton/ReLaunchDropDown.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Dropdown,
@@ -15,7 +15,7 @@ function ReLaunchDropDown({
   isPrimary = false,
   handleRelaunch,
   isLaunching,
-  i18n,
+
   ouiaId,
 }) {
   const [isOpen, setIsOpen] = useState(false);
@@ -27,38 +27,38 @@ function ReLaunchDropDown({
   const dropdownItems = [
     <DropdownItem
       ouiaId={`${ouiaId}-on`}
-      aria-label={i18n._(t`Relaunch on`)}
+      aria-label={t`Relaunch on`}
       key="relaunch_on"
       component="div"
       isPlainText
     >
-      {i18n._(t`Relaunch on`)}
+      {t`Relaunch on`}
     </DropdownItem>,
     <DropdownSeparator key="separator" />,
     <DropdownItem
       ouiaId={`${ouiaId}-all`}
       key="relaunch_all"
-      aria-label={i18n._(t`Relaunch all hosts`)}
+      aria-label={t`Relaunch all hosts`}
       component="button"
       onClick={() => {
         handleRelaunch({ hosts: 'all' });
       }}
       isDisabled={isLaunching}
     >
-      {i18n._(t`All`)}
+      {t`All`}
     </DropdownItem>,
 
     <DropdownItem
       ouiaId={`${ouiaId}-failed`}
       key="relaunch_failed"
-      aria-label={i18n._(t`Relaunch failed hosts`)}
+      aria-label={t`Relaunch failed hosts`}
       component="button"
       onClick={() => {
         handleRelaunch({ hosts: 'failed' });
       }}
       isDisabled={isLaunching}
     >
-      {i18n._(t`Failed hosts`)}
+      {t`Failed hosts`}
     </DropdownItem>,
   ];
 
@@ -74,11 +74,11 @@ function ReLaunchDropDown({
           <DropdownToggle
             toggleIndicator={null}
             onToggle={onToggle}
-            aria-label={i18n._(t`relaunch jobs`)}
+            aria-label={t`relaunch jobs`}
             id="relaunch_jobs"
             isPrimary
           >
-            {i18n._(t`Relaunch`)}
+            {t`Relaunch`}
           </DropdownToggle>
         }
       />
@@ -96,7 +96,7 @@ function ReLaunchDropDown({
         <DropdownToggle
           toggleIndicator={null}
           onToggle={onToggle}
-          aria-label={i18n._(t`relaunch jobs`)}
+          aria-label={t`relaunch jobs`}
           id="relaunch_jobs"
         >
           <RocketIcon />
@@ -106,4 +106,4 @@ function ReLaunchDropDown({
   );
 }
 
-export default withI18n()(ReLaunchDropDown);
+export default ReLaunchDropDown;
diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
index 69716edab7..614fde426a 100644
--- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Wizard } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik, useFormikContext } from 'formik';
 import ContentError from '../ContentError';
@@ -13,7 +13,7 @@ import AlertModal from '../AlertModal';
 
 function PromptModalForm({
   launchConfig,
-  i18n,
+
   onCancel,
   onSubmit,
   resource,
@@ -33,7 +33,7 @@ function PromptModalForm({
     launchConfig,
     surveyConfig,
     resource,
-    i18n,
+
     resourceDefaultCredentials
   );
 
@@ -70,7 +70,7 @@ function PromptModalForm({
       <AlertModal
         isOpen={error}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => {
           dismissError();
         }}
@@ -104,27 +104,27 @@ function PromptModalForm({
           validateStep(nextStep.id);
         }
       }}
-      title={i18n._(t`Prompts`)}
+      title={t`Prompts`}
       steps={
         isReady
           ? steps
           : [
               {
-                name: i18n._(t`Content Loading`),
+                name: t`Content Loading`,
                 component: <ContentLoading />,
               },
             ]
       }
-      backButtonText={i18n._(t`Back`)}
-      cancelButtonText={i18n._(t`Cancel`)}
-      nextButtonText={i18n._(t`Next`)}
+      backButtonText={t`Back`}
+      cancelButtonText={t`Cancel`}
+      nextButtonText={t`Next`}
     />
   );
 }
 
 function LaunchPrompt({
   launchConfig,
-  i18n,
+
   onCancel,
   onLaunch,
   resource = {},
@@ -136,7 +136,6 @@ function LaunchPrompt({
       <PromptModalForm
         onSubmit={values => onLaunch(values)}
         onCancel={onCancel}
-        i18n={i18n}
         launchConfig={launchConfig}
         surveyConfig={surveyConfig}
         resource={resource}
@@ -147,4 +146,4 @@ function LaunchPrompt({
 }
 
 export { LaunchPrompt as _LaunchPrompt };
-export default withI18n()(LaunchPrompt);
+export default LaunchPrompt;
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialPasswordsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialPasswordsStep.jsx
index 675a6a8477..f57c7c15e3 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialPasswordsStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialPasswordsStep.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Form } from '@patternfly/react-core';
 import { useFormikContext } from 'formik';
 import { PasswordField } from '../../FormField';
 
-function CredentialPasswordsStep({ launchConfig, i18n }) {
+function CredentialPasswordsStep({ launchConfig }) {
   const {
     values: { credentials },
   } = useFormikContext();
@@ -92,7 +92,7 @@ function CredentialPasswordsStep({ launchConfig, i18n }) {
       {showcredentialPasswordSsh && (
         <PasswordField
           id="launch-ssh-password"
-          label={i18n._(t`SSH password`)}
+          label={t`SSH password`}
           name="credential_passwords.ssh_password"
           isRequired
         />
@@ -100,7 +100,7 @@ function CredentialPasswordsStep({ launchConfig, i18n }) {
       {showcredentialPasswordPrivateKeyPassphrase && (
         <PasswordField
           id="launch-private-key-passphrase"
-          label={i18n._(t`Private key passphrase`)}
+          label={t`Private key passphrase`}
           name="credential_passwords.ssh_key_unlock"
           isRequired
         />
@@ -108,7 +108,7 @@ function CredentialPasswordsStep({ launchConfig, i18n }) {
       {showcredentialPasswordPrivilegeEscalation && (
         <PasswordField
           id="launch-privilege-escalation-password"
-          label={i18n._(t`Privilege escalation password`)}
+          label={t`Privilege escalation password`}
           name="credential_passwords.become_password"
           isRequired
         />
@@ -118,9 +118,7 @@ function CredentialPasswordsStep({ launchConfig, i18n }) {
           id={`launch-vault-password-${credId}`}
           key={credId}
           label={
-            credId === ''
-              ? i18n._(t`Vault password`)
-              : i18n._(t`Vault password | ${credId}`)
+            credId === '' ? t`Vault password` : t`Vault password | ${credId}`
           }
           name={`credential_passwords['vault_password${
             credId !== '' ? `.${credId}` : ''
@@ -132,4 +130,4 @@ function CredentialPasswordsStep({ launchConfig, i18n }) {
   );
 }
 
-export default withI18n()(CredentialPasswordsStep);
+export default CredentialPasswordsStep;
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.jsx
index a127aaf19a..dd6ebefc9c 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/CredentialsStep.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { useState, useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import styled from 'styled-components';
@@ -27,7 +27,6 @@ const QS_CONFIG = getQSConfig('credential', {
 });
 
 function CredentialsStep({
-  i18n,
   allowCredentialsWithPasswords,
   defaultCredentials = [],
 }) {
@@ -35,7 +34,6 @@ function CredentialsStep({
     name: 'credentials',
     validate: val => {
       return credentialsValidator(
-        i18n,
         defaultCredentials,
         allowCredentialsWithPasswords,
         val
@@ -106,7 +104,6 @@ function CredentialsStep({
   useEffect(() => {
     helpers.setError(
       credentialsValidator(
-        i18n,
         defaultCredentials,
         allowCredentialsWithPasswords,
         field.value
@@ -145,12 +142,12 @@ function CredentialsStep({
       {types && types.length > 0 && (
         <ToolbarItem css=" display: flex; align-items: center;">
           <div css="flex: 0 0 25%; margin-right: 32px">
-            {i18n._(t`Selected Category`)}
+            {t`Selected Category`}
           </div>
           <AnsibleSelect
             css="flex: 1 1 75%;"
             id="multiCredentialsLookUp-select"
-            label={i18n._(t`Selected Category`)}
+            label={t`Selected Category`}
             data={types.map(type => ({
               key: type.id,
               value: type.id,
@@ -171,29 +168,29 @@ function CredentialsStep({
         optionCount={count}
         searchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Created By (Username)`),
+            name: t`Created By (Username)`,
             key: 'created_by__username__icontains',
           },
           {
-            name: i18n._(t`Modified By (Username)`),
+            name: t`Modified By (Username)`,
             key: 'modified_by__username__icontains',
           },
         ]}
         sortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
           },
         ]}
         searchableKeys={searchableKeys}
         relatedSearchableKeys={relatedSearchableKeys}
         multiple={isVault}
-        header={i18n._(t`Credentials`)}
+        header={t`Credentials`}
         name="credentials"
         qsConfig={QS_CONFIG}
         readOnly={false}
@@ -218,4 +215,4 @@ function CredentialsStep({
   );
 }
 
-export default withI18n()(CredentialsStep);
+export default CredentialsStep;
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx
index 80c5b87bd2..0b92cd3906 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/InventoryStep.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import styled from 'styled-components';
@@ -22,7 +22,7 @@ const QS_CONFIG = getQSConfig('inventory', {
   order_by: 'name',
 });
 
-function InventoryStep({ i18n, warningMessage = null }) {
+function InventoryStep({ warningMessage = null }) {
   const [field, meta, helpers] = useField({
     name: 'inventory',
   });
@@ -83,28 +83,28 @@ function InventoryStep({ i18n, warningMessage = null }) {
         optionCount={count}
         searchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Created By (Username)`),
+            name: t`Created By (Username)`,
             key: 'created_by__username__icontains',
           },
           {
-            name: i18n._(t`Modified By (Username)`),
+            name: t`Modified By (Username)`,
             key: 'modified_by__username__icontains',
           },
         ]}
         sortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
           },
         ]}
         searchableKeys={searchableKeys}
         relatedSearchableKeys={relatedSearchableKeys}
-        header={i18n._(t`Inventory`)}
+        header={t`Inventory`}
         name="inventory"
         qsConfig={QS_CONFIG}
         readOnly
@@ -115,4 +115,4 @@ function InventoryStep({ i18n, warningMessage = null }) {
   );
 }
 
-export default withI18n()(InventoryStep);
+export default InventoryStep;
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/OtherPromptsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/OtherPromptsStep.jsx
index 6b1aea73d5..e938cb541d 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/OtherPromptsStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/OtherPromptsStep.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import { Form, FormGroup, Switch } from '@patternfly/react-core';
@@ -20,88 +20,84 @@ const FieldHeader = styled.div`
   }
 `;
 
-function OtherPromptsStep({ launchConfig, i18n }) {
+function OtherPromptsStep({ launchConfig }) {
   return (
     <Form
       onSubmit={e => {
         e.preventDefault();
       }}
     >
-      {launchConfig.ask_job_type_on_launch && <JobTypeField i18n={i18n} />}
+      {launchConfig.ask_job_type_on_launch && <JobTypeField />}
       {launchConfig.ask_limit_on_launch && (
         <FormField
           id="prompt-limit"
           name="limit"
-          label={i18n._(t`Limit`)}
-          tooltip={i18n._(t`Provide a host pattern to further constrain the list
+          label={t`Limit`}
+          tooltip={t`Provide a host pattern to further constrain the list
           of hosts that will be managed or affected by the playbook. Multiple
           patterns are allowed. Refer to Ansible documentation for more
-          information and examples on patterns.`)}
+          information and examples on patterns.`}
         />
       )}
       {launchConfig.ask_scm_branch_on_launch && (
         <FormField
           id="prompt-scm-branch"
           name="scm_branch"
-          label={i18n._(t`Source Control Branch`)}
-          tooltip={i18n._(
-            t`Select a branch for the workflow. This branch is applied to all job template nodes that prompt for a branch`
-          )}
+          label={t`Source Control Branch`}
+          tooltip={t`Select a branch for the workflow. This branch is applied to all job template nodes that prompt for a branch`}
         />
       )}
-      {launchConfig.ask_verbosity_on_launch && <VerbosityField i18n={i18n} />}
-      {launchConfig.ask_diff_mode_on_launch && (
-        <ShowChangesToggle i18n={i18n} />
-      )}
+      {launchConfig.ask_verbosity_on_launch && <VerbosityField />}
+      {launchConfig.ask_diff_mode_on_launch && <ShowChangesToggle />}
       {launchConfig.ask_tags_on_launch && (
         <TagField
           id="prompt-job-tags"
           name="job_tags"
-          label={i18n._(t`Job Tags`)}
-          aria-label={i18n._(t`Job Tags`)}
-          tooltip={i18n._(t`Tags are useful when you have a large
+          label={t`Job Tags`}
+          aria-label={t`Job Tags`}
+          tooltip={t`Tags are useful when you have a large
             playbook, and you want to run a specific part of a play or task.
             Use commas to separate multiple tags. Refer to Ansible Tower
-            documentation for details on the usage of tags.`)}
+            documentation for details on the usage of tags.`}
         />
       )}
       {launchConfig.ask_skip_tags_on_launch && (
         <TagField
           id="prompt-skip-tags"
           name="skip_tags"
-          label={i18n._(t`Skip Tags`)}
-          aria-label={i18n._(t`Skip Tags`)}
-          tooltip={i18n._(t`Skip tags are useful when you have a large
+          label={t`Skip Tags`}
+          aria-label={t`Skip Tags`}
+          tooltip={t`Skip tags are useful when you have a large
             playbook, and you want to skip specific parts of a play or task.
             Use commas to separate multiple tags. Refer to Ansible Tower
-            documentation for details on the usage of tags.`)}
+            documentation for details on the usage of tags.`}
         />
       )}
       {launchConfig.ask_variables_on_launch && (
         <VariablesField
           id="prompt-variables"
           name="extra_vars"
-          label={i18n._(t`Variables`)}
+          label={t`Variables`}
         />
       )}
     </Form>
   );
 }
 
-function JobTypeField({ i18n }) {
+function JobTypeField() {
   const [field, meta, helpers] = useField('job_type');
   const options = [
     {
       value: '',
       key: '',
-      label: i18n._(t`Choose a job type`),
+      label: t`Choose a job type`,
       isDisabled: true,
     },
-    { value: 'run', key: 'run', label: i18n._(t`Run`), isDisabled: false },
+    { value: 'run', key: 'run', label: t`Run`, isDisabled: false },
     {
       value: 'check',
       key: 'check',
-      label: i18n._(t`Check`),
+      label: t`Check`,
       isDisabled: false,
     },
   ];
@@ -109,12 +105,12 @@ function JobTypeField({ i18n }) {
   return (
     <FormGroup
       fieldId="propmt-job-type"
-      label={i18n._(t`Job Type`)}
+      label={t`Job Type`}
       labelIcon={
         <Popover
-          content={i18n._(t`For job templates, select run to execute the playbook.
+          content={t`For job templates, select run to execute the playbook.
       Select check to only check playbook syntax, test environment setup,
-      and report problems without executing the playbook.`)}
+      and report problems without executing the playbook.`}
         />
       }
       isRequired
@@ -130,14 +126,14 @@ function JobTypeField({ i18n }) {
   );
 }
 
-function VerbosityField({ i18n }) {
+function VerbosityField() {
   const [field, meta, helpers] = useField('verbosity');
   const options = [
-    { value: '0', key: '0', label: i18n._(t`0 (Normal)`) },
-    { value: '1', key: '1', label: i18n._(t`1 (Verbose)`) },
-    { value: '2', key: '2', label: i18n._(t`2 (More Verbose)`) },
-    { value: '3', key: '3', label: i18n._(t`3 (Debug)`) },
-    { value: '4', key: '4', label: i18n._(t`4 (Connection Debug)`) },
+    { value: '0', key: '0', label: t`0 (Normal)` },
+    { value: '1', key: '1', label: t`1 (Verbose)` },
+    { value: '2', key: '2', label: t`2 (More Verbose)` },
+    { value: '3', key: '3', label: t`3 (Debug)` },
+    { value: '4', key: '4', label: t`4 (Connection Debug)` },
   ];
 
   const isValid = !(meta.touched && meta.error);
@@ -146,11 +142,11 @@ function VerbosityField({ i18n }) {
     <FormGroup
       fieldId="prompt-verbosity"
       validated={isValid ? 'default' : 'error'}
-      label={i18n._(t`Verbosity`)}
+      label={t`Verbosity`}
       labelIcon={
         <Popover
-          content={i18n._(t`Control the level of output ansible
-          will produce as the playbook executes.`)}
+          content={t`Control the level of output ansible
+          will produce as the playbook executes.`}
         />
       }
     >
@@ -164,7 +160,7 @@ function VerbosityField({ i18n }) {
   );
 }
 
-function ShowChangesToggle({ i18n }) {
+function ShowChangesToggle() {
   const [field, , helpers] = useField('diff_mode');
   return (
     <FormGroup fieldId="prompt-show-changes">
@@ -172,20 +168,20 @@ function ShowChangesToggle({ i18n }) {
         {' '}
         <label className="pf-c-form__label" htmlFor="prompt-show-changes">
           <span className="pf-c-form__label-text">
-            {i18n._(t`Show Changes`)}
+            {t`Show Changes`}
             <Popover
-              content={i18n._(t`If enabled, show the changes made
+              content={t`If enabled, show the changes made
               by Ansible tasks, where supported. This is equivalent to Ansible’s
-              --diff mode.`)}
+              --diff mode.`}
             />
           </span>
         </label>
       </FieldHeader>
       <Switch
-        aria-label={field.value ? i18n._(t`On`) : i18n._(t`Off`)}
+        aria-label={field.value ? t`On` : t`Off`}
         id="prompt-show-changes"
-        label={i18n._(t`On`)}
-        labelOff={i18n._(t`Off`)}
+        label={t`On`}
+        labelOff={t`Off`}
         isChecked={field.value}
         onChange={helpers.setValue}
       />
@@ -206,4 +202,4 @@ function TagField({ id, name, label, tooltip }) {
   );
 }
 
-export default withI18n()(OtherPromptsStep);
+export default OtherPromptsStep;
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx
index c2242b44fa..e5e9e90bdd 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/PreviewStep.jsx
@@ -4,7 +4,7 @@ import { ExclamationCircleIcon as PFExclamationCircleIcon } from '@patternfly/re
 import { Tooltip } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
 import { useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import yaml from 'js-yaml';
 import mergeExtraVars, {
   maskPasswords,
@@ -25,13 +25,7 @@ const ErrorMessageWrapper = styled.div`
   margin-bottom: 10px;
 `;
 
-function PreviewStep({
-  resource,
-  launchConfig,
-  surveyConfig,
-  formErrors,
-  i18n,
-}) {
+function PreviewStep({ resource, launchConfig, surveyConfig, formErrors }) {
   const { values } = useFormikContext();
   const surveyValues = getSurveyValues(values);
 
@@ -61,10 +55,10 @@ function PreviewStep({
     <Fragment>
       {formErrors && (
         <ErrorMessageWrapper>
-          {i18n._(t`Some of the previous step(s) have errors`)}
+          {t`Some of the previous step(s) have errors`}
           <Tooltip
             position="right"
-            content={i18n._(t`See errors on the left`)}
+            content={t`See errors on the left`}
             trigger="click mouseenter focus"
           >
             <ExclamationCircleIcon />
@@ -80,4 +74,4 @@ function PreviewStep({
   );
 }
 
-export default withI18n()(PreviewStep);
+export default PreviewStep;
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/StepName.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/StepName.jsx
index d7d37989cd..6c3ee2f609 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/StepName.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/StepName.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Tooltip } from '@patternfly/react-core';
 import { ExclamationCircleIcon as PFExclamationCircleIcon } from '@patternfly/react-icons';
@@ -14,7 +14,7 @@ const ExclamationCircleIcon = styled(PFExclamationCircleIcon)`
   margin-left: 10px;
 `;
 
-function StepName({ hasErrors, children, i18n, id }) {
+function StepName({ hasErrors, children, id }) {
   if (!hasErrors) {
     return <div id={id}>{children}</div>;
   }
@@ -24,7 +24,7 @@ function StepName({ hasErrors, children, i18n, id }) {
         {children}
         <Tooltip
           position="right"
-          content={i18n._(t`This step contains errors`)}
+          content={t`This step contains errors`}
           trigger="click mouseenter focus"
         >
           <ExclamationCircleIcon css="color: var(--pf-global--danger-color--100)" />
@@ -34,4 +34,4 @@ function StepName({ hasErrors, children, i18n, id }) {
   );
 }
 
-export default withI18n()(StepName);
+export default StepName;
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
index cbe0d62fd2..0c84e829be 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/SurveyStep.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import {
@@ -22,7 +22,7 @@ import {
 } from '../../../util/validators';
 import { Survey } from '../../../types';
 
-function SurveyStep({ surveyConfig, i18n }) {
+function SurveyStep({ surveyConfig }) {
   const fieldTypes = {
     text: TextField,
     textarea: TextField,
@@ -40,9 +40,7 @@ function SurveyStep({ surveyConfig, i18n }) {
     >
       {surveyConfig.spec.map(question => {
         const Field = fieldTypes[question.type];
-        return (
-          <Field key={question.variable} question={question} i18n={i18n} />
-        );
+        return <Field key={question.variable} question={question} />;
       })}
     </Form>
   );
@@ -51,11 +49,11 @@ SurveyStep.propTypes = {
   surveyConfig: Survey.isRequired,
 };
 
-function TextField({ question, i18n }) {
+function TextField({ question }) {
   const validators = [
-    question.required ? required(null, i18n) : null,
-    question.required && question.min ? minLength(question.min, i18n) : null,
-    question.required && question.max ? maxLength(question.max, i18n) : null,
+    question.required ? required(null) : null,
+    question.required && question.min ? minLength(question.min) : null,
+    question.required && question.max ? maxLength(question.max) : null,
   ];
   return (
     <FormField
@@ -72,11 +70,11 @@ function TextField({ question, i18n }) {
   );
 }
 
-function NumberField({ question, i18n }) {
+function NumberField({ question }) {
   const validators = [
-    question.required ? required(null, i18n) : null,
-    minMaxValue(question.min, question.max, i18n),
-    question.type === 'integer' ? integer(i18n) : null,
+    question.required ? required(null) : null,
+    minMaxValue(question.min, question.max),
+    question.type === 'integer' ? integer() : null,
   ];
   return (
     <FormField
@@ -120,11 +118,11 @@ function MultipleChoiceField({ question }) {
   );
 }
 
-function MultiSelectField({ question, i18n }) {
+function MultiSelectField({ question }) {
   const [isOpen, setIsOpen] = useState(false);
   const [field, meta, helpers] = useField({
     name: `survey_${question.variable}`,
-    validate: question.required ? required(null, i18n) : null,
+    validate: question.required ? required(null) : null,
   });
   const id = `survey-question-${question.variable}`;
   const hasActualValue = !question.required || meta.value?.length > 0;
@@ -134,8 +132,7 @@ function MultiSelectField({ question, i18n }) {
     <FormGroup
       fieldId={id}
       helperTextInvalid={
-        meta.error ||
-        i18n._(t`At least one value must be selected for this field.`)
+        meta.error || t`At least one value must be selected for this field.`
       }
       isRequired={question.required}
       validated={isValid ? 'default' : 'error'}
@@ -169,4 +166,4 @@ function MultiSelectField({ question, i18n }) {
   );
 }
 
-export default withI18n()(SurveyStep);
+export default SurveyStep;
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/credentialsValidator.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/credentialsValidator.jsx
index 5b8c012f8c..98d0b0aed4 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/credentialsValidator.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/credentialsValidator.jsx
@@ -7,7 +7,6 @@ const credentialPromptsForPassword = credential =>
   credential?.inputs?.vault_password === 'ASK';
 
 export default function credentialsValidator(
-  i18n,
   defaultCredentials = [],
   allowCredentialsWithPasswords,
   selectedCredentials
@@ -38,11 +37,9 @@ export default function credentialsValidator(
     });
 
     if (missingCredentialTypes.length > 0) {
-      return i18n._(
-        t`Job Template default credentials must be replaced with one of the same type.  Please select a credential for the following types in order to proceed: ${missingCredentialTypes.join(
-          ', '
-        )}`
-      );
+      return t`Job Template default credentials must be replaced with one of the same type.  Please select a credential for the following types in order to proceed: ${missingCredentialTypes.join(
+        ', '
+      )}`;
     }
   }
 
@@ -54,11 +51,9 @@ export default function credentialsValidator(
       }
     });
     if (credentialsThatPrompt.length > 0) {
-      return i18n._(
-        t`Credentials that require passwords on launch are not permitted.  Please remove or replace the following credentials with a credential of the same type in order to proceed: ${credentialsThatPrompt.join(
-          ', '
-        )}`
-      );
+      return t`Credentials that require passwords on launch are not permitted.  Please remove or replace the following credentials with a credential of the same type in order to proceed: ${credentialsThatPrompt.join(
+        ', '
+      )}`;
     }
   }
 
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialPasswordsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialPasswordsStep.jsx
index dfdf72c5a5..c3b281083e 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialPasswordsStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialPasswordsStep.jsx
@@ -12,7 +12,7 @@ const isValueMissing = val => {
 
 export default function useCredentialPasswordsStep(
   launchConfig,
-  i18n,
+
   showStep,
   visitedSteps
 ) {
@@ -27,12 +27,10 @@ export default function useCredentialPasswordsStep(
           id: STEP_ID,
           name: (
             <StepName hasErrors={hasError} id="credential-passwords-step">
-              {i18n._(t`Credential passwords`)}
+              {t`Credential passwords`}
             </StepName>
           ),
-          component: (
-            <CredentialPasswordsStep launchConfig={launchConfig} i18n={i18n} />
-          ),
+          component: <CredentialPasswordsStep launchConfig={launchConfig} />,
           enableNext: true,
         }
       : null,
@@ -51,7 +49,7 @@ export default function useCredentialPasswordsStep(
     },
     validate: () => {
       const setPasswordFieldError = fieldName => {
-        setFieldError(fieldName, i18n._(t`This field may not be blank`));
+        setFieldError(fieldName, t`This field may not be blank`);
       };
 
       if (
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialsStep.jsx
index c390f5dde2..6b05b27b78 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialsStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/useCredentialsStep.jsx
@@ -11,7 +11,7 @@ export default function useCredentialsStep(
   launchConfig,
   resource,
   resourceDefaultCredentials,
-  i18n,
+
   allowCredentialsWithPasswords = false
 ) {
   const [field, meta, helpers] = useField('credentials');
@@ -22,7 +22,7 @@ export default function useCredentialsStep(
   return {
     step: getStep(
       launchConfig,
-      i18n,
+
       allowCredentialsWithPasswords,
       formError,
       resourceDefaultCredentials
@@ -37,7 +37,6 @@ export default function useCredentialsStep(
     validate: () => {
       helpers.setError(
         credentialsValidator(
-          i18n,
           resourceDefaultCredentials,
           allowCredentialsWithPasswords,
           field.value
@@ -49,7 +48,7 @@ export default function useCredentialsStep(
 
 function getStep(
   launchConfig,
-  i18n,
+
   allowCredentialsWithPasswords,
   formError,
   resourceDefaultCredentials
@@ -62,12 +61,11 @@ function getStep(
     key: 4,
     name: (
       <StepName hasErrors={formError} id="credentials-step">
-        {i18n._(t`Credentials`)}
+        {t`Credentials`}
       </StepName>
     ),
     component: (
       <CredentialsStep
-        i18n={i18n}
         allowCredentialsWithPasswords={allowCredentialsWithPasswords}
         defaultCredentials={resourceDefaultCredentials}
       />
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useInventoryStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useInventoryStep.jsx
index 83d60bfa00..0e69e0877c 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/useInventoryStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/useInventoryStep.jsx
@@ -15,7 +15,7 @@ const STEP_ID = 'inventory';
 export default function useInventoryStep(
   launchConfig,
   resource,
-  i18n,
+
   visitedSteps
 ) {
   const [, meta, helpers] = useField('inventory');
@@ -27,7 +27,7 @@ export default function useInventoryStep(
         !meta.value;
 
   return {
-    step: getStep(launchConfig, i18n, formError, resource),
+    step: getStep(launchConfig, formError, resource),
     initialValues: getInitialValues(launchConfig, resource),
     isReady: true,
     contentError: null,
@@ -37,12 +37,12 @@ export default function useInventoryStep(
     },
     validate: () => {
       if (meta.touched && !meta.value && resource.type === 'job_template') {
-        helpers.setError(i18n._(t`An inventory must be selected`));
+        helpers.setError(t`An inventory must be selected`);
       }
     },
   };
 }
-function getStep(launchConfig, i18n, formError, resource) {
+function getStep(launchConfig, formError, resource) {
   if (!launchConfig.ask_inventory_on_launch) {
     return null;
   }
@@ -50,21 +50,18 @@ function getStep(launchConfig, i18n, formError, resource) {
     id: STEP_ID,
     name: (
       <StepName hasErrors={formError} id="inventory-step">
-        {i18n._(t`Inventory`)}
+        {t`Inventory`}
       </StepName>
     ),
     component: (
       <InventoryStep
-        i18n={i18n}
         warningMessage={
           resource.type === 'workflow_job_template' ? (
             <InventoryAlert
               ouiaId="InventoryStep-alert"
               variant="warning"
               isInline
-              title={i18n._(
-                t`This inventory is applied to all job template nodes within this workflow (${resource.name}) that prompt for an inventory.`
-              )}
+              title={t`This inventory is applied to all job template nodes within this workflow (${resource.name}) that prompt for an inventory.`}
             />
           ) : null
         }
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx
index c38f23f665..f1581812e2 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx
@@ -16,9 +16,9 @@ const getVariablesData = resource => {
   return '---';
 };
 
-export default function useOtherPromptsStep(launchConfig, resource, i18n) {
+export default function useOtherPromptsStep(launchConfig, resource) {
   return {
-    step: getStep(launchConfig, i18n),
+    step: getStep(launchConfig),
     initialValues: getInitialValues(launchConfig, resource),
     isReady: true,
     contentError: null,
@@ -38,7 +38,7 @@ export default function useOtherPromptsStep(launchConfig, resource, i18n) {
   };
 }
 
-function getStep(launchConfig, i18n) {
+function getStep(launchConfig) {
   if (!shouldShowPrompt(launchConfig)) {
     return null;
   }
@@ -47,10 +47,10 @@ function getStep(launchConfig, i18n) {
     key: 5,
     name: (
       <StepName hasErrors={false} id="other-prompts-step">
-        {i18n._(t`Other prompts`)}
+        {t`Other prompts`}
       </StepName>
     ),
-    component: <OtherPromptsStep launchConfig={launchConfig} i18n={i18n} />,
+    component: <OtherPromptsStep launchConfig={launchConfig} />,
     enableNext: true,
   };
 }
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/usePreviewStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/usePreviewStep.jsx
index a53c6d6a6c..bc6e1c9e72 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/usePreviewStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/usePreviewStep.jsx
@@ -7,7 +7,7 @@ const STEP_ID = 'preview';
 
 export default function usePreviewStep(
   launchConfig,
-  i18n,
+
   resource,
   surveyConfig,
   hasErrors,
@@ -20,7 +20,7 @@ export default function usePreviewStep(
           id: STEP_ID,
           name: (
             <StepName hasErrors={false} id="preview-step">
-              {i18n._(t`Preview`)}
+              {t`Preview`}
             </StepName>
           ),
           component: (
@@ -32,7 +32,7 @@ export default function usePreviewStep(
             />
           ),
           enableNext: !hasErrors,
-          nextButtonText: nextButtonText || i18n._(t`Launch`),
+          nextButtonText: nextButtonText || t`Launch`,
         }
       : null,
     initialValues: {},
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useSurveyStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useSurveyStep.jsx
index 6069878dd6..b02d7524aa 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/useSurveyStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/useSurveyStep.jsx
@@ -10,7 +10,7 @@ export default function useSurveyStep(
   launchConfig,
   surveyConfig,
   resource,
-  i18n,
+
   visitedSteps
 ) {
   const { setFieldError, values } = useFormikContext();
@@ -24,10 +24,10 @@ export default function useSurveyStep(
           id: STEP_ID,
           name: (
             <StepName hasErrors={hasError} id="survey-step">
-              {i18n._(t`Survey`)}
+              {t`Survey`}
             </StepName>
           ),
-          component: <SurveyStep surveyConfig={surveyConfig} i18n={i18n} />,
+          component: <SurveyStep surveyConfig={surveyConfig} />,
           enableNext: true,
         }
       : null,
@@ -49,8 +49,7 @@ export default function useSurveyStep(
         surveyConfig.spec.forEach(question => {
           const errMessage = validateSurveyField(
             question,
-            values[`survey_${question.variable}`],
-            i18n
+            values[`survey_${question.variable}`]
           );
           if (errMessage) {
             setFieldError(`survey_${question.variable}`, errMessage);
@@ -96,26 +95,24 @@ function getInitialValues(launchConfig, surveyConfig, resource) {
   return values;
 }
 
-function validateSurveyField(question, value, i18n) {
+function validateSurveyField(question, value) {
   const isTextField = ['text', 'textarea'].includes(question.type);
   const isNumeric = ['integer', 'float'].includes(question.type);
   if (isTextField && (value || value === 0)) {
     if (question.min && value.length < question.min) {
-      return i18n._(t`This field must be at least ${question.min} characters`);
+      return t`This field must be at least ${question.min} characters`;
     }
     if (question.max && value.length > question.max) {
-      return i18n._(t`This field must not exceed ${question.max} characters`);
+      return t`This field must not exceed ${question.max} characters`;
     }
   }
   if (isNumeric && (value || value === 0)) {
     if (value < question.min || value > question.max) {
-      return i18n._(
-        t`This field must be a number and have a value between ${question.min} and ${question.max}`
-      );
+      return t`This field must be a number and have a value between ${question.min} and ${question.max}`;
     }
   }
   if (question.required && !value && value !== 0) {
-    return i18n._(t`This field must not be blank`);
+    return t`This field must not be blank`;
   }
   return null;
 }
diff --git a/awx/ui_next/src/components/LaunchPrompt/useLaunchSteps.js b/awx/ui_next/src/components/LaunchPrompt/useLaunchSteps.js
index f1d0f65f59..74b962c0e1 100644
--- a/awx/ui_next/src/components/LaunchPrompt/useLaunchSteps.js
+++ b/awx/ui_next/src/components/LaunchPrompt/useLaunchSteps.js
@@ -43,35 +43,34 @@ export default function useLaunchSteps(
   launchConfig,
   surveyConfig,
   resource,
-  i18n,
   resourceDefaultCredentials
 ) {
   const [visited, setVisited] = useState({});
   const [isReady, setIsReady] = useState(false);
   const { touched, values: formikValues } = useFormikContext();
   const steps = [
-    useInventoryStep(launchConfig, resource, i18n, visited),
+    useInventoryStep(launchConfig, resource, visited),
     useCredentialsStep(
       launchConfig,
       resource,
       resourceDefaultCredentials,
-      i18n,
+
       true
     ),
     useCredentialPasswordsStep(
       launchConfig,
-      i18n,
+
       showCredentialPasswordsStep(formikValues.credentials, launchConfig),
       visited
     ),
-    useOtherPromptsStep(launchConfig, resource, i18n),
-    useSurveyStep(launchConfig, surveyConfig, resource, i18n, visited),
+    useOtherPromptsStep(launchConfig, resource),
+    useSurveyStep(launchConfig, surveyConfig, resource, visited),
   ];
   const { resetForm } = useFormikContext();
   const hasErrors = steps.some(step => step.hasError);
 
   steps.push(
-    usePreviewStep(launchConfig, i18n, resource, surveyConfig, hasErrors, true)
+    usePreviewStep(launchConfig, resource, surveyConfig, hasErrors, true)
   );
 
   const pfSteps = steps.map(s => s.step).filter(s => s != null);
diff --git a/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx b/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx
index ca5871c2cc..412e6f77ca 100644
--- a/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/ApplicationLookup.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { func, node } from 'prop-types';
 import { withRouter, useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { FormGroup } from '@patternfly/react-core';
 import { ApplicationsAPI } from '../../api';
@@ -18,7 +18,7 @@ const QS_CONFIG = getQSConfig('applications', {
   order_by: 'name',
 });
 
-function ApplicationLookup({ i18n, onChange, value, label }) {
+function ApplicationLookup({ onChange, value, label }) {
   const location = useLocation();
   const {
     error,
@@ -62,7 +62,7 @@ function ApplicationLookup({ i18n, onChange, value, label }) {
     <FormGroup fieldId="application" label={label}>
       <Lookup
         id="application"
-        header={i18n._(t`Application`)}
+        header={t`Application`}
         value={value}
         onChange={onChange}
         qsConfig={QS_CONFIG}
@@ -71,34 +71,34 @@ function ApplicationLookup({ i18n, onChange, value, label }) {
             value={state.selectedItems}
             options={applications}
             optionCount={itemCount}
-            header={i18n._(t`Applications`)}
+            header={t`Applications`}
             qsConfig={QS_CONFIG}
             searchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Description`),
+                name: t`Description`,
                 key: 'description__icontains',
               },
             ]}
             sortColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name',
               },
               {
-                name: i18n._(t`Created`),
+                name: t`Created`,
                 key: 'created',
               },
               {
-                name: i18n._(t`Organization`),
+                name: t`Organization`,
                 key: 'organization',
               },
               {
-                name: i18n._(t`Description`),
+                name: t`Description`,
                 key: 'description',
               },
             ]}
@@ -125,4 +125,4 @@ ApplicationLookup.defaultProps = {
   value: null,
 };
 
-export default withI18n()(withRouter(ApplicationLookup));
+export default withRouter(ApplicationLookup);
diff --git a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
index df9964440b..0c452d6483 100644
--- a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
@@ -9,7 +9,7 @@ import {
   string,
   oneOfType,
 } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { FormGroup } from '@patternfly/react-core';
 import { CredentialsAPI } from '../../api';
@@ -39,7 +39,7 @@ function CredentialLookup({
   credentialTypeKind,
   credentialTypeNamespace,
   value,
-  i18n,
+
   tooltip,
   isDisabled,
   autoPopulate,
@@ -145,22 +145,22 @@ function CredentialLookup({
             qsConfig={QS_CONFIG}
             searchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Created By (Username)`),
+                name: t`Created By (Username)`,
                 key: 'created_by__username__icontains',
               },
               {
-                name: i18n._(t`Modified By (Username)`),
+                name: t`Modified By (Username)`,
                 key: 'modified_by__username__icontains',
               },
             ]}
             sortColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name',
               },
             ]}
@@ -228,4 +228,4 @@ CredentialLookup.defaultProps = {
 };
 
 export { CredentialLookup as _CredentialLookup };
-export default withI18n()(CredentialLookup);
+export default CredentialLookup;
diff --git a/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.jsx b/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.jsx
index c860ab97c8..a017bfb5c5 100644
--- a/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { string, func, bool, oneOfType, number } from 'prop-types';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { FormGroup, Tooltip } from '@patternfly/react-core';
 
@@ -23,7 +23,7 @@ const QS_CONFIG = getQSConfig('execution_environments', {
 
 function ExecutionEnvironmentLookup({
   globallyAvailable,
-  i18n,
+
   isDefaultEnvironment,
   isGlobalDefaultEnvironment,
   isDisabled,
@@ -121,7 +121,7 @@ function ExecutionEnvironmentLookup({
     <>
       <Lookup
         id="execution-environments"
-        header={i18n._(t`Execution Environments`)}
+        header={t`Execution Environments`}
         value={value}
         onBlur={onBlur}
         onChange={onChange}
@@ -135,21 +135,21 @@ function ExecutionEnvironmentLookup({
             optionCount={count}
             searchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
             ]}
             sortColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name',
               },
             ]}
             searchableKeys={searchableKeys}
             relatedSearchableKeys={relatedSearchableKeys}
             multiple={state.multiple}
-            header={i18n._(t`Execution Environment`)}
+            header={t`Execution Environment`}
             name="executionEnvironments"
             qsConfig={QS_CONFIG}
             readOnly={!canDelete}
@@ -166,12 +166,12 @@ function ExecutionEnvironmentLookup({
     defaultExecutionEnvironment
   ) => {
     if (globalDefaultEnvironment) {
-      return i18n._(t`Global Default Execution Environment`);
+      return t`Global Default Execution Environment`;
     }
     if (defaultExecutionEnvironment) {
-      return i18n._(t`Default Execution Environment`);
+      return t`Default Execution Environment`;
     }
-    return i18n._(t`Execution Environment`);
+    return t`Execution Environment`;
   };
 
   return (
@@ -210,4 +210,4 @@ ExecutionEnvironmentLookup.defaultProps = {
   organizationId: null,
 };
 
-export default withI18n()(ExecutionEnvironmentLookup);
+export default ExecutionEnvironmentLookup;
diff --git a/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx b/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx
index 5cd1c2d598..bdbb0342cc 100644
--- a/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/HostFilterLookup.jsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { withRouter, useHistory, useLocation } from 'react-router-dom';
 import { number, func, bool, string } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import styled from 'styled-components';
 import { t } from '@lingui/macro';
 import { SearchIcon } from '@patternfly/react-icons';
@@ -72,46 +72,46 @@ const QS_CONFIG = getQSConfig(
   ['id', 'page', 'page_size', 'inventory']
 );
 
-const buildSearchColumns = i18n => [
+const buildSearchColumns = () => [
   {
-    name: i18n._(t`Name`),
+    name: t`Name`,
     key: 'name__icontains',
     isDefault: true,
   },
   {
-    name: i18n._(t`ID`),
+    name: t`ID`,
     key: 'id',
   },
   {
-    name: i18n._(t`Group`),
+    name: t`Group`,
     key: 'groups__name__icontains',
   },
   {
-    name: i18n._(t`Inventory ID`),
+    name: t`Inventory ID`,
     key: 'inventory',
   },
   {
-    name: i18n._(t`Enabled`),
+    name: t`Enabled`,
     key: 'enabled',
     isBoolean: true,
   },
   {
-    name: i18n._(t`Instance ID`),
+    name: t`Instance ID`,
     key: 'instance_id',
   },
   {
-    name: i18n._(t`Last job`),
+    name: t`Last job`,
     key: 'last_job',
   },
   {
-    name: i18n._(t`Insights system ID`),
+    name: t`Insights system ID`,
     key: 'insights_system_id',
   },
 ];
 
 function HostFilterLookup({
   helperTextInvalid,
-  i18n,
+
   isValid,
   isDisabled,
   onBlur,
@@ -124,7 +124,7 @@ function HostFilterLookup({
   const [chips, setChips] = useState({});
   const [queryString, setQueryString] = useState('');
   const { isModalOpen, toggleModal, closeModal } = useModal();
-  const searchColumns = buildSearchColumns(i18n);
+  const searchColumns = buildSearchColumns();
 
   const {
     result: { count, hosts, relatedSearchableKeys, searchableKeys },
@@ -248,7 +248,7 @@ function HostFilterLookup({
     <InputGroup onBlur={onBlur}>
       <Button
         ouiaId="host-filter-search-button"
-        aria-label={i18n._(t`Search`)}
+        aria-label={t`Search`}
         id="host-filter"
         isDisabled={isDisabled}
         onClick={handleOpenModal}
@@ -280,24 +280,21 @@ function HostFilterLookup({
       fieldId="host-filter"
       helperTextInvalid={helperTextInvalid}
       isRequired
-      label={i18n._(t`Smart host filter`)}
+      label={t`Smart host filter`}
       validated={isValid ? 'default' : 'error'}
       labelIcon={
         <Popover
-          content={i18n._(
-            t`Populate the hosts for this inventory by using a search
+          content={t`Populate the hosts for this inventory by using a search
               filter. Example: ansible_facts.ansible_distribution:"RedHat".
               Refer to the documentation for further syntax and
-              examples.`
-          )}
+              examples.  Refer to the Ansible Tower documentation for further syntax and
+              examples.`}
         />
       }
     >
       {isDisabled ? (
         <Tooltip
-          content={i18n._(
-            t`Please select an organization before editing the host filter`
-          )}
+          content={t`Please select an organization before editing the host filter`}
         >
           {renderLookup()}
         </Tooltip>
@@ -305,10 +302,10 @@ function HostFilterLookup({
         renderLookup()
       )}
       <Modal
-        aria-label={i18n._(t`Lookup modal`)}
+        aria-label={t`Lookup modal`}
         isOpen={isModalOpen}
         onClose={handleClose}
-        title={i18n._(t`Perform a search to define a host filter`)}
+        title={t`Perform a search to define a host filter`}
         variant="large"
         actions={[
           <Button
@@ -318,7 +315,7 @@ function HostFilterLookup({
             onClick={save}
             variant="primary"
           >
-            {i18n._(t`Select`)}
+            {t`Select`}
           </Button>,
           <Button
             ouiaId="host-filter-modal-cancel-button"
@@ -326,7 +323,7 @@ function HostFilterLookup({
             variant="link"
             onClick={handleClose}
           >
-            {i18n._(t`Cancel`)}
+            {t`Cancel`}
           </Button>,
         ]}
       >
@@ -337,7 +334,7 @@ function HostFilterLookup({
             itemCount={count}
             items={hosts}
             onRowClick={() => {}}
-            pluralizedItemName={i18n._(t`hosts`)}
+            pluralizedItemName={t`hosts`}
             qsConfig={QS_CONFIG}
             renderItem={item => (
               <HostListItem
@@ -349,15 +346,15 @@ function HostFilterLookup({
             toolbarSearchColumns={searchColumns}
             toolbarSortColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name',
               },
               {
-                name: i18n._(t`Created`),
+                name: t`Created`,
                 key: 'created',
               },
               {
-                name: i18n._(t`Modified`),
+                name: t`Modified`,
                 key: 'modified',
               },
             ]}
@@ -386,4 +383,4 @@ HostFilterLookup.defaultProps = {
   value: '',
 };
 
-export default withI18n()(withRouter(HostFilterLookup));
+export default withRouter(HostFilterLookup);
diff --git a/awx/ui_next/src/components/Lookup/HostListItem.jsx b/awx/ui_next/src/components/Lookup/HostListItem.jsx
index 0a2ae00ce7..1fc10326a3 100644
--- a/awx/ui_next/src/components/Lookup/HostListItem.jsx
+++ b/awx/ui_next/src/components/Lookup/HostListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   DataListItem,
@@ -10,7 +10,7 @@ import {
 } from '@patternfly/react-core';
 import DataListCell from '../DataListCell';
 
-function HostListItem({ item, i18n }) {
+function HostListItem({ item }) {
   return (
     <DataListItem
       aria-labelledby={`items-list-item-${item.id}`}
@@ -20,14 +20,14 @@ function HostListItem({ item, i18n }) {
       <DataListItemRow>
         <DataListItemCells
           dataListCells={[
-            <DataListCell key="name" aria-label={i18n._(t`name`)}>
+            <DataListCell key="name" aria-label={t`name`}>
               <TextContent>
                 <Link to={{ pathname: item.url }}>
                   <b id={`items-list-item-${item.id}`}>{item.name}</b>
                 </Link>
               </TextContent>
             </DataListCell>,
-            <DataListCell key="inventory" aria-label={i18n._(t`inventory`)}>
+            <DataListCell key="inventory" aria-label={t`inventory`}>
               {item.summary_fields.inventory.name}
             </DataListCell>,
           ]}
@@ -37,4 +37,4 @@ function HostListItem({ item, i18n }) {
   );
 }
 
-export default withI18n()(HostListItem);
+export default HostListItem;
diff --git a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
index 1b4bfb5e59..3f21abccd8 100644
--- a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { arrayOf, string, func, bool } from 'prop-types';
 import { withRouter } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { FormGroup } from '@patternfly/react-core';
 import { InstanceGroupsAPI } from '../../api';
@@ -20,15 +20,7 @@ const QS_CONFIG = getQSConfig('instance-groups', {
 });
 
 function InstanceGroupsLookup(props) {
-  const {
-    value,
-    onChange,
-    tooltip,
-    className,
-    required,
-    history,
-    i18n,
-  } = props;
+  const { value, onChange, tooltip, className, required, history } = props;
 
   const {
     result: { instanceGroups, count, relatedSearchableKeys, searchableKeys },
@@ -68,13 +60,13 @@ function InstanceGroupsLookup(props) {
   return (
     <FormGroup
       className={className}
-      label={i18n._(t`Instance Groups`)}
+      label={t`Instance Groups`}
       labelIcon={tooltip && <Popover content={tooltip} />}
       fieldId="org-instance-groups"
     >
       <Lookup
         id="org-instance-groups"
-        header={i18n._(t`Instance Groups`)}
+        header={t`Instance Groups`}
         value={value}
         onChange={onChange}
         qsConfig={QS_CONFIG}
@@ -88,25 +80,25 @@ function InstanceGroupsLookup(props) {
             optionCount={count}
             searchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Credential Name`),
+                name: t`Credential Name`,
                 key: 'credential__name__icontains',
               },
             ]}
             sortColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name',
               },
             ]}
             searchableKeys={searchableKeys}
             relatedSearchableKeys={relatedSearchableKeys}
             multiple={state.multiple}
-            header={i18n._(t`Instance Groups`)}
+            header={t`Instance Groups`}
             name="instanceGroups"
             qsConfig={QS_CONFIG}
             readOnly={!canDelete}
@@ -134,4 +126,4 @@ InstanceGroupsLookup.defaultProps = {
   required: false,
 };
 
-export default withI18n()(withRouter(InstanceGroupsLookup));
+export default withRouter(InstanceGroupsLookup);
diff --git a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
index f55d669880..8b68ca2045 100644
--- a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { func, bool } from 'prop-types';
 import { withRouter } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { InventoriesAPI } from '../../api';
 import { Inventory } from '../../types';
@@ -23,7 +23,7 @@ function InventoryLookup({
   value,
   onChange,
   onBlur,
-  i18n,
+
   history,
   required,
   isPromptableField,
@@ -82,16 +82,16 @@ function InventoryLookup({
       <FieldWithPrompt
         fieldId={fieldId}
         isRequired={required}
-        label={i18n._(t`Inventory`)}
+        label={t`Inventory`}
         promptId={promptId}
         promptName={promptName}
         isDisabled={!canEdit}
-        tooltip={i18n._(t`Select the inventory containing the hosts
-            you want this job to manage.`)}
+        tooltip={t`Select the inventory containing the hosts
+            you want this job to manage.`}
       >
         <Lookup
           id="inventory-lookup"
-          header={i18n._(t`Inventory`)}
+          header={t`Inventory`}
           value={value}
           onChange={onChange}
           onBlur={onBlur}
@@ -106,29 +106,29 @@ function InventoryLookup({
               optionCount={count}
               searchColumns={[
                 {
-                  name: i18n._(t`Name`),
+                  name: t`Name`,
                   key: 'name__icontains',
                   isDefault: true,
                 },
                 {
-                  name: i18n._(t`Created By (Username)`),
+                  name: t`Created By (Username)`,
                   key: 'created_by__username__icontains',
                 },
                 {
-                  name: i18n._(t`Modified By (Username)`),
+                  name: t`Modified By (Username)`,
                   key: 'modified_by__username__icontains',
                 },
               ]}
               sortColumns={[
                 {
-                  name: i18n._(t`Name`),
+                  name: t`Name`,
                   key: 'name',
                 },
               ]}
               searchableKeys={searchableKeys}
               relatedSearchableKeys={relatedSearchableKeys}
               multiple={state.multiple}
-              header={i18n._(t`Inventory`)}
+              header={t`Inventory`}
               name="inventory"
               qsConfig={QS_CONFIG}
               readOnly={!canDelete}
@@ -144,7 +144,7 @@ function InventoryLookup({
     <>
       <Lookup
         id="inventory-lookup"
-        header={i18n._(t`Inventory`)}
+        header={t`Inventory`}
         value={value}
         onChange={onChange}
         onBlur={onBlur}
@@ -159,29 +159,29 @@ function InventoryLookup({
             optionCount={count}
             searchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Created By (Username)`),
+                name: t`Created By (Username)`,
                 key: 'created_by__username__icontains',
               },
               {
-                name: i18n._(t`Modified By (Username)`),
+                name: t`Modified By (Username)`,
                 key: 'modified_by__username__icontains',
               },
             ]}
             sortColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name',
               },
             ]}
             searchableKeys={searchableKeys}
             relatedSearchableKeys={relatedSearchableKeys}
             multiple={state.multiple}
-            header={i18n._(t`Inventory`)}
+            header={t`Inventory`}
             name="inventory"
             qsConfig={QS_CONFIG}
             readOnly={!canDelete}
@@ -208,4 +208,4 @@ InventoryLookup.defaultProps = {
   isOverrideDisabled: false,
 };
 
-export default withI18n()(withRouter(InventoryLookup));
+export default withRouter(InventoryLookup);
diff --git a/awx/ui_next/src/components/Lookup/Lookup.jsx b/awx/ui_next/src/components/Lookup/Lookup.jsx
index 908c6b3877..cf3c550cfd 100644
--- a/awx/ui_next/src/components/Lookup/Lookup.jsx
+++ b/awx/ui_next/src/components/Lookup/Lookup.jsx
@@ -17,7 +17,7 @@ import {
   InputGroup,
   Modal,
 } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import ChipGroup from '../ChipGroup';
@@ -44,7 +44,7 @@ function Lookup(props) {
     renderItemChip,
     renderOptionsList,
     history,
-    i18n,
+
     isDisabled,
   } = props;
 
@@ -103,7 +103,7 @@ function Lookup(props) {
     <Fragment>
       <InputGroup onBlur={onBlur}>
         <Button
-          aria-label={i18n._(t`Search`)}
+          aria-label={t`Search`}
           id={id}
           onClick={() => dispatch({ type: 'TOGGLE_MODAL' })}
           variant={ButtonVariant.control}
@@ -126,8 +126,8 @@ function Lookup(props) {
 
       <Modal
         variant="large"
-        title={i18n._(t`Select ${header || i18n._(t`Items`)}`)}
-        aria-label={i18n._(t`Lookup modal`)}
+        title={t`Select ${header || t`Items`}`}
+        aria-label={t`Lookup modal`}
         isOpen={isModalOpen}
         onClose={closeModal}
         actions={[
@@ -138,16 +138,16 @@ function Lookup(props) {
             onClick={save}
             isDisabled={required && selectedItems.length === 0}
           >
-            {i18n._(t`Select`)}
+            {t`Select`}
           </Button>,
           <Button
             ouiaId="modal-cancel-button"
             key="cancel"
             variant="link"
             onClick={closeModal}
-            aria-label={i18n._(t`Cancel lookup`)}
+            aria-label={t`Cancel lookup`}
           >
-            {i18n._(t`Cancel`)}
+            {t`Cancel`}
           </Button>,
         ]}
       >
@@ -197,4 +197,4 @@ Lookup.defaultProps = {
 };
 
 export { Lookup as _Lookup };
-export default withI18n()(withRouter(Lookup));
+export default withRouter(Lookup);
diff --git a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx
index d2b4e3fb1e..771a880738 100644
--- a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx
@@ -2,7 +2,7 @@ import 'styled-components/macro';
 import React, { Fragment, useState, useCallback, useEffect } from 'react';
 import { withRouter } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { ToolbarItem, Alert } from '@patternfly/react-core';
 import { CredentialsAPI, CredentialTypesAPI } from '../../api';
@@ -27,7 +27,7 @@ async function loadCredentials(params, selectedCredentialTypeId) {
 }
 
 function MultiCredentialsLookup(props) {
-  const { value, onChange, onError, history, i18n } = props;
+  const { value, onChange, onError, history } = props;
   const [selectedType, setSelectedType] = useState(null);
   const isMounted = useIsMounted();
 
@@ -128,7 +128,7 @@ function MultiCredentialsLookup(props) {
   return (
     <Lookup
       id="multiCredential"
-      header={i18n._(t`Credentials`)}
+      header={t`Credentials`}
       value={value}
       multiple
       onChange={onChange}
@@ -143,20 +143,18 @@ function MultiCredentialsLookup(props) {
                 variant="info"
                 isInline
                 css="margin-bottom: 20px;"
-                title={i18n._(
-                  t`You cannot select multiple vault credentials with the same vault ID. Doing so will automatically deselect the other with the same vault ID.`
-                )}
+                title={t`You cannot select multiple vault credentials with the same vault ID. Doing so will automatically deselect the other with the same vault ID.`}
               />
             )}
             {credentialTypes && credentialTypes.length > 0 && (
               <ToolbarItem css=" display: flex; align-items: center;">
                 <div css="flex: 0 0 25%; margin-right: 32px">
-                  {i18n._(t`Selected Category`)}
+                  {t`Selected Category`}
                 </div>
                 <AnsibleSelect
                   css="flex: 1 1 75%;"
                   id="multiCredentialsLookUp-select"
-                  label={i18n._(t`Selected Category`)}
+                  label={t`Selected Category`}
                   data={credentialTypes.map(type => ({
                     key: type.id,
                     value: type.id,
@@ -178,29 +176,29 @@ function MultiCredentialsLookup(props) {
               optionCount={credentialsCount}
               searchColumns={[
                 {
-                  name: i18n._(t`Name`),
+                  name: t`Name`,
                   key: 'name__icontains',
                   isDefault: true,
                 },
                 {
-                  name: i18n._(t`Created By (Username)`),
+                  name: t`Created By (Username)`,
                   key: 'created_by__username__icontains',
                 },
                 {
-                  name: i18n._(t`Modified By (Username)`),
+                  name: t`Modified By (Username)`,
                   key: 'modified_by__username__icontains',
                 },
               ]}
               sortColumns={[
                 {
-                  name: i18n._(t`Name`),
+                  name: t`Name`,
                   key: 'name',
                 },
               ]}
               searchableKeys={searchableKeys}
               relatedSearchableKeys={relatedSearchableKeys}
               multiple={isVault}
-              header={i18n._(t`Credentials`)}
+              header={t`Credentials`}
               displayKey={isVault ? 'label' : 'name'}
               name="credentials"
               qsConfig={QS_CONFIG}
@@ -249,4 +247,4 @@ MultiCredentialsLookup.defaultProps = {
 };
 
 export { MultiCredentialsLookup as _MultiCredentialsLookup };
-export default withI18n()(withRouter(MultiCredentialsLookup));
+export default withRouter(MultiCredentialsLookup);
diff --git a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx
index 8252c9035c..b3fa6ee194 100644
--- a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { node, func, bool } from 'prop-types';
 import { withRouter } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { FormGroup } from '@patternfly/react-core';
 import { OrganizationsAPI } from '../../api';
@@ -21,7 +21,7 @@ const QS_CONFIG = getQSConfig('organizations', {
 
 function OrganizationLookup({
   helperTextInvalid,
-  i18n,
+
   isValid,
   onBlur,
   onChange,
@@ -79,13 +79,13 @@ function OrganizationLookup({
       helperTextInvalid={helperTextInvalid}
       isRequired={required}
       validated={isValid ? 'default' : 'error'}
-      label={i18n._(t`Organization`)}
+      label={t`Organization`}
       helperText={helperText}
     >
       <Lookup
         isDisabled={isDisabled}
         id="organization"
-        header={i18n._(t`Organization`)}
+        header={t`Organization`}
         value={value}
         onBlur={onBlur}
         onChange={onChange}
@@ -98,27 +98,27 @@ function OrganizationLookup({
             options={organizations}
             optionCount={itemCount}
             multiple={state.multiple}
-            header={i18n._(t`Organization`)}
+            header={t`Organization`}
             name="organization"
             qsConfig={QS_CONFIG}
             searchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Created By (Username)`),
+                name: t`Created By (Username)`,
                 key: 'created_by__username__icontains',
               },
               {
-                name: i18n._(t`Modified By (Username)`),
+                name: t`Modified By (Username)`,
                 key: 'modified_by__username__icontains',
               },
             ]}
             sortColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name',
               },
             ]}
@@ -157,4 +157,4 @@ OrganizationLookup.defaultProps = {
 };
 
 export { OrganizationLookup as _OrganizationLookup };
-export default withI18n()(withRouter(OrganizationLookup));
+export default withRouter(OrganizationLookup);
diff --git a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
index a02ed40d84..2739a7b48f 100644
--- a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { node, string, func, bool } from 'prop-types';
 import { withRouter } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { FormGroup } from '@patternfly/react-core';
 import { ProjectsAPI } from '../../api';
@@ -24,7 +24,7 @@ const QS_CONFIG = getQSConfig('project', {
 function ProjectLookup({
   helperTextInvalid,
   autoPopulate,
-  i18n,
+
   isValid,
   onChange,
   required,
@@ -83,12 +83,12 @@ function ProjectLookup({
       helperTextInvalid={helperTextInvalid}
       isRequired={required}
       validated={isValid ? 'default' : 'error'}
-      label={i18n._(t`Project`)}
+      label={t`Project`}
       labelIcon={tooltip && <Popover content={tooltip} />}
     >
       <Lookup
         id="project"
-        header={i18n._(t`Project`)}
+        header={t`Project`}
         name="project"
         value={value}
         onBlur={onBlur}
@@ -102,37 +102,37 @@ function ProjectLookup({
             value={state.selectedItems}
             searchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Type`),
+                name: t`Type`,
                 key: 'or__scm_type',
                 options: [
-                  [``, i18n._(t`Manual`)],
-                  [`git`, i18n._(t`Git`)],
-                  [`svn`, i18n._(t`Subversion`)],
-                  [`archive`, i18n._(t`Remote Archive`)],
-                  [`insights`, i18n._(t`Red Hat Insights`)],
+                  [``, t`Manual`],
+                  [`git`, t`Git`],
+                  [`svn`, t`Subversion`],
+                  [`archive`, t`Remote Archive`],
+                  [`insights`, t`Red Hat Insights`],
                 ],
               },
               {
-                name: i18n._(t`Source Control URL`),
+                name: t`Source Control URL`,
                 key: 'scm_url__icontains',
               },
               {
-                name: i18n._(t`Modified By (Username)`),
+                name: t`Modified By (Username)`,
                 key: 'modified_by__username__icontains',
               },
               {
-                name: i18n._(t`Created By (Username)`),
+                name: t`Created By (Username)`,
                 key: 'created_by__username__icontains',
               },
             ]}
             sortColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name',
               },
             ]}
@@ -141,7 +141,7 @@ function ProjectLookup({
             options={projects}
             optionCount={count}
             multiple={state.multiple}
-            header={i18n._(t`Project`)}
+            header={t`Project`}
             name="project"
             qsConfig={QS_CONFIG}
             readOnly={!canDelete}
@@ -179,4 +179,4 @@ ProjectLookup.defaultProps = {
 };
 
 export { ProjectLookup as _ProjectLookup };
-export default withI18n()(withRouter(ProjectLookup));
+export default withRouter(ProjectLookup);
diff --git a/awx/ui_next/src/components/Lookup/shared/LookupErrorMessage.jsx b/awx/ui_next/src/components/Lookup/shared/LookupErrorMessage.jsx
index ad1bc32fc8..590a90d99a 100644
--- a/awx/ui_next/src/components/Lookup/shared/LookupErrorMessage.jsx
+++ b/awx/ui_next/src/components/Lookup/shared/LookupErrorMessage.jsx
@@ -1,17 +1,17 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
-function LookupErrorMessage({ error, i18n }) {
+function LookupErrorMessage({ error }) {
   if (!error) {
     return null;
   }
 
   return (
     <div className="pf-c-form__helper-text pf-m-error" aria-live="polite">
-      {error.message || i18n._(t`An error occurred`)}
+      {error.message || t`An error occurred`}
     </div>
   );
 }
 
-export default withI18n()(LookupErrorMessage);
+export default LookupErrorMessage;
diff --git a/awx/ui_next/src/components/NotificationList/NotificationList.jsx b/awx/ui_next/src/components/NotificationList/NotificationList.jsx
index 4422dc8c01..aca57d8c94 100644
--- a/awx/ui_next/src/components/NotificationList/NotificationList.jsx
+++ b/awx/ui_next/src/components/NotificationList/NotificationList.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useCallback, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { number, shape, bool } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import AlertModal from '../AlertModal';
 import ErrorDetail from '../ErrorDetail';
@@ -21,7 +21,7 @@ function NotificationList({
   apiModel,
   canToggleNotifications,
   id,
-  i18n,
+
   showApprovalsToggle,
 }) {
   const location = useLocation();
@@ -174,40 +174,40 @@ function NotificationList({
         hasContentLoading={isLoading}
         items={notifications}
         itemCount={itemCount}
-        pluralizedItemName={i18n._(t`Notifications`)}
+        pluralizedItemName={t`Notifications`}
         qsConfig={QS_CONFIG}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Description`),
+            name: t`Description`,
             key: 'description__icontains',
           },
           {
-            name: i18n._(t`Notification type`),
+            name: t`Notification type`,
             key: 'or__notification_type',
             options: [
-              ['email', i18n._(t`Email`)],
-              ['grafana', i18n._(t`Grafana`)],
-              ['hipchat', i18n._(t`Hipchat`)],
-              ['irc', i18n._(t`IRC`)],
-              ['mattermost', i18n._(t`Mattermost`)],
-              ['pagerduty', i18n._(t`Pagerduty`)],
-              ['rocketchat', i18n._(t`Rocket.Chat`)],
-              ['slack', i18n._(t`Slack`)],
-              ['twilio', i18n._(t`Twilio`)],
-              ['webhook', i18n._(t`Webhook`)],
+              ['email', t`Email`],
+              ['grafana', t`Grafana`],
+              ['hipchat', t`Hipchat`],
+              ['irc', t`IRC`],
+              ['mattermost', t`Mattermost`],
+              ['pagerduty', t`Pagerduty`],
+              ['rocketchat', t`Rocket.Chat`],
+              ['slack', t`Slack`],
+              ['twilio', t`Twilio`],
+              ['webhook', t`Webhook`],
             ],
           },
           {
-            name: i18n._(t`Created By (Username)`),
+            name: t`Created By (Username)`,
             key: 'created_by__username__icontains',
           },
           {
-            name: i18n._(t`Modified By (Username)`),
+            name: t`Modified By (Username)`,
             key: 'modified_by__username__icontains',
           },
         ]}
@@ -215,11 +215,9 @@ function NotificationList({
         toolbarRelatedSearchableKeys={relatedSearchableKeys}
         headerRow={
           <HeaderRow qsConfig={QS_CONFIG} isSelectable={false}>
-            <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
-            <HeaderCell sortKey="notification_type">
-              {i18n._(t`Type`)}
-            </HeaderCell>
-            <HeaderCell>{i18n._(t`Options`)}</HeaderCell>
+            <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
+            <HeaderCell sortKey="notification_type">{t`Type`}</HeaderCell>
+            <HeaderCell>{t`Options`}</HeaderCell>
           </HeaderRow>
         }
         renderRow={(notification, index) => (
@@ -245,11 +243,11 @@ function NotificationList({
       {toggleError && (
         <AlertModal
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           isOpen={loadingToggleIds.length === 0}
           onClose={() => setToggleError(null)}
         >
-          {i18n._(t`Failed to toggle notification.`)}
+          {t`Failed to toggle notification.`}
           <ErrorDetail error={toggleError} />
         </AlertModal>
       )}
@@ -268,4 +266,4 @@ NotificationList.defaultProps = {
   showApprovalsToggle: false,
 };
 
-export default withI18n()(NotificationList);
+export default NotificationList;
diff --git a/awx/ui_next/src/components/NotificationList/NotificationListItem.jsx b/awx/ui_next/src/components/NotificationList/NotificationListItem.jsx
index 5b0fc2fad7..faf88aae29 100644
--- a/awx/ui_next/src/components/NotificationList/NotificationListItem.jsx
+++ b/awx/ui_next/src/components/NotificationList/NotificationListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shape, number, string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import { Switch } from '@patternfly/react-core';
@@ -16,29 +16,24 @@ function NotificationListItem({
   successTurnedOn,
   errorTurnedOn,
   toggleNotification,
-  i18n,
+
   typeLabels,
   showApprovalsToggle,
 }) {
   return (
     <Tr id={`notification-row-${notification.id}`}>
-      <Td id={`notification-${notification.id}`} dataLabel={i18n._(t`Name`)}>
+      <Td id={`notification-${notification.id}`} dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
           <b>{notification.name}</b>
         </Link>
       </Td>
-      <Td dataLabel={i18n._(t`Type`)}>
-        {typeLabels[notification.notification_type]}
-      </Td>
-      <ActionsTd
-        dataLabel={i18n._(t`Options`)}
-        gridColumns="120px 120px 120px 120px"
-      >
+      <Td dataLabel={t`Type`}>{typeLabels[notification.notification_type]}</Td>
+      <ActionsTd dataLabel={t`Options`} gridColumns="120px 120px 120px 120px">
         <ActionItem visible={showApprovalsToggle}>
           <Switch
             id={`notification-${notification.id}-approvals-toggle`}
-            label={i18n._(t`Approval`)}
-            labelOff={i18n._(t`Approval`)}
+            label={t`Approval`}
+            labelOff={t`Approval`}
             isChecked={approvalsTurnedOn}
             isDisabled={!canToggleNotifications}
             onChange={() =>
@@ -48,46 +43,46 @@ function NotificationListItem({
                 'approvals'
               )
             }
-            aria-label={i18n._(t`Toggle notification approvals`)}
+            aria-label={t`Toggle notification approvals`}
           />
         </ActionItem>
         <ActionItem visible>
           <Switch
             id={`notification-${notification.id}-started-toggle`}
-            label={i18n._(t`Start`)}
-            labelOff={i18n._(t`Start`)}
+            label={t`Start`}
+            labelOff={t`Start`}
             isChecked={startedTurnedOn}
             isDisabled={!canToggleNotifications}
             onChange={() =>
               toggleNotification(notification.id, startedTurnedOn, 'started')
             }
-            aria-label={i18n._(t`Toggle notification start`)}
+            aria-label={t`Toggle notification start`}
           />
         </ActionItem>
         <ActionItem visible>
           <Switch
             id={`notification-${notification.id}-success-toggle`}
-            label={i18n._(t`Success`)}
-            labelOff={i18n._(t`Success`)}
+            label={t`Success`}
+            labelOff={t`Success`}
             isChecked={successTurnedOn}
             isDisabled={!canToggleNotifications}
             onChange={() =>
               toggleNotification(notification.id, successTurnedOn, 'success')
             }
-            aria-label={i18n._(t`Toggle notification success`)}
+            aria-label={t`Toggle notification success`}
           />
         </ActionItem>
         <ActionItem visible>
           <Switch
             id={`notification-${notification.id}-error-toggle`}
-            label={i18n._(t`Failure`)}
-            labelOff={i18n._(t`Failure`)}
+            label={t`Failure`}
+            labelOff={t`Failure`}
             isChecked={errorTurnedOn}
             isDisabled={!canToggleNotifications}
             onChange={() =>
               toggleNotification(notification.id, errorTurnedOn, 'error')
             }
-            aria-label={i18n._(t`Toggle notification failure`)}
+            aria-label={t`Toggle notification failure`}
           />
         </ActionItem>
       </ActionsTd>
@@ -120,4 +115,4 @@ NotificationListItem.defaultProps = {
   showApprovalsToggle: false,
 };
 
-export default withI18n()(NotificationListItem);
+export default NotificationListItem;
diff --git a/awx/ui_next/src/components/OptionsList/OptionsList.jsx b/awx/ui_next/src/components/OptionsList/OptionsList.jsx
index 86abce0001..ef6f23da75 100644
--- a/awx/ui_next/src/components/OptionsList/OptionsList.jsx
+++ b/awx/ui_next/src/components/OptionsList/OptionsList.jsx
@@ -9,7 +9,7 @@ import {
   oneOfType,
 } from 'prop-types';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import SelectedList from '../SelectedList';
 import PaginatedDataList from '../PaginatedDataList';
@@ -41,14 +41,14 @@ function OptionsList({
   deselectItem,
   renderItemChip,
   isLoading,
-  i18n,
+
   displayKey,
 }) {
   return (
     <ModalList>
       {value.length > 0 && (
         <SelectedList
-          label={i18n._(t`Selected`)}
+          label={t`Selected`}
           selected={value}
           onRemove={item => deselectItem(item)}
           isReadOnly={readOnly}
@@ -113,4 +113,4 @@ OptionsList.defaultProps = {
   displayKey: 'name',
 };
 
-export default withI18n()(OptionsList);
+export default OptionsList;
diff --git a/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx b/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx
index 60412ae0d5..aaeed5455b 100644
--- a/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx
+++ b/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx
@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
 
 import PropTypes from 'prop-types';
 import { DataList } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { withRouter, useHistory, useLocation } from 'react-router-dom';
 
@@ -40,7 +40,7 @@ function PaginatedDataList({
   pluralizedItemName,
   showPageSizeOptions,
   location,
-  i18n,
+
   renderToolbar,
 }) {
   const { search, pathname } = useLocation();
@@ -74,7 +74,7 @@ function PaginatedDataList({
     ? toolbarSearchColumns
     : [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
           isDefault: true,
         },
@@ -83,17 +83,15 @@ function PaginatedDataList({
     ? toolbarSortColumns
     : [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ];
   const queryParams = parseQueryString(qsConfig, location.search);
 
-  const dataListLabel = i18n._(t`${pluralizedItemName} List`);
-  const emptyContentMessage = i18n._(
-    t`Please add ${pluralizedItemName} to populate this list `
-  );
-  const emptyContentTitle = i18n._(t`No ${pluralizedItemName} Found `);
+  const dataListLabel = t`${pluralizedItemName} List`;
+  const emptyContentMessage = t`Please add ${pluralizedItemName} to populate this list `;
+  const emptyContentTitle = t`No ${pluralizedItemName} Found `;
 
   let Content;
   if (hasContentLoading && items.length <= 0) {
@@ -218,4 +216,4 @@ PaginatedDataList.defaultProps = {
 };
 
 export { PaginatedDataList as _PaginatedDataList };
-export default withI18n()(withRouter(PaginatedDataList));
+export default withRouter(PaginatedDataList);
diff --git a/awx/ui_next/src/components/PaginatedDataList/ToolbarAddButton.jsx b/awx/ui_next/src/components/PaginatedDataList/ToolbarAddButton.jsx
index 3190bfbc27..846942b168 100644
--- a/awx/ui_next/src/components/PaginatedDataList/ToolbarAddButton.jsx
+++ b/awx/ui_next/src/components/PaginatedDataList/ToolbarAddButton.jsx
@@ -3,16 +3,16 @@ import { string, func } from 'prop-types';
 import { Link } from 'react-router-dom';
 import { Button, DropdownItem, Tooltip } from '@patternfly/react-core';
 import CaretDownIcon from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useKebabifiedMenu } from '../../contexts/Kebabified';
 
 function ToolbarAddButton({
   linkTo,
   onClick,
-  i18n,
+
   isDisabled,
-  defaultLabel = i18n._(t`Add`),
+  defaultLabel = t`Add`,
   showToggleIndicator,
 }) {
   const { isKebabified } = useKebabifiedMenu();
@@ -72,4 +72,4 @@ ToolbarAddButton.defaultProps = {
   onClick: null,
 };
 
-export default withI18n()(ToolbarAddButton);
+export default ToolbarAddButton;
diff --git a/awx/ui_next/src/components/PaginatedTable/PaginatedTable.jsx b/awx/ui_next/src/components/PaginatedTable/PaginatedTable.jsx
index ffd9878d60..33dc4c70af 100644
--- a/awx/ui_next/src/components/PaginatedTable/PaginatedTable.jsx
+++ b/awx/ui_next/src/components/PaginatedTable/PaginatedTable.jsx
@@ -2,7 +2,7 @@ import 'styled-components/macro';
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { TableComposable, Tbody } from '@patternfly/react-table';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useHistory } from 'react-router-dom';
 
@@ -35,7 +35,7 @@ function PaginatedTable({
   toolbarRelatedSearchableKeys,
   pluralizedItemName,
   showPageSizeOptions,
-  i18n,
+
   renderToolbar,
   emptyContentMessage,
   ouiaId,
@@ -67,15 +67,15 @@ function PaginatedTable({
     ? toolbarSearchColumns
     : [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
           isDefault: true,
         },
       ];
   const queryParams = parseQueryString(qsConfig, history.location.search);
 
-  const dataListLabel = i18n._(t`${pluralizedItemName} List`);
-  const emptyContentTitle = i18n._(t`No ${pluralizedItemName} Found `);
+  const dataListLabel = t`${pluralizedItemName} List`;
+  const emptyContentTitle = t`No ${pluralizedItemName} Found `;
 
   let Content;
   if (hasContentLoading && items.length <= 0) {
@@ -88,7 +88,7 @@ function PaginatedTable({
         title={emptyContentTitle}
         message={
           emptyContentMessage ||
-          i18n._(t`Please add ${pluralizedItemName} to populate this list `)
+          t`Please add ${pluralizedItemName} to populate this list `
         }
       />
     );
@@ -201,4 +201,4 @@ PaginatedTable.defaultProps = {
 };
 
 export { PaginatedTable as _PaginatedTable };
-export default withI18n()(PaginatedTable);
+export default PaginatedTable;
diff --git a/awx/ui_next/src/components/Pagination/Pagination.jsx b/awx/ui_next/src/components/Pagination/Pagination.jsx
index 88384be7f3..139cda4ad4 100644
--- a/awx/ui_next/src/components/Pagination/Pagination.jsx
+++ b/awx/ui_next/src/components/Pagination/Pagination.jsx
@@ -4,7 +4,7 @@ import {
   Pagination as PFPagination,
   DropdownDirection,
 } from '@patternfly/react-core';
-import { i18n } from '@lingui/core';
+import {} from '@lingui/core';
 import { t } from '@lingui/macro';
 
 const AWXPagination = styled(PFPagination)`
@@ -21,18 +21,18 @@ const AWXPagination = styled(PFPagination)`
 export default props => (
   <AWXPagination
     titles={{
-      items: i18n._(t`items`),
-      page: i18n._(t`page`),
-      pages: i18n._(t`pages`),
-      itemsPerPage: i18n._(t`Items per page`),
-      perPageSuffix: i18n._(t`per page`),
-      toFirstPage: i18n._(t`Go to first page`),
-      toPreviousPage: i18n._(t`Go to previous page`),
-      toLastPage: i18n._(t`Go to last page`),
-      toNextPage: i18n._(t`Go to next page`),
-      optionsToggle: i18n._(t`Select`),
-      currPage: i18n._(t`Current page`),
-      paginationTitle: i18n._(t`Pagination`),
+      items: t`items`,
+      page: t`page`,
+      pages: t`pages`,
+      itemsPerPage: t`Items per page`,
+      perPageSuffix: t`per page`,
+      toFirstPage: t`Go to first page`,
+      toPreviousPage: t`Go to previous page`,
+      toLastPage: t`Go to last page`,
+      toNextPage: t`Go to next page`,
+      optionsToggle: t`Select`,
+      currPage: t`Current page`,
+      paginationTitle: t`Pagination`,
     }}
     dropDirection={DropdownDirection.up}
     {...props}
diff --git a/awx/ui_next/src/components/Popover/Popover.jsx b/awx/ui_next/src/components/Popover/Popover.jsx
index d3357b3209..4d48b20a14 100644
--- a/awx/ui_next/src/components/Popover/Popover.jsx
+++ b/awx/ui_next/src/components/Popover/Popover.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { node, string } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Popover as PFPopover } from '@patternfly/react-core';
 import { HelpIcon } from '@patternfly/react-icons';
@@ -12,16 +12,7 @@ const PopoverButton = styled.button`
   font-size: var(--pf-global--FontSize--sm);
 `;
 
-function Popover({
-  i18n,
-  i18nHash,
-  ariaLabel,
-  content,
-  header,
-  id,
-  maxWidth,
-  ...rest
-}) {
+function Popover({ ariaLabel, content, header, id, maxWidth, ...rest }) {
   if (!content) {
     return null;
   }
@@ -36,7 +27,7 @@ function Popover({
       {...rest}
     >
       <PopoverButton
-        aria-label={ariaLabel ?? i18n._(t`More information`)}
+        aria-label={ariaLabel ?? t`More information`}
         aria-haspopup="true"
         className="pf-c-form__group-label-help"
         onClick={e => e.preventDefault()}
@@ -63,4 +54,4 @@ Popover.defaultProps = {
   maxWidth: '',
 };
 
-export default withI18n()(Popover);
+export default Popover;
diff --git a/awx/ui_next/src/components/PromptDetail/PromptDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptDetail.jsx
index 61eede896d..4069f67270 100644
--- a/awx/ui_next/src/components/PromptDetail/PromptDetail.jsx
+++ b/awx/ui_next/src/components/PromptDetail/PromptDetail.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React from 'react';
 import { shape } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
@@ -90,13 +90,13 @@ function omitOverrides(resource, overrides, defaultConfig) {
   return clonedResource;
 }
 
-function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
+function PromptDetail({ resource, launchConfig = {}, overrides = {} }) {
   const VERBOSITY = {
-    0: i18n._(t`0 (Normal)`),
-    1: i18n._(t`1 (Verbose)`),
-    2: i18n._(t`2 (More Verbose)`),
-    3: i18n._(t`3 (Debug)`),
-    4: i18n._(t`4 (Connection Debug)`),
+    0: t`0 (Normal)`,
+    1: t`1 (Verbose)`,
+    2: t`2 (More Verbose)`,
+    3: t`3 (Debug)`,
+    4: t`4 (Connection Debug)`,
   };
 
   const details = omitOverrides(resource, overrides, launchConfig.defaults);
@@ -106,16 +106,13 @@ function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
   return (
     <>
       <DetailList gutter="sm">
-        <Detail label={i18n._(t`Name`)} value={buildResourceLink(resource)} />
-        <Detail label={i18n._(t`Description`)} value={details.description} />
+        <Detail label={t`Name`} value={buildResourceLink(resource)} />
+        <Detail label={t`Description`} value={details.description} />
         <Detail
-          label={i18n._(t`Type`)}
+          label={t`Type`}
           value={toTitleCase(details.unified_job_type || details.type)}
         />
-        <Detail
-          label={i18n._(t`Timeout`)}
-          value={formatTimeout(details?.timeout)}
-        />
+        <Detail label={t`Timeout`} value={formatTimeout(details?.timeout)} />
         {details?.type === 'project' && (
           <PromptProjectDetail resource={details} />
         )}
@@ -130,14 +127,14 @@ function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
         )}
         {details?.created && (
           <UserDateDetail
-            label={i18n._(t`Created`)}
+            label={t`Created`}
             date={details.created}
             user={details?.summary_fields?.created_by}
           />
         )}
         {details?.modified && (
           <UserDateDetail
-            label={i18n._(t`Last Modified`)}
+            label={t`Last Modified`}
             date={details?.modified}
             user={details?.summary_fields?.modified_by}
           />
@@ -146,21 +143,19 @@ function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
 
       {hasPromptData(launchConfig) && hasOverrides && (
         <>
-          <PromptTitle headingLevel="h2">
-            {i18n._(t`Prompted Values`)}
-          </PromptTitle>
+          <PromptTitle headingLevel="h2">{t`Prompted Values`}</PromptTitle>
           <PromptDivider />
-          <PromptDetailList aria-label={i18n._(t`Prompt Overrides`)}>
+          <PromptDetailList aria-label={t`Prompt Overrides`}>
             {launchConfig.ask_job_type_on_launch && (
               <Detail
-                label={i18n._(t`Job Type`)}
+                label={t`Job Type`}
                 value={toTitleCase(overrides.job_type)}
               />
             )}
             {launchConfig.ask_credential_on_launch && (
               <Detail
                 fullWidth
-                label={i18n._(t`Credentials`)}
+                label={t`Credentials`}
                 rows={4}
                 value={
                   <ChipGroup
@@ -179,31 +174,28 @@ function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
               />
             )}
             {launchConfig.ask_inventory_on_launch && (
-              <Detail
-                label={i18n._(t`Inventory`)}
-                value={overrides.inventory?.name}
-              />
+              <Detail label={t`Inventory`} value={overrides.inventory?.name} />
             )}
             {launchConfig.ask_scm_branch_on_launch && (
               <Detail
-                label={i18n._(t`Source Control Branch`)}
+                label={t`Source Control Branch`}
                 value={overrides.scm_branch}
               />
             )}
             {launchConfig.ask_limit_on_launch && (
-              <Detail label={i18n._(t`Limit`)} value={overrides.limit} />
+              <Detail label={t`Limit`} value={overrides.limit} />
             )}
             {Object.prototype.hasOwnProperty.call(overrides, 'verbosity') &&
             launchConfig.ask_verbosity_on_launch ? (
               <Detail
-                label={i18n._(t`Verbosity`)}
+                label={t`Verbosity`}
                 value={VERBOSITY[overrides.verbosity]}
               />
             ) : null}
             {launchConfig.ask_tags_on_launch && (
               <Detail
                 fullWidth
-                label={i18n._(t`Job Tags`)}
+                label={t`Job Tags`}
                 value={
                   <ChipGroup
                     numChips={5}
@@ -226,7 +218,7 @@ function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
             {launchConfig.ask_skip_tags_on_launch && (
               <Detail
                 fullWidth
-                label={i18n._(t`Skip Tags`)}
+                label={t`Skip Tags`}
                 value={
                   <ChipGroup
                     numChips={5}
@@ -248,16 +240,14 @@ function PromptDetail({ i18n, resource, launchConfig = {}, overrides = {} }) {
             )}
             {launchConfig.ask_diff_mode_on_launch && (
               <Detail
-                label={i18n._(t`Show Changes`)}
-                value={
-                  overrides.diff_mode === true ? i18n._(t`On`) : i18n._(t`Off`)
-                }
+                label={t`Show Changes`}
+                value={overrides.diff_mode === true ? t`On` : t`Off`}
               />
             )}
             {(launchConfig.survey_enabled ||
               launchConfig.ask_variables_on_launch) && (
               <VariablesDetail
-                label={i18n._(t`Variables`)}
+                label={t`Variables`}
                 rows={4}
                 value={overrides.extra_vars}
               />
@@ -278,4 +268,4 @@ PromptDetail.propTypes = {
   launchConfig: shape({}),
 };
 
-export default withI18n()(PromptDetail);
+export default PromptDetail;
diff --git a/awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.jsx
index 587c399a1e..11869d150a 100644
--- a/awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.jsx
+++ b/awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 
@@ -10,7 +10,7 @@ import CredentialChip from '../CredentialChip';
 import ChipGroup from '../ChipGroup';
 import ExecutionEnvironmentDetail from '../ExecutionEnvironmentDetail';
 
-function PromptInventorySourceDetail({ i18n, resource }) {
+function PromptInventorySourceDetail({ resource }) {
   const {
     custom_virtualenv,
     group_by,
@@ -29,11 +29,11 @@ function PromptInventorySourceDetail({ i18n, resource }) {
   } = resource;
 
   const VERBOSITY = {
-    0: i18n._(t`0 (Normal)`),
-    1: i18n._(t`1 (Verbose)`),
-    2: i18n._(t`2 (More Verbose)`),
-    3: i18n._(t`3 (Debug)`),
-    4: i18n._(t`4 (Connection Debug)`),
+    0: t`0 (Normal)`,
+    1: t`1 (Verbose)`,
+    2: t`2 (More Verbose)`,
+    3: t`3 (Debug)`,
+    4: t`4 (Connection Debug)`,
   };
 
   let optionsList = '';
@@ -45,13 +45,11 @@ function PromptInventorySourceDetail({ i18n, resource }) {
   ) {
     optionsList = (
       <List>
-        {overwrite && <ListItem>{i18n._(t`Overwrite`)}</ListItem>}
-        {overwrite_vars && (
-          <ListItem>{i18n._(t`Overwrite Variables`)}</ListItem>
-        )}
-        {update_on_launch && <ListItem>{i18n._(t`Update on Launch`)}</ListItem>}
+        {overwrite && <ListItem>{t`Overwrite`}</ListItem>}
+        {overwrite_vars && <ListItem>{t`Overwrite Variables`}</ListItem>}
+        {update_on_launch && <ListItem>{t`Update on Launch`}</ListItem>}
         {update_on_project_update && (
-          <ListItem>{i18n._(t`Update on Project Update`)}</ListItem>
+          <ListItem>{t`Update on Project Update`}</ListItem>
         )}
       </List>
     );
@@ -61,7 +59,7 @@ function PromptInventorySourceDetail({ i18n, resource }) {
     <>
       {summary_fields?.organization ? (
         <Detail
-          label={i18n._(t`Organization`)}
+          label={t`Organization`}
           value={
             <Link
               to={`/organizations/${summary_fields.organization.id}/details`}
@@ -71,11 +69,11 @@ function PromptInventorySourceDetail({ i18n, resource }) {
           }
         />
       ) : (
-        <DeletedDetail label={i18n._(t`Organization`)} />
+        <DeletedDetail label={t`Organization`} />
       )}
       {summary_fields?.inventory && (
         <Detail
-          label={i18n._(t`Inventory`)}
+          label={t`Inventory`}
           value={
             <Link to={`/inventories/${summary_fields.inventory?.id}/details`}>
               {summary_fields?.inventory?.name}
@@ -83,10 +81,10 @@ function PromptInventorySourceDetail({ i18n, resource }) {
           }
         />
       )}
-      <Detail label={i18n._(t`Source`)} value={source} />
+      <Detail label={t`Source`} value={source} />
       {summary_fields?.source_project && (
         <Detail
-          label={i18n._(t`Project`)}
+          label={t`Project`}
           value={
             <Link to={`/projects/${summary_fields.source_project?.id}/details`}>
               {summary_fields.source_project?.name}
@@ -98,16 +96,16 @@ function PromptInventorySourceDetail({ i18n, resource }) {
         virtualEnvironment={custom_virtualenv}
         executionEnvironment={summary_fields?.execution_environment}
       />
-      <Detail label={i18n._(t`Inventory File`)} value={source_path} />
-      <Detail label={i18n._(t`Verbosity`)} value={VERBOSITY[verbosity]} />
+      <Detail label={t`Inventory File`} value={source_path} />
+      <Detail label={t`Verbosity`} value={VERBOSITY[verbosity]} />
       <Detail
-        label={i18n._(t`Cache Timeout`)}
-        value={`${update_cache_timeout} ${i18n._(t`Seconds`)}`}
+        label={t`Cache Timeout`}
+        value={`${update_cache_timeout} ${t`Seconds`}`}
       />
       {summary_fields?.credentials?.length > 0 && (
         <Detail
           fullWidth
-          label={i18n._(t`Credential`)}
+          label={t`Credential`}
           value={summary_fields.credentials.map(cred => (
             <CredentialChip key={cred?.id} credential={cred} isReadOnly />
           ))}
@@ -116,7 +114,7 @@ function PromptInventorySourceDetail({ i18n, resource }) {
       {source_regions && (
         <Detail
           fullWidth
-          label={i18n._(t`Regions`)}
+          label={t`Regions`}
           value={
             <ChipGroup
               numChips={5}
@@ -134,7 +132,7 @@ function PromptInventorySourceDetail({ i18n, resource }) {
       {instance_filters && (
         <Detail
           fullWidth
-          label={i18n._(t`Instance Filters`)}
+          label={t`Instance Filters`}
           value={
             <ChipGroup
               numChips={5}
@@ -152,7 +150,7 @@ function PromptInventorySourceDetail({ i18n, resource }) {
       {group_by && (
         <Detail
           fullWidth
-          label={i18n._(t`Only Group By`)}
+          label={t`Only Group By`}
           value={
             <ChipGroup numChips={5} totalChips={group_by.split(',').length}>
               {group_by.split(',').map(group => (
@@ -164,10 +162,10 @@ function PromptInventorySourceDetail({ i18n, resource }) {
           }
         />
       )}
-      {optionsList && <Detail label={i18n._(t`Options`)} value={optionsList} />}
+      {optionsList && <Detail label={t`Options`} value={optionsList} />}
       {source_vars && (
         <VariablesDetail
-          label={i18n._(t`Source Variables`)}
+          label={t`Source Variables`}
           rows={4}
           value={source_vars}
         />
@@ -176,4 +174,4 @@ function PromptInventorySourceDetail({ i18n, resource }) {
   );
 }
 
-export default withI18n()(PromptInventorySourceDetail);
+export default PromptInventorySourceDetail;
diff --git a/awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.jsx
index 0442a2d4de..b0763d8717 100644
--- a/awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.jsx
+++ b/awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 
@@ -12,7 +12,7 @@ import { VariablesDetail } from '../CodeEditor';
 import ExecutionEnvironmentDetail from '../ExecutionEnvironmentDetail';
 import { toTitleCase } from '../../util/strings';
 
-function PromptJobTemplateDetail({ i18n, resource }) {
+function PromptJobTemplateDetail({ resource }) {
   const {
     allow_simultaneous,
     ask_inventory_on_launch,
@@ -39,11 +39,11 @@ function PromptJobTemplateDetail({ i18n, resource }) {
   } = resource;
 
   const VERBOSITY = {
-    0: i18n._(t`0 (Normal)`),
-    1: i18n._(t`1 (Verbose)`),
-    2: i18n._(t`2 (More Verbose)`),
-    3: i18n._(t`3 (Debug)`),
-    4: i18n._(t`4 (Connection Debug)`),
+    0: t`0 (Normal)`,
+    1: t`1 (Verbose)`,
+    2: t`2 (More Verbose)`,
+    3: t`3 (Debug)`,
+    4: t`4 (Connection Debug)`,
   };
 
   let optionsList = '';
@@ -56,15 +56,13 @@ function PromptJobTemplateDetail({ i18n, resource }) {
     optionsList = (
       <List>
         {become_enabled && (
-          <ListItem>{i18n._(t`Enable Privilege Escalation`)}</ListItem>
+          <ListItem>{t`Enable Privilege Escalation`}</ListItem>
         )}
         {host_config_key && (
-          <ListItem>{i18n._(t`Allow Provisioning Callbacks`)}</ListItem>
+          <ListItem>{t`Allow Provisioning Callbacks`}</ListItem>
         )}
-        {allow_simultaneous && (
-          <ListItem>{i18n._(t`Enable Concurrent Jobs`)}</ListItem>
-        )}
-        {use_fact_cache && <ListItem>{i18n._(t`Use Fact Storage`)}</ListItem>}
+        {allow_simultaneous && <ListItem>{t`Enable Concurrent Jobs`}</ListItem>}
+        {use_fact_cache && <ListItem>{t`Use Fact Storage`}</ListItem>}
       </List>
     );
   }
@@ -82,15 +80,12 @@ function PromptJobTemplateDetail({ i18n, resource }) {
   return (
     <>
       {summary_fields.recent_jobs?.length > 0 && (
-        <Detail
-          value={<Sparkline jobs={recentJobs} />}
-          label={i18n._(t`Activity`)}
-        />
+        <Detail value={<Sparkline jobs={recentJobs} />} label={t`Activity`} />
       )}
-      <Detail label={i18n._(t`Job Type`)} value={toTitleCase(job_type)} />
+      <Detail label={t`Job Type`} value={toTitleCase(job_type)} />
       {summary_fields?.organization ? (
         <Detail
-          label={i18n._(t`Organization`)}
+          label={t`Organization`}
           value={
             <Link
               to={`/organizations/${summary_fields.organization.id}/details`}
@@ -100,11 +95,11 @@ function PromptJobTemplateDetail({ i18n, resource }) {
           }
         />
       ) : (
-        <DeletedDetail label={i18n._(t`Organization`)} />
+        <DeletedDetail label={t`Organization`} />
       )}
       {summary_fields?.inventory ? (
         <Detail
-          label={i18n._(t`Inventory`)}
+          label={t`Inventory`}
           value={
             <Link
               to={`/${inventoryKind}/${summary_fields.inventory?.id}/details`}
@@ -114,13 +109,11 @@ function PromptJobTemplateDetail({ i18n, resource }) {
           }
         />
       ) : (
-        !ask_inventory_on_launch && (
-          <DeletedDetail label={i18n._(t`Inventory`)} />
-        )
+        !ask_inventory_on_launch && <DeletedDetail label={t`Inventory`} />
       )}
       {summary_fields?.project ? (
         <Detail
-          label={i18n._(t`Project`)}
+          label={t`Project`}
           value={
             <Link to={`/projects/${summary_fields.project?.id}/details`}>
               {summary_fields.project?.name}
@@ -128,46 +121,40 @@ function PromptJobTemplateDetail({ i18n, resource }) {
           }
         />
       ) : (
-        <DeletedDetail label={i18n._(t`Project`)} />
+        <DeletedDetail label={t`Project`} />
       )}
       <ExecutionEnvironmentDetail
         virtualEnvironment={custom_virtualenv}
         executionEnvironment={summary_fields?.execution_environment}
       />
-      <Detail label={i18n._(t`Source Control Branch`)} value={scm_branch} />
-      <Detail label={i18n._(t`Playbook`)} value={playbook} />
-      <Detail label={i18n._(t`Forks`)} value={forks || '0'} />
-      <Detail label={i18n._(t`Limit`)} value={limit} />
-      <Detail label={i18n._(t`Verbosity`)} value={VERBOSITY[verbosity]} />
+      <Detail label={t`Source Control Branch`} value={scm_branch} />
+      <Detail label={t`Playbook`} value={playbook} />
+      <Detail label={t`Forks`} value={forks || '0'} />
+      <Detail label={t`Limit`} value={limit} />
+      <Detail label={t`Verbosity`} value={VERBOSITY[verbosity]} />
       {typeof diff_mode === 'boolean' && (
-        <Detail
-          label={i18n._(t`Show Changes`)}
-          value={diff_mode ? i18n._(t`On`) : i18n._(t`Off`)}
-        />
+        <Detail label={t`Show Changes`} value={diff_mode ? t`On` : t`Off`} />
       )}
-      <Detail label={i18n._(t` Job Slicing`)} value={job_slice_count} />
-      <Detail label={i18n._(t`Host Config Key`)} value={host_config_key} />
+      <Detail label={t` Job Slicing`} value={job_slice_count} />
+      <Detail label={t`Host Config Key`} value={host_config_key} />
       {related?.callback && (
         <Detail
-          label={i18n._(t`Provisioning Callback URL`)}
+          label={t`Provisioning Callback URL`}
           value={`${window.location.origin}${related.callback}`}
         />
       )}
-      <Detail
-        label={i18n._(t`Webhook Service`)}
-        value={toTitleCase(webhook_service)}
-      />
+      <Detail label={t`Webhook Service`} value={toTitleCase(webhook_service)} />
       {related?.webhook_receiver && (
         <Detail
-          label={i18n._(t`Webhook URL`)}
+          label={t`Webhook URL`}
           value={`${window.location.origin}${related.webhook_receiver}`}
         />
       )}
-      <Detail label={i18n._(t`Webhook Key`)} value={webhook_key} />
+      <Detail label={t`Webhook Key`} value={webhook_key} />
       {summary_fields?.webhook_credential && (
         <Detail
           fullWidth
-          label={i18n._(t`Webhook Credential`)}
+          label={t`Webhook Credential`}
           value={
             <CredentialChip
               key={summary_fields.webhook_credential?.id}
@@ -177,11 +164,11 @@ function PromptJobTemplateDetail({ i18n, resource }) {
           }
         />
       )}
-      {optionsList && <Detail label={i18n._(t`Options`)} value={optionsList} />}
+      {optionsList && <Detail label={t`Options`} value={optionsList} />}
       {summary_fields?.credentials?.length > 0 && (
         <Detail
           fullWidth
-          label={i18n._(t`Credentials`)}
+          label={t`Credentials`}
           value={
             <ChipGroup
               numChips={5}
@@ -197,7 +184,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
       {summary_fields?.labels?.results?.length > 0 && (
         <Detail
           fullWidth
-          label={i18n._(t`Labels`)}
+          label={t`Labels`}
           value={
             <ChipGroup
               numChips={5}
@@ -215,7 +202,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
       {instance_groups?.length > 0 && (
         <Detail
           fullWidth
-          label={i18n._(t`Instance Groups`)}
+          label={t`Instance Groups`}
           value={
             <ChipGroup numChips={5} totalChips={instance_groups.length}>
               {instance_groups.map(ig => (
@@ -230,7 +217,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
       {job_tags?.length > 0 && (
         <Detail
           fullWidth
-          label={i18n._(t`Job Tags`)}
+          label={t`Job Tags`}
           value={
             <ChipGroup numChips={5} totalChips={job_tags.split(',').length}>
               {job_tags.split(',').map(jobTag => (
@@ -245,7 +232,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
       {skip_tags?.length > 0 && (
         <Detail
           fullWidth
-          label={i18n._(t`Skip Tags`)}
+          label={t`Skip Tags`}
           value={
             <ChipGroup numChips={5} totalChips={skip_tags.split(',').length}>
               {skip_tags.split(',').map(skipTag => (
@@ -258,14 +245,10 @@ function PromptJobTemplateDetail({ i18n, resource }) {
         />
       )}
       {extra_vars && (
-        <VariablesDetail
-          label={i18n._(t`Variables`)}
-          rows={4}
-          value={extra_vars}
-        />
+        <VariablesDetail label={t`Variables`} rows={4} value={extra_vars} />
       )}
     </>
   );
 }
 
-export default withI18n()(PromptJobTemplateDetail);
+export default PromptJobTemplateDetail;
diff --git a/awx/ui_next/src/components/PromptDetail/PromptProjectDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptProjectDetail.jsx
index f47045aee3..dd2fe8b5a9 100644
--- a/awx/ui_next/src/components/PromptDetail/PromptProjectDetail.jsx
+++ b/awx/ui_next/src/components/PromptDetail/PromptProjectDetail.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { List, ListItem } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
@@ -10,7 +10,7 @@ import CredentialChip from '../CredentialChip';
 import { toTitleCase } from '../../util/strings';
 import ExecutionEnvironmentDetail from '../ExecutionEnvironmentDetail';
 
-function PromptProjectDetail({ i18n, resource }) {
+function PromptProjectDetail({ resource }) {
   const {
     allow_override,
     custom_virtualenv,
@@ -37,21 +37,15 @@ function PromptProjectDetail({ i18n, resource }) {
   ) {
     optionsList = (
       <List>
-        {scm_clean && <ListItem>{i18n._(t`Clean`)}</ListItem>}
-        {scm_delete_on_update && (
-          <ListItem>{i18n._(t`Delete on Update`)}</ListItem>
-        )}
+        {scm_clean && <ListItem>{t`Clean`}</ListItem>}
+        {scm_delete_on_update && <ListItem>{t`Delete on Update`}</ListItem>}
         {scm_track_submodules && (
-          <ListItem>
-            {i18n._(t`Track submodules latest commit on branch`)}
-          </ListItem>
+          <ListItem>{t`Track submodules latest commit on branch`}</ListItem>
         )}
         {scm_update_on_launch && (
-          <ListItem>{i18n._(t`Update Revision on Launch`)}</ListItem>
-        )}
-        {allow_override && (
-          <ListItem>{i18n._(t`Allow Branch Override`)}</ListItem>
+          <ListItem>{t`Update Revision on Launch`}</ListItem>
         )}
+        {allow_override && <ListItem>{t`Allow Branch Override`}</ListItem>}
       </List>
     );
   }
@@ -60,7 +54,7 @@ function PromptProjectDetail({ i18n, resource }) {
     <>
       {summary_fields?.organization ? (
         <Detail
-          label={i18n._(t`Organization`)}
+          label={t`Organization`}
           value={
             <Link
               to={`/organizations/${summary_fields.organization.id}/details`}
@@ -70,7 +64,7 @@ function PromptProjectDetail({ i18n, resource }) {
           }
         />
       ) : (
-        <DeletedDetail label={i18n._(t`Organization`)} />
+        <DeletedDetail label={t`Organization`} />
       )}
       <ExecutionEnvironmentDetail
         virtualEnvironment={custom_virtualenv}
@@ -78,15 +72,15 @@ function PromptProjectDetail({ i18n, resource }) {
         isDefaultEnvironment
       />
       <Detail
-        label={i18n._(t`Source Control Type`)}
-        value={scm_type === '' ? i18n._(t`Manual`) : toTitleCase(scm_type)}
+        label={t`Source Control Type`}
+        value={scm_type === '' ? t`Manual` : toTitleCase(scm_type)}
       />
-      <Detail label={i18n._(t`Source Control URL`)} value={scm_url} />
-      <Detail label={i18n._(t`Source Control Branch`)} value={scm_branch} />
-      <Detail label={i18n._(t`Source Control Refspec`)} value={scm_refspec} />
+      <Detail label={t`Source Control URL`} value={scm_url} />
+      <Detail label={t`Source Control Branch`} value={scm_branch} />
+      <Detail label={t`Source Control Refspec`} value={scm_refspec} />
       {summary_fields?.credential?.id && (
         <Detail
-          label={i18n._(t`Source Control Credential`)}
+          label={t`Source Control Credential`}
           value={
             <CredentialChip
               key={resource.summary_fields.credential.id}
@@ -96,22 +90,19 @@ function PromptProjectDetail({ i18n, resource }) {
           }
         />
       )}
-      {optionsList && <Detail label={i18n._(t`Options`)} value={optionsList} />}
+      {optionsList && <Detail label={t`Options`} value={optionsList} />}
       <Detail
-        label={i18n._(t`Cache Timeout`)}
-        value={`${scm_update_cache_timeout} ${i18n._(t`Seconds`)}`}
+        label={t`Cache Timeout`}
+        value={`${scm_update_cache_timeout} ${t`Seconds`}`}
       />
       <Config>
         {({ project_base_dir }) => (
-          <Detail
-            label={i18n._(t`Project Base Path`)}
-            value={project_base_dir}
-          />
+          <Detail label={t`Project Base Path`} value={project_base_dir} />
         )}
       </Config>
-      <Detail label={i18n._(t`Playbook Directory`)} value={local_path} />
+      <Detail label={t`Playbook Directory`} value={local_path} />
     </>
   );
 }
 
-export default withI18n()(PromptProjectDetail);
+export default PromptProjectDetail;
diff --git a/awx/ui_next/src/components/PromptDetail/PromptWFJobTemplateDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptWFJobTemplateDetail.jsx
index 0778bbc649..72e10660b8 100644
--- a/awx/ui_next/src/components/PromptDetail/PromptWFJobTemplateDetail.jsx
+++ b/awx/ui_next/src/components/PromptDetail/PromptWFJobTemplateDetail.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 
@@ -11,7 +11,7 @@ import { VariablesDetail } from '../CodeEditor';
 import Sparkline from '../Sparkline';
 import { toTitleCase } from '../../util/strings';
 
-function PromptWFJobTemplateDetail({ i18n, resource }) {
+function PromptWFJobTemplateDetail({ resource }) {
   const {
     allow_simultaneous,
     extra_vars,
@@ -27,10 +27,8 @@ function PromptWFJobTemplateDetail({ i18n, resource }) {
   if (allow_simultaneous || webhook_service) {
     optionsList = (
       <List>
-        {allow_simultaneous && (
-          <ListItem>{i18n._(t`Enable Concurrent Jobs`)}</ListItem>
-        )}
-        {webhook_service && <ListItem>{i18n._(t`Enable Webhooks`)}</ListItem>}
+        {allow_simultaneous && <ListItem>{t`Enable Concurrent Jobs`}</ListItem>}
+        {webhook_service && <ListItem>{t`Enable Webhooks`}</ListItem>}
       </List>
     );
   }
@@ -48,14 +46,11 @@ function PromptWFJobTemplateDetail({ i18n, resource }) {
   return (
     <>
       {summary_fields?.recent_jobs?.length > 0 && (
-        <Detail
-          value={<Sparkline jobs={recentJobs} />}
-          label={i18n._(t`Activity`)}
-        />
+        <Detail value={<Sparkline jobs={recentJobs} />} label={t`Activity`} />
       )}
       {summary_fields?.organization && (
         <Detail
-          label={i18n._(t`Organization`)}
+          label={t`Organization`}
           value={
             <Link
               to={`/organizations/${summary_fields.organization.id}/details`}
@@ -67,7 +62,7 @@ function PromptWFJobTemplateDetail({ i18n, resource }) {
       )}
       {summary_fields?.inventory && (
         <Detail
-          label={i18n._(t`Inventory`)}
+          label={t`Inventory`}
           value={
             <Link
               to={`/${inventoryKind}/${summary_fields.inventory?.id}/details`}
@@ -77,24 +72,21 @@ function PromptWFJobTemplateDetail({ i18n, resource }) {
           }
         />
       )}
-      <Detail label={i18n._(t`Source Control Branch`)} value={scm_branch} />
-      <Detail label={i18n._(t`Limit`)} value={limit} />
-      <Detail
-        label={i18n._(t`Webhook Service`)}
-        value={toTitleCase(webhook_service)}
-      />
-      <Detail label={i18n._(t`Webhook Key`)} value={webhook_key} />
+      <Detail label={t`Source Control Branch`} value={scm_branch} />
+      <Detail label={t`Limit`} value={limit} />
+      <Detail label={t`Webhook Service`} value={toTitleCase(webhook_service)} />
+      <Detail label={t`Webhook Key`} value={webhook_key} />
       {related?.webhook_receiver && (
         <Detail
-          label={i18n._(t`Webhook URL`)}
+          label={t`Webhook URL`}
           value={`${window.location.origin}${related.webhook_receiver}`}
         />
       )}
-      {optionsList && <Detail label={i18n._(t`Options`)} value={optionsList} />}
+      {optionsList && <Detail label={t`Options`} value={optionsList} />}
       {summary_fields?.webhook_credential && (
         <Detail
           fullWidth
-          label={i18n._(t`Webhook Credential`)}
+          label={t`Webhook Credential`}
           value={
             <CredentialChip
               key={summary_fields.webhook_credential?.id}
@@ -107,7 +99,7 @@ function PromptWFJobTemplateDetail({ i18n, resource }) {
       {summary_fields?.labels?.results?.length > 0 && (
         <Detail
           fullWidth
-          label={i18n._(t`Labels`)}
+          label={t`Labels`}
           value={
             <ChipGroup
               numChips={5}
@@ -123,14 +115,10 @@ function PromptWFJobTemplateDetail({ i18n, resource }) {
         />
       )}
       {extra_vars && (
-        <VariablesDetail
-          label={i18n._(t`Variables`)}
-          rows={4}
-          value={extra_vars}
-        />
+        <VariablesDetail label={t`Variables`} rows={4} value={extra_vars} />
       )}
     </>
   );
 }
 
-export default withI18n()(PromptWFJobTemplateDetail);
+export default PromptWFJobTemplateDetail;
diff --git a/awx/ui_next/src/components/ResourceAccessList/DeleteRoleConfirmationModal.jsx b/awx/ui_next/src/components/ResourceAccessList/DeleteRoleConfirmationModal.jsx
index ef959fb53d..be9e52fda1 100644
--- a/awx/ui_next/src/components/ResourceAccessList/DeleteRoleConfirmationModal.jsx
+++ b/awx/ui_next/src/components/ResourceAccessList/DeleteRoleConfirmationModal.jsx
@@ -1,26 +1,18 @@
 import React, { Fragment } from 'react';
 import { func, string } from 'prop-types';
 import { Button } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import AlertModal from '../AlertModal';
 import { Role } from '../../types';
 
-function DeleteRoleConfirmationModal({
-  role,
-  username,
-  onCancel,
-  onConfirm,
-  i18n,
-}) {
+function DeleteRoleConfirmationModal({ role, username, onCancel, onConfirm }) {
   const isTeamRole = () => {
-    return typeof role.team_id !== 'undefined'
-      ? i18n._(t`Team`)
-      : i18n._(t`User`);
+    return typeof role.team_id !== 'undefined' ? t`Team` : t`User`;
   };
 
-  const title = i18n._(t`Remove ${isTeamRole()} Access`);
+  const title = t`Remove ${isTeamRole()} Access`;
   return (
     <AlertModal
       variant="danger"
@@ -32,10 +24,10 @@ function DeleteRoleConfirmationModal({
           ouiaId="delete-role-modal-delete-button"
           key="delete"
           variant="danger"
-          aria-label={i18n._(t`Confirm delete`)}
+          aria-label={t`Confirm delete`}
           onClick={onConfirm}
         >
-          {i18n._(t`Delete`)}
+          {t`Delete`}
         </Button>,
         <Button
           ouiaId="delete-role-modal-cancel-button"
@@ -43,26 +35,20 @@ function DeleteRoleConfirmationModal({
           variant="link"
           onClick={onCancel}
         >
-          {i18n._(t`Cancel`)}
+          {t`Cancel`}
         </Button>,
       ]}
     >
       {isTeamRole() ? (
         <Fragment>
-          {i18n._(
-            t`Are you sure you want to remove ${role.name} access from ${role.team_name}?  Doing so affects all members of the team.`
-          )}
+          {t`Are you sure you want to remove ${role.name} access from ${role.team_name}?  Doing so affects all members of the team.`}
           <br />
           <br />
-          {i18n._(
-            t`If you only want to remove access for this particular user, please remove them from the team.`
-          )}
+          {t`If you only want to remove access for this particular user, please remove them from the team.`}
         </Fragment>
       ) : (
         <Fragment>
-          {i18n._(
-            t`Are you sure you want to remove ${role.name} access from ${username}?`
-          )}
+          {t`Are you sure you want to remove ${role.name} access from ${username}?`}
         </Fragment>
       )}
     </AlertModal>
@@ -80,4 +66,4 @@ DeleteRoleConfirmationModal.defaultProps = {
   username: '',
 };
 
-export default withI18n()(DeleteRoleConfirmationModal);
+export default DeleteRoleConfirmationModal;
diff --git a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx
index f43a7fa8de..7c304627e2 100644
--- a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx
+++ b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { RolesAPI, TeamsAPI, UsersAPI } from '../../api';
 import AddResourceRole from '../AddRole/AddResourceRole';
@@ -19,7 +19,7 @@ const QS_CONFIG = getQSConfig('access', {
   order_by: 'first_name',
 });
 
-function ResourceAccessList({ i18n, apiModel, resource }) {
+function ResourceAccessList({ apiModel, resource }) {
   const [submitError, setSubmitError] = useState(null);
   const [deletionRecord, setDeletionRecord] = useState(null);
   const [deletionRole, setDeletionRole] = useState(null);
@@ -124,23 +124,23 @@ function ResourceAccessList({ i18n, apiModel, resource }) {
   );
   const toolbarSearchColumns = [
     {
-      name: i18n._(t`Username`),
+      name: t`Username`,
       key: 'username__icontains',
       isDefault: true,
     },
     {
-      name: i18n._(t`First Name`),
+      name: t`First Name`,
       key: 'first_name__icontains',
     },
     {
-      name: i18n._(t`Last Name`),
+      name: t`Last Name`,
       key: 'last_name__icontains',
     },
   ];
 
   if (organizationRoles?.length > 0) {
     toolbarSearchColumns.push({
-      name: i18n._(t`Roles`),
+      name: t`Roles`,
       key: `or__roles__in`,
       options: organizationRoles,
     });
@@ -153,20 +153,20 @@ function ResourceAccessList({ i18n, apiModel, resource }) {
         hasContentLoading={isLoading || isDeleteLoading}
         items={accessRecords}
         itemCount={itemCount}
-        pluralizedItemName={i18n._(t`Roles`)}
+        pluralizedItemName={t`Roles`}
         qsConfig={QS_CONFIG}
         toolbarSearchColumns={toolbarSearchColumns}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Username`),
+            name: t`Username`,
             key: 'username',
           },
           {
-            name: i18n._(t`First Name`),
+            name: t`First Name`,
             key: 'first_name',
           },
           {
-            name: i18n._(t`Last Name`),
+            name: t`Last Name`,
             key: 'last_name',
           },
         ]}
@@ -197,7 +197,6 @@ function ResourceAccessList({ i18n, apiModel, resource }) {
               setDeletionRole(role);
               setShowDeleteModal(true);
             }}
-            i18n={i18n}
           />
         )}
       />
@@ -233,11 +232,11 @@ function ResourceAccessList({ i18n, apiModel, resource }) {
       {submitError && (
         <AlertModal
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           isOpen={submitError}
           onClose={() => setSubmitError(null)}
         >
-          {i18n._(t`Failed to assign roles properly`)}
+          {t`Failed to assign roles properly`}
           <ErrorDetail error={submitError} />
         </AlertModal>
       )}
@@ -245,13 +244,13 @@ function ResourceAccessList({ i18n, apiModel, resource }) {
         <AlertModal
           isOpen={deletionError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={clearDeletionError}
         >
-          {i18n._(t`Failed to delete role`)}
+          {t`Failed to delete role`}
         </AlertModal>
       )}
     </>
   );
 }
-export default withI18n()(ResourceAccessList);
+export default ResourceAccessList;
diff --git a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx
index 669c5223ab..24b9f11fd4 100644
--- a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx
+++ b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React from 'react';
 import { func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Chip,
@@ -24,7 +24,7 @@ const DataListItemCells = styled(PFDataListItemCells)`
   align-items: start;
 `;
 
-function ResourceAccessListItem({ accessRecord, onRoleDelete, i18n }) {
+function ResourceAccessListItem({ accessRecord, onRoleDelete }) {
   ResourceAccessListItem.propTypes = {
     accessRecord: AccessRecord.isRequired,
     onRoleDelete: func.isRequired,
@@ -57,7 +57,7 @@ function ResourceAccessListItem({ accessRecord, onRoleDelete, i18n }) {
         }}
         isReadOnly={!role.user_capabilities.unattach}
         ouiaId={`${role.name}-${role.id}`}
-        closeBtnAriaLabel={i18n._(t`Remove ${role.name} chip`)}
+        closeBtnAriaLabel={t`Remove ${role.name} chip`}
       >
         {role.name}
       </Chip>
@@ -97,7 +97,7 @@ function ResourceAccessListItem({ accessRecord, onRoleDelete, i18n }) {
               {accessRecord.first_name || accessRecord.last_name ? (
                 <DetailList stacked>
                   <Detail
-                    label={i18n._(t`Name`)}
+                    label={t`Name`}
                     value={`${accessRecord.first_name} ${accessRecord.last_name}`}
                   />
                 </DetailList>
@@ -107,7 +107,7 @@ function ResourceAccessListItem({ accessRecord, onRoleDelete, i18n }) {
               <DetailList stacked>
                 {userRoles.length > 0 && (
                   <Detail
-                    label={i18n._(t`User Roles`)}
+                    label={t`User Roles`}
                     value={
                       <ChipGroup numChips={5} totalChips={userRoles.length}>
                         {userRoles.map(renderChip)}
@@ -117,7 +117,7 @@ function ResourceAccessListItem({ accessRecord, onRoleDelete, i18n }) {
                 )}
                 {teamRoles.length > 0 && (
                   <Detail
-                    label={i18n._(t`Team Roles`)}
+                    label={t`Team Roles`}
                     value={
                       <ChipGroup numChips={5} totalChips={teamRoles.length}>
                         {teamRoles.map(renderChip)}
@@ -134,4 +134,4 @@ function ResourceAccessListItem({ accessRecord, onRoleDelete, i18n }) {
   );
 }
 
-export default withI18n()(ResourceAccessListItem);
+export default ResourceAccessListItem;
diff --git a/awx/ui_next/src/components/Schedule/Schedule.jsx b/awx/ui_next/src/components/Schedule/Schedule.jsx
index 93fd657a9b..1ebd4210d2 100644
--- a/awx/ui_next/src/components/Schedule/Schedule.jsx
+++ b/awx/ui_next/src/components/Schedule/Schedule.jsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useCallback } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
 
 import {
   Switch,
@@ -20,7 +19,6 @@ import { SchedulesAPI } from '../../api';
 import useRequest from '../../util/useRequest';
 
 function Schedule({
-  i18n,
   setBreadcrumb,
   resource,
   launchConfig,
@@ -58,14 +56,14 @@ function Schedule({
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Schedules`)}
+          {t`Back to Schedules`}
         </>
       ),
       link: `${pathRoot}schedules`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `${pathRoot}schedules/${schedule && schedule.id}/details`,
       id: 0,
     },
@@ -82,7 +80,7 @@ function Schedule({
     return (
       <ContentError>
         {schedule && (
-          <Link to={`${pathRoot}schedules`}>{i18n._(t`View Schedules`)}</Link>
+          <Link to={`${pathRoot}schedules`}>{t`View Schedules`}</Link>
         )}
       </ContentError>
     );
@@ -132,7 +130,7 @@ function Schedule({
         <Route key="not-found" path="*">
           <ContentError>
             {resource && (
-              <Link to={`${pathRoot}details`}>{i18n._(t`View Details`)}</Link>
+              <Link to={`${pathRoot}details`}>{t`View Details`}</Link>
             )}
           </ContentError>
         </Route>
@@ -142,4 +140,4 @@ function Schedule({
 }
 
 export { Schedule as _Schedule };
-export default withI18n()(Schedule);
+export default Schedule;
diff --git a/awx/ui_next/src/components/Schedule/ScheduleAdd/ScheduleAdd.jsx b/awx/ui_next/src/components/Schedule/ScheduleAdd/ScheduleAdd.jsx
index 9023f1a50f..f935425082 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleAdd/ScheduleAdd.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleAdd/ScheduleAdd.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { func, shape } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { useHistory, useLocation } from 'react-router-dom';
 import { RRule } from 'rrule';
 import { Card } from '@patternfly/react-core';
@@ -16,7 +16,6 @@ import getSurveyValues from '../../../util/prompt/getSurveyValues';
 import { getAddedAndRemoved } from '../../../util/lists';
 
 function ScheduleAdd({
-  i18n,
   resource,
   apiModel,
   launchConfig,
@@ -77,7 +76,7 @@ function ScheduleAdd({
     }
 
     try {
-      const rule = new RRule(buildRuleObj(values, i18n));
+      const rule = new RRule(buildRuleObj(values));
       const requestData = {
         ...submitValues,
         rrule: rule.toString().replace(/\n/g, ' '),
@@ -131,4 +130,4 @@ ScheduleAdd.propTypes = {
 
 ScheduleAdd.defaultProps = {};
 
-export default withI18n()(ScheduleAdd);
+export default ScheduleAdd;
diff --git a/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx b/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx
index 8cf47b14a6..69d2a933f7 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx
@@ -3,7 +3,7 @@ import React, { useCallback, useEffect } from 'react';
 import { Link, useHistory, useLocation } from 'react-router-dom';
 import { RRule, rrulestr } from 'rrule';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Chip, Divider, Title, Button } from '@patternfly/react-core';
 import { Schedule } from '../../../types';
@@ -43,7 +43,7 @@ const PromptDetailList = styled(DetailList)`
   padding: 0px 20px;
 `;
 
-function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
+function ScheduleDetail({ hasDaysToKeepField, schedule, surveyConfig }) {
   const {
     id,
     created,
@@ -72,11 +72,11 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
   const pathRoot = pathname.substr(0, pathname.indexOf('schedules'));
 
   const VERBOSITY = {
-    0: i18n._(t`0 (Normal)`),
-    1: i18n._(t`1 (Verbose)`),
-    2: i18n._(t`2 (More Verbose)`),
-    3: i18n._(t`3 (Debug)`),
-    4: i18n._(t`4 (Connection Debug)`),
+    0: t`0 (Normal)`,
+    1: t`1 (Verbose)`,
+    2: t`2 (More Verbose)`,
+    3: t`3 (Debug)`,
+    4: t`4 (Connection Debug)`,
   };
 
   const {
@@ -144,7 +144,7 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
   const rule = rrulestr(rrule);
   const repeatFrequency =
     rule.options.freq === RRule.MINUTELY && dtstart === dtend
-      ? i18n._(t`None (Run Once)`)
+      ? t`None (Run Once)`
       : rule.toText().replace(/^\w/, c => c.toUpperCase());
 
   const {
@@ -252,47 +252,39 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
         isDisabled={isDisabled}
       />
       <DetailList gutter="sm">
-        <Detail label={i18n._(t`Name`)} value={name} />
-        <Detail label={i18n._(t`Description`)} value={description} />
-        <Detail
-          label={i18n._(t`First Run`)}
-          value={formatDateString(dtstart)}
-        />
-        <Detail
-          label={i18n._(t`Next Run`)}
-          value={formatDateString(next_run)}
-        />
-        <Detail label={i18n._(t`Last Run`)} value={formatDateString(dtend)} />
-        <Detail label={i18n._(t`Local Time Zone`)} value={timezone} />
-        <Detail label={i18n._(t`Repeat Frequency`)} value={repeatFrequency} />
+        <Detail label={t`Name`} value={name} />
+        <Detail label={t`Description`} value={description} />
+        <Detail label={t`First Run`} value={formatDateString(dtstart)} />
+        <Detail label={t`Next Run`} value={formatDateString(next_run)} />
+        <Detail label={t`Last Run`} value={formatDateString(dtend)} />
+        <Detail label={t`Local Time Zone`} value={timezone} />
+        <Detail label={t`Repeat Frequency`} value={repeatFrequency} />
         {hasDaysToKeepField ? (
-          <Detail label={i18n._(t`Days of Data to Keep`)} value={daysToKeep} />
+          <Detail label={t`Days of Data to Keep`} value={daysToKeep} />
         ) : null}
         <ScheduleOccurrences preview={preview} />
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={created}
           user={summary_fields.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={modified}
           user={summary_fields.modified_by}
         />
       </DetailList>
       {showPromptedFields && (
         <>
-          <PromptTitle headingLevel="h2">
-            {i18n._(t`Prompted Values`)}
-          </PromptTitle>
+          <PromptTitle headingLevel="h2">{t`Prompted Values`}</PromptTitle>
           <PromptDivider />
           <PromptDetailList>
             {ask_job_type_on_launch && (
-              <Detail label={i18n._(t`Job Type`)} value={job_type} />
+              <Detail label={t`Job Type`} value={job_type} />
             )}
             {showInventoryDetail && (
               <Detail
-                label={i18n._(t`Inventory`)}
+                label={t`Inventory`}
                 value={
                   summary_fields?.inventory ? (
                     <Link
@@ -311,30 +303,22 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
               />
             )}
             {ask_verbosity_on_launch && (
-              <Detail
-                label={i18n._(t`Verbosity`)}
-                value={VERBOSITY[verbosity]}
-              />
+              <Detail label={t`Verbosity`} value={VERBOSITY[verbosity]} />
             )}
             {ask_scm_branch_on_launch && (
-              <Detail
-                label={i18n._(t`Source Control Branch`)}
-                value={scm_branch}
-              />
-            )}
-            {ask_limit_on_launch && (
-              <Detail label={i18n._(t`Limit`)} value={limit} />
+              <Detail label={t`Source Control Branch`} value={scm_branch} />
             )}
+            {ask_limit_on_launch && <Detail label={t`Limit`} value={limit} />}
             {showDiffModeDetail && (
               <Detail
-                label={i18n._(t`Show Changes`)}
-                value={diff_mode ? i18n._(t`On`) : i18n._(t`Off`)}
+                label={t`Show Changes`}
+                value={diff_mode ? t`On` : t`Off`}
               />
             )}
             {showCredentialsDetail && (
               <Detail
                 fullWidth
-                label={i18n._(t`Credentials`)}
+                label={t`Credentials`}
                 value={
                   <ChipGroup numChips={5} totalChips={credentials.length}>
                     {credentials.map(c => (
@@ -347,7 +331,7 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
             {showTagsDetail && (
               <Detail
                 fullWidth
-                label={i18n._(t`Job Tags`)}
+                label={t`Job Tags`}
                 value={
                   <ChipGroup
                     numChips={5}
@@ -365,7 +349,7 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
             {showSkipTagsDetail && (
               <Detail
                 fullWidth
-                label={i18n._(t`Skip Tags`)}
+                label={t`Skip Tags`}
                 value={
                   <ChipGroup
                     numChips={5}
@@ -384,7 +368,7 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
               <VariablesDetail
                 value={extra_data}
                 rows={4}
-                label={i18n._(t`Variables`)}
+                label={t`Variables`}
               />
             )}
           </PromptDetailList>
@@ -394,21 +378,21 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
         {summary_fields?.user_capabilities?.edit && (
           <Button
             ouiaId="schedule-detail-edit-button"
-            aria-label={i18n._(t`Edit`)}
+            aria-label={t`Edit`}
             component={Link}
             to={pathname.replace('details', 'edit')}
           >
-            {i18n._(t`Edit`)}
+            {t`Edit`}
           </Button>
         )}
         {summary_fields?.user_capabilities?.delete && (
           <DeleteButton
             name={name}
-            modalTitle={i18n._(t`Delete Schedule`)}
+            modalTitle={t`Delete Schedule`}
             onConfirm={deleteSchedule}
             isDisabled={isDeleteLoading}
           >
-            {i18n._(t`Delete`)}
+            {t`Delete`}
           </DeleteButton>
         )}
       </CardActionsRow>
@@ -416,10 +400,10 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, i18n, surveyConfig }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete schedule.`)}
+          {t`Failed to delete schedule.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -431,4 +415,4 @@ ScheduleDetail.propTypes = {
   schedule: Schedule.isRequired,
 };
 
-export default withI18n()(ScheduleDetail);
+export default ScheduleDetail;
diff --git a/awx/ui_next/src/components/Schedule/ScheduleEdit/ScheduleEdit.jsx b/awx/ui_next/src/components/Schedule/ScheduleEdit/ScheduleEdit.jsx
index 3d7276cdea..477af4a483 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleEdit/ScheduleEdit.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleEdit/ScheduleEdit.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { useHistory, useLocation } from 'react-router-dom';
 import { RRule } from 'rrule';
 import { shape } from 'prop-types';
@@ -16,7 +16,6 @@ import mergeExtraVars from '../../../util/prompt/mergeExtraVars';
 import getSurveyValues from '../../../util/prompt/getSurveyValues';
 
 function ScheduleEdit({
-  i18n,
   hasDaysToKeepField,
   schedule,
   resource,
@@ -84,7 +83,7 @@ function ScheduleEdit({
     }
 
     try {
-      const rule = new RRule(buildRuleObj(values, i18n));
+      const rule = new RRule(buildRuleObj(values));
       const requestData = {
         ...submitValues,
         rrule: rule.toString().replace(/\n/g, ' '),
@@ -145,4 +144,4 @@ ScheduleEdit.propTypes = {
 
 ScheduleEdit.defaultProps = {};
 
-export default withI18n()(ScheduleEdit);
+export default ScheduleEdit;
diff --git a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.jsx b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.jsx
index 7e5f7d9805..69805328e6 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.jsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
 import { bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { SchedulesAPI } from '../../../api';
 import AlertModal from '../../AlertModal';
@@ -20,7 +20,6 @@ const QS_CONFIG = getQSConfig('schedule', {
 });
 
 function ScheduleList({
-  i18n,
   loadSchedules,
   loadScheduleOptions,
   hideAddButton,
@@ -128,7 +127,7 @@ function ScheduleList({
     ) {
       return null;
     }
-    return i18n._(t`This schedule is missing an Inventory`);
+    return t`This schedule is missing an Inventory`;
   };
 
   const hasMissingSurveyValue = schedule => {
@@ -153,10 +152,7 @@ function ScheduleList({
         }
       });
     }
-    return (
-      missingValues &&
-      i18n._(t`This schedule is missing required survey values`)
-    );
+    return missingValues && t`This schedule is missing required survey values`;
   };
 
   return (
@@ -170,10 +166,10 @@ function ScheduleList({
         onRowClick={handleSelect}
         headerRow={
           <HeaderRow qsConfig={QS_CONFIG}>
-            <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
-            <HeaderCell>{i18n._(t`Type`)}</HeaderCell>
-            <HeaderCell sortKey="next_run">{i18n._(t`Next Run`)}</HeaderCell>
-            <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
+            <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
+            <HeaderCell>{t`Type`}</HeaderCell>
+            <HeaderCell sortKey="next_run">{t`Next Run`}</HeaderCell>
+            <HeaderCell>{t`Actions`}</HeaderCell>
           </HeaderRow>
         }
         renderRow={(item, index) => (
@@ -189,20 +185,20 @@ function ScheduleList({
         )}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Description`),
+            name: t`Description`,
             key: 'description__icontains',
           },
           {
-            name: i18n._(t`Created By (Username)`),
+            name: t`Created By (Username)`,
             key: 'created_by__username__icontains',
           },
           {
-            name: i18n._(t`Modified By (Username)`),
+            name: t`Modified By (Username)`,
             key: 'modified_by__username__icontains',
           },
         ]}
@@ -228,7 +224,7 @@ function ScheduleList({
                 key="delete"
                 onDelete={handleDelete}
                 itemsToDelete={selected}
-                pluralizedItemName={i18n._(t`Schedules`)}
+                pluralizedItemName={t`Schedules`}
               />,
             ]}
           />
@@ -238,10 +234,10 @@ function ScheduleList({
         <AlertModal
           isOpen={deletionError}
           variant="danger"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={clearDeletionError}
         >
-          {i18n._(t`Failed to delete one or more schedules.`)}
+          {t`Failed to delete one or more schedules.`}
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
@@ -258,4 +254,4 @@ ScheduleList.defaultProps = {
   hideAddButton: false,
 };
 
-export default withI18n()(ScheduleList);
+export default ScheduleList;
diff --git a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleListItem.jsx b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleListItem.jsx
index 1e6bd30f1e..277b8991fe 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleListItem.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleList/ScheduleListItem.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React from 'react';
 import { bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import { Button, Tooltip } from '@patternfly/react-core';
@@ -23,7 +23,6 @@ const ExclamationTriangleIcon = styled(PFExclamationTriangleIcon)`
 `;
 
 function ScheduleListItem({
-  i18n,
   rowIndex,
   isSelected,
   onSelect,
@@ -34,11 +33,11 @@ function ScheduleListItem({
   const labelId = `check-action-${schedule.id}`;
 
   const jobTypeLabels = {
-    inventory_update: i18n._(t`Inventory Sync`),
-    job: i18n._(t`Playbook Run`),
-    project_update: i18n._(t`Source Control Update`),
-    system_job: i18n._(t`Management Job`),
-    workflow_job: i18n._(t`Workflow Job`),
+    inventory_update: t`Inventory Sync`,
+    job: t`Playbook Run`,
+    project_update: t`Source Control Update`,
+    system_job: t`Management Job`,
+    workflow_job: t`Workflow Job`,
   };
 
   let scheduleBaseUrl;
@@ -73,9 +72,9 @@ function ScheduleListItem({
           onSelect,
           disable: false,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         <Link to={`${scheduleBaseUrl}/details`}>
           <b>{schedule.name}</b>
         </Link>
@@ -92,32 +91,32 @@ function ScheduleListItem({
           </span>
         )}
       </Td>
-      <Td dataLabel={i18n._(t`Type`)}>
+      <Td dataLabel={t`Type`}>
         {
           jobTypeLabels[
             schedule.summary_fields.unified_job_template.unified_job_type
           ]
         }
       </Td>
-      <Td dataLabel={i18n._(t`Next Run`)}>
+      <Td dataLabel={t`Next Run`}>
         {schedule.next_run && (
           <DetailList stacked>
             <Detail
-              label={i18n._(t`Next Run`)}
+              label={t`Next Run`}
               value={formatDateString(schedule.next_run)}
             />
           </DetailList>
         )}
       </Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)} gridColumns="auto 40px">
+      <ActionsTd dataLabel={t`Actions`} gridColumns="auto 40px">
         <ScheduleToggle schedule={schedule} isDisabled={isDisabled} />
         <ActionItem
           visible={schedule.summary_fields.user_capabilities.edit}
-          tooltip={i18n._(t`Edit Schedule`)}
+          tooltip={t`Edit Schedule`}
         >
           <Button
             ouiaId={`${schedule.id}-edit-button`}
-            aria-label={i18n._(t`Edit Schedule`)}
+            aria-label={t`Edit Schedule`}
             css="grid-column: 2"
             variant="plain"
             component={Link}
@@ -137,4 +136,4 @@ ScheduleListItem.propTypes = {
   schedule: Schedule.isRequired,
 };
 
-export default withI18n()(ScheduleListItem);
+export default ScheduleListItem;
diff --git a/awx/ui_next/src/components/Schedule/ScheduleOccurrences/ScheduleOccurrences.jsx b/awx/ui_next/src/components/Schedule/ScheduleOccurrences/ScheduleOccurrences.jsx
index 5203c149c7..d0e20d8604 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleOccurrences/ScheduleOccurrences.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleOccurrences/ScheduleOccurrences.jsx
@@ -2,7 +2,7 @@ import 'styled-components/macro';
 import React, { useState } from 'react';
 import { shape } from 'prop-types';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Split, SplitItem, TextListItemVariants } from '@patternfly/react-core';
 import { formatDateString, formatDateStringUTC } from '../../../util/dates';
@@ -22,7 +22,7 @@ const OccurrencesLabel = styled.div`
   }
 `;
 
-function ScheduleOccurrences({ preview = { local: [], utc: [] }, i18n }) {
+function ScheduleOccurrences({ preview = { local: [], utc: [] } }) {
   const [mode, setMode] = useState('local');
 
   if (preview.local.length < 2) {
@@ -39,8 +39,8 @@ function ScheduleOccurrences({ preview = { local: [], utc: [] }, i18n }) {
         <Split hasGutter>
           <SplitItem>
             <OccurrencesLabel>
-              <span>{i18n._(t`Occurrences`)}</span>
-              <span>{i18n._(t`(Limited to first 10)`)}</span>
+              <span>{t`Occurrences`}</span>
+              <span>{t`(Limited to first 10)`}</span>
             </OccurrencesLabel>
           </SplitItem>
           <SplitItem>
@@ -80,4 +80,4 @@ ScheduleOccurrences.defaultProps = {
   preview: { local: [], utc: [] },
 };
 
-export default withI18n()(ScheduleOccurrences);
+export default ScheduleOccurrences;
diff --git a/awx/ui_next/src/components/Schedule/ScheduleToggle/ScheduleToggle.jsx b/awx/ui_next/src/components/Schedule/ScheduleToggle/ScheduleToggle.jsx
index cc9d333fa3..8dc007bc9e 100644
--- a/awx/ui_next/src/components/Schedule/ScheduleToggle/ScheduleToggle.jsx
+++ b/awx/ui_next/src/components/Schedule/ScheduleToggle/ScheduleToggle.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React, { Fragment, useState, useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Switch, Tooltip } from '@patternfly/react-core';
 import AlertModal from '../../AlertModal';
@@ -8,7 +8,7 @@ import ErrorDetail from '../../ErrorDetail';
 import useRequest from '../../../util/useRequest';
 import { SchedulesAPI } from '../../../api';
 
-function ScheduleToggle({ schedule, onToggle, className, i18n, isDisabled }) {
+function ScheduleToggle({ schedule, onToggle, className, isDisabled }) {
   const [isEnabled, setIsEnabled] = useState(schedule.enabled);
   const [showError, setShowError] = useState(false);
 
@@ -41,9 +41,7 @@ function ScheduleToggle({ schedule, onToggle, className, i18n, isDisabled }) {
     <Fragment>
       <Tooltip
         content={
-          schedule.enabled
-            ? i18n._(t`Schedule is active`)
-            : i18n._(t`Schedule is inactive`)
+          schedule.enabled ? t`Schedule is active` : t`Schedule is inactive`
         }
         position="top"
       >
@@ -51,8 +49,8 @@ function ScheduleToggle({ schedule, onToggle, className, i18n, isDisabled }) {
           className={className}
           css="display: inline-flex;"
           id={`schedule-${schedule.id}-toggle`}
-          label={i18n._(t`On`)}
-          labelOff={i18n._(t`Off`)}
+          label={t`On`}
+          labelOff={t`Off`}
           isChecked={isEnabled}
           isDisabled={
             isLoading ||
@@ -60,17 +58,17 @@ function ScheduleToggle({ schedule, onToggle, className, i18n, isDisabled }) {
             isDisabled
           }
           onChange={toggleSchedule}
-          aria-label={i18n._(t`Toggle schedule`)}
+          aria-label={t`Toggle schedule`}
         />
       </Tooltip>
       {showError && error && !isLoading && (
         <AlertModal
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           isOpen={error && !isLoading}
           onClose={() => setShowError(false)}
         >
-          {i18n._(t`Failed to toggle schedule.`)}
+          {t`Failed to toggle schedule.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -78,4 +76,4 @@ function ScheduleToggle({ schedule, onToggle, className, i18n, isDisabled }) {
   );
 }
 
-export default withI18n()(ScheduleToggle);
+export default ScheduleToggle;
diff --git a/awx/ui_next/src/components/Schedule/Schedules.jsx b/awx/ui_next/src/components/Schedule/Schedules.jsx
index 43e2fd7753..1928bf3a7b 100644
--- a/awx/ui_next/src/components/Schedule/Schedules.jsx
+++ b/awx/ui_next/src/components/Schedule/Schedules.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { Switch, Route, useRouteMatch } from 'react-router-dom';
 import Schedule from './Schedule';
 import ScheduleAdd from './ScheduleAdd';
@@ -60,4 +60,4 @@ function Schedules({
 }
 
 export { Schedules as _Schedules };
-export default withI18n()(Schedules);
+export default Schedules;
diff --git a/awx/ui_next/src/components/Schedule/shared/FrequencyDetailSubform.jsx b/awx/ui_next/src/components/Schedule/shared/FrequencyDetailSubform.jsx
index 2820525ae9..0cde64b22f 100644
--- a/awx/ui_next/src/components/Schedule/shared/FrequencyDetailSubform.jsx
+++ b/awx/ui_next/src/components/Schedule/shared/FrequencyDetailSubform.jsx
@@ -2,7 +2,7 @@ import 'styled-components/macro';
 import React from 'react';
 import styled from 'styled-components';
 import { useField } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans, Plural } from '@lingui/macro';
 import { RRule } from 'rrule';
 import {
@@ -41,24 +41,24 @@ const Checkbox = styled(_Checkbox)`
   }
 `;
 
-export function requiredPositiveInteger(i18n) {
+export function requiredPositiveInteger() {
   return value => {
     if (typeof value === 'number') {
       if (!Number.isInteger(value)) {
-        return i18n._(t`This field must be an integer`);
+        return t`This field must be an integer`;
       }
       if (value < 1) {
-        return i18n._(t`This field must be greater than 0`);
+        return t`This field must be greater than 0`;
       }
     }
     if (!value) {
-      return i18n._(t`Select a value for this field`);
+      return t`Select a value for this field`;
     }
     return undefined;
   };
 }
 
-const FrequencyDetailSubform = ({ i18n }) => {
+const FrequencyDetailSubform = () => {
   const [runOnDayMonth] = useField({
     name: 'runOnDayMonth',
   });
@@ -79,92 +79,92 @@ const FrequencyDetailSubform = ({ i18n }) => {
   });
   const [daysOfWeek, daysOfWeekMeta, daysOfWeekHelpers] = useField({
     name: 'daysOfWeek',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const [end, endMeta] = useField({
     name: 'end',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const [interval, intervalMeta] = useField({
     name: 'interval',
-    validate: requiredPositiveInteger(i18n),
+    validate: requiredPositiveInteger(),
   });
   const [runOn, runOnMeta] = useField({
     name: 'runOn',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const [endDateTime, endDateTimeMeta] = useField({
     name: 'endDateTime',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const [frequency] = useField({
     name: 'frequency',
   });
   useField({
     name: 'occurrences',
-    validate: requiredPositiveInteger(i18n),
+    validate: requiredPositiveInteger(),
   });
 
   const monthOptions = [
     {
       key: 'january',
       value: 1,
-      label: i18n._(t`January`),
+      label: t`January`,
     },
     {
       key: 'february',
       value: 2,
-      label: i18n._(t`February`),
+      label: t`February`,
     },
     {
       key: 'march',
       value: 3,
-      label: i18n._(t`March`),
+      label: t`March`,
     },
     {
       key: 'april',
       value: 4,
-      label: i18n._(t`April`),
+      label: t`April`,
     },
     {
       key: 'may',
       value: 5,
-      label: i18n._(t`May`),
+      label: t`May`,
     },
     {
       key: 'june',
       value: 6,
-      label: i18n._(t`June`),
+      label: t`June`,
     },
     {
       key: 'july',
       value: 7,
-      label: i18n._(t`July`),
+      label: t`July`,
     },
     {
       key: 'august',
       value: 8,
-      label: i18n._(t`August`),
+      label: t`August`,
     },
     {
       key: 'september',
       value: 9,
-      label: i18n._(t`September`),
+      label: t`September`,
     },
     {
       key: 'october',
       value: 10,
-      label: i18n._(t`October`),
+      label: t`October`,
     },
     {
       key: 'november',
       value: 11,
-      label: i18n._(t`November`),
+      label: t`November`,
     },
     {
       key: 'december',
       value: 12,
-      label: i18n._(t`December`),
+      label: t`December`,
     },
   ];
 
@@ -197,7 +197,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
       case 'year':
         return <Plural value={intervalValue} one="year" other="years" />;
       default:
-        throw new Error(i18n._(t`Frequency did not match an expected value`));
+        throw new Error(t`Frequency did not match an expected value`);
     }
   };
 
@@ -212,7 +212,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
         validated={
           !intervalMeta.touched || !intervalMeta.error ? 'default' : 'error'
         }
-        label={i18n._(t`Run every`)}
+        label={t`Run every`}
       >
         <div css="display: flex">
           <TextInput
@@ -240,76 +240,76 @@ const FrequencyDetailSubform = ({ i18n }) => {
               ? 'default'
               : 'error'
           }
-          label={i18n._(t`On days`)}
+          label={t`On days`}
         >
           <div css="display: flex">
             <Checkbox
-              label={i18n._(t`Sun`)}
+              label={t`Sun`}
               isChecked={daysOfWeek.value.includes(RRule.SU)}
               onChange={checked => {
                 updateDaysOfWeek(RRule.SU, checked);
               }}
-              aria-label={i18n._(t`Sunday`)}
+              aria-label={t`Sunday`}
               id="schedule-days-of-week-sun"
               name="daysOfWeek"
             />
             <Checkbox
-              label={i18n._(t`Mon`)}
+              label={t`Mon`}
               isChecked={daysOfWeek.value.includes(RRule.MO)}
               onChange={checked => {
                 updateDaysOfWeek(RRule.MO, checked);
               }}
-              aria-label={i18n._(t`Monday`)}
+              aria-label={t`Monday`}
               id="schedule-days-of-week-mon"
               name="daysOfWeek"
             />
             <Checkbox
-              label={i18n._(t`Tue`)}
+              label={t`Tue`}
               isChecked={daysOfWeek.value.includes(RRule.TU)}
               onChange={checked => {
                 updateDaysOfWeek(RRule.TU, checked);
               }}
-              aria-label={i18n._(t`Tuesday`)}
+              aria-label={t`Tuesday`}
               id="schedule-days-of-week-tue"
               name="daysOfWeek"
             />
             <Checkbox
-              label={i18n._(t`Wed`)}
+              label={t`Wed`}
               isChecked={daysOfWeek.value.includes(RRule.WE)}
               onChange={checked => {
                 updateDaysOfWeek(RRule.WE, checked);
               }}
-              aria-label={i18n._(t`Wednesday`)}
+              aria-label={t`Wednesday`}
               id="schedule-days-of-week-wed"
               name="daysOfWeek"
             />
             <Checkbox
-              label={i18n._(t`Thu`)}
+              label={t`Thu`}
               isChecked={daysOfWeek.value.includes(RRule.TH)}
               onChange={checked => {
                 updateDaysOfWeek(RRule.TH, checked);
               }}
-              aria-label={i18n._(t`Thursday`)}
+              aria-label={t`Thursday`}
               id="schedule-days-of-week-thu"
               name="daysOfWeek"
             />
             <Checkbox
-              label={i18n._(t`Fri`)}
+              label={t`Fri`}
               isChecked={daysOfWeek.value.includes(RRule.FR)}
               onChange={checked => {
                 updateDaysOfWeek(RRule.FR, checked);
               }}
-              aria-label={i18n._(t`Friday`)}
+              aria-label={t`Friday`}
               id="schedule-days-of-week-fri"
               name="daysOfWeek"
             />
             <Checkbox
-              label={i18n._(t`Sat`)}
+              label={t`Sat`}
               isChecked={daysOfWeek.value.includes(RRule.SA)}
               onChange={checked => {
                 updateDaysOfWeek(RRule.SA, checked);
               }}
-              aria-label={i18n._(t`Saturday`)}
+              aria-label={t`Saturday`}
               id="schedule-days-of-week-sat"
               name="daysOfWeek"
             />
@@ -326,7 +326,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
             validated={
               !runOnMeta.touched || !runOnMeta.error ? 'default' : 'error'
             }
-            label={i18n._(t`Run on`)}
+            label={t`Run on`}
           >
             <RunOnRadio
               id="schedule-run-on-day"
@@ -386,20 +386,20 @@ const FrequencyDetailSubform = ({ i18n }) => {
                     id="schedule-run-on-the-occurrence"
                     isDisabled={runOn.value !== 'the'}
                     data={[
-                      { value: 1, key: 'first', label: i18n._(t`First`) },
+                      { value: 1, key: 'first', label: t`First` },
                       {
                         value: 2,
                         key: 'second',
-                        label: i18n._(t`Second`),
+                        label: t`Second`,
                       },
-                      { value: 3, key: 'third', label: i18n._(t`Third`) },
+                      { value: 3, key: 'third', label: t`Third` },
                       {
                         value: 4,
                         key: 'fourth',
-                        label: i18n._(t`Fourth`),
+                        label: t`Fourth`,
                       },
-                      { value: 5, key: 'fifth', label: i18n._(t`Fifth`) },
-                      { value: -1, key: 'last', label: i18n._(t`Last`) },
+                      { value: 5, key: 'fifth', label: t`Fifth` },
+                      { value: -1, key: 'last', label: t`Last` },
                     ]}
                     {...runOnTheOccurrence}
                   />
@@ -410,48 +410,48 @@ const FrequencyDetailSubform = ({ i18n }) => {
                       {
                         value: 'sunday',
                         key: 'sunday',
-                        label: i18n._(t`Sunday`),
+                        label: t`Sunday`,
                       },
                       {
                         value: 'monday',
                         key: 'monday',
-                        label: i18n._(t`Monday`),
+                        label: t`Monday`,
                       },
                       {
                         value: 'tuesday',
                         key: 'tuesday',
-                        label: i18n._(t`Tuesday`),
+                        label: t`Tuesday`,
                       },
                       {
                         value: 'wednesday',
                         key: 'wednesday',
-                        label: i18n._(t`Wednesday`),
+                        label: t`Wednesday`,
                       },
                       {
                         value: 'thursday',
                         key: 'thursday',
-                        label: i18n._(t`Thursday`),
+                        label: t`Thursday`,
                       },
                       {
                         value: 'friday',
                         key: 'friday',
-                        label: i18n._(t`Friday`),
+                        label: t`Friday`,
                       },
                       {
                         value: 'saturday',
                         key: 'saturday',
-                        label: i18n._(t`Saturday`),
+                        label: t`Saturday`,
                       },
-                      { value: 'day', key: 'day', label: i18n._(t`Day`) },
+                      { value: 'day', key: 'day', label: t`Day` },
                       {
                         value: 'weekday',
                         key: 'weekday',
-                        label: i18n._(t`Weekday`),
+                        label: t`Weekday`,
                       },
                       {
                         value: 'weekendDay',
                         key: 'weekendDay',
-                        label: i18n._(t`Weekend day`),
+                        label: t`Weekend day`,
                       },
                     ]}
                     {...runOnTheDay}
@@ -489,12 +489,12 @@ const FrequencyDetailSubform = ({ i18n }) => {
         helperTextInvalid={endMeta.error}
         isRequired
         validated={!endMeta.touched || !endMeta.error ? 'default' : 'error'}
-        label={i18n._(t`End`)}
+        label={t`End`}
       >
         <Radio
           id="end-never"
           name="end"
-          label={i18n._(t`Never`)}
+          label={t`Never`}
           value="never"
           isChecked={end.value === 'never'}
           onChange={(value, event) => {
@@ -505,7 +505,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
         <Radio
           id="end-after"
           name="end"
-          label={i18n._(t`After number of occurrences`)}
+          label={t`After number of occurrences`}
           value="after"
           isChecked={end.value === 'after'}
           onChange={(value, event) => {
@@ -516,7 +516,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
         <Radio
           id="end-on-date"
           name="end"
-          label={i18n._(t`On date`)}
+          label={t`On date`}
           value="onDate"
           isChecked={end.value === 'onDate'}
           onChange={(value, event) => {
@@ -528,12 +528,12 @@ const FrequencyDetailSubform = ({ i18n }) => {
       {end?.value === 'after' && (
         <FormField
           id="schedule-occurrences"
-          label={i18n._(t`Occurrences`)}
+          label={t`Occurrences`}
           name="occurrences"
           type="number"
           min="1"
           step="1"
-          validate={required(null, i18n)}
+          validate={required(null)}
           isRequired
         />
       )}
@@ -547,7 +547,7 @@ const FrequencyDetailSubform = ({ i18n }) => {
               ? 'default'
               : 'error'
           }
-          label={i18n._(t`End date/time`)}
+          label={t`End date/time`}
         >
           <input
             className="pf-c-form-control"
@@ -563,4 +563,4 @@ const FrequencyDetailSubform = ({ i18n }) => {
   /* eslint-enable no-restricted-globals */
 };
 
-export default withI18n()(FrequencyDetailSubform);
+export default FrequencyDetailSubform;
diff --git a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx
index 8027d7e5a6..d986190cd6 100644
--- a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx
+++ b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback, useState } from 'react';
 import { shape, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik, useField } from 'formik';
 import { RRule } from 'rrule';
@@ -78,36 +78,33 @@ const generateRunOnTheDay = (days = []) => {
   return null;
 };
 
-function ScheduleFormFields({ i18n, hasDaysToKeepField, zoneOptions }) {
+function ScheduleFormFields({ hasDaysToKeepField, zoneOptions }) {
   const [startDateTime, startDateTimeMeta] = useField({
     name: 'startDateTime',
-    validate: required(
-      i18n._(t`Select a valid date and time for this field`),
-      i18n
-    ),
+    validate: required(t`Select a valid date and time for this field`),
   });
   const [timezone, timezoneMeta] = useField({
     name: 'timezone',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const [frequency, frequencyMeta] = useField({
     name: 'frequency',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   return (
     <>
       <FormField
         id="schedule-name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="schedule-description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
@@ -120,7 +117,7 @@ function ScheduleFormFields({ i18n, hasDaysToKeepField, zoneOptions }) {
             ? 'default'
             : 'error'
         }
-        label={i18n._(t`Start date/time`)}
+        label={t`Start date/time`}
       >
         <input
           className="pf-c-form-control"
@@ -138,7 +135,7 @@ function ScheduleFormFields({ i18n, hasDaysToKeepField, zoneOptions }) {
         validated={
           !timezoneMeta.touched || !timezoneMeta.error ? 'default' : 'error'
         }
-        label={i18n._(t`Local time zone`)}
+        label={t`Local time zone`}
       >
         <AnsibleSelect
           id="schedule-timezone"
@@ -154,18 +151,18 @@ function ScheduleFormFields({ i18n, hasDaysToKeepField, zoneOptions }) {
         validated={
           !frequencyMeta.touched || !frequencyMeta.error ? 'default' : 'error'
         }
-        label={i18n._(t`Run frequency`)}
+        label={t`Run frequency`}
       >
         <AnsibleSelect
           id="schedule-frequency"
           data={[
-            { value: 'none', key: 'none', label: i18n._(t`None (run once)`) },
-            { value: 'minute', key: 'minute', label: i18n._(t`Minute`) },
-            { value: 'hour', key: 'hour', label: i18n._(t`Hour`) },
-            { value: 'day', key: 'day', label: i18n._(t`Day`) },
-            { value: 'week', key: 'week', label: i18n._(t`Week`) },
-            { value: 'month', key: 'month', label: i18n._(t`Month`) },
-            { value: 'year', key: 'year', label: i18n._(t`Year`) },
+            { value: 'none', key: 'none', label: t`None (run once)` },
+            { value: 'minute', key: 'minute', label: t`Minute` },
+            { value: 'hour', key: 'hour', label: t`Hour` },
+            { value: 'day', key: 'day', label: t`Day` },
+            { value: 'week', key: 'week', label: t`Week` },
+            { value: 'month', key: 'month', label: t`Month` },
+            { value: 'year', key: 'year', label: t`Year` },
           ]}
           {...frequency}
         />
@@ -173,17 +170,17 @@ function ScheduleFormFields({ i18n, hasDaysToKeepField, zoneOptions }) {
       {hasDaysToKeepField ? (
         <FormField
           id="schedule-days-to-keep"
-          label={i18n._(t`Days of Data to Keep`)}
+          label={t`Days of Data to Keep`}
           name="daysToKeep"
           type="number"
-          validate={required(null, i18n)}
+          validate={required(null)}
           isRequired
         />
       ) : null}
       {frequency.value !== 'none' && (
         <SubFormLayout>
           <Title size="md" headingLevel="h4">
-            {i18n._(t`Frequency Details`)}
+            {t`Frequency Details`}
           </Title>
           <FormColumnLayout>
             <FrequencyDetailSubform />
@@ -198,7 +195,7 @@ function ScheduleForm({
   hasDaysToKeepField,
   handleCancel,
   handleSubmit,
-  i18n,
+
   schedule,
   submitError,
   resource,
@@ -531,7 +528,7 @@ function ScheduleForm({
         rruleError = error;
       }
     } else {
-      rruleError = new Error(i18n._(t`Schedule is missing rrule`));
+      rruleError = new Error(t`Schedule is missing rrule`);
     }
   }
 
@@ -567,9 +564,7 @@ function ScheduleForm({
                 end === 'onDate' &&
                 new Date(startDateTime) > new Date(endDateTime)
               ) {
-                errors.endDateTime = i18n._(
-                  t`Please select an end date/time that comes after the start date/time.`
-                );
+                errors.endDateTime = t`Please select an end date/time that comes after the start date/time.`;
               }
 
               if (
@@ -577,9 +572,7 @@ function ScheduleForm({
                 runOn === 'day' &&
                 (runOnDayNumber < 1 || runOnDayNumber > 31)
               ) {
-                errors.runOn = i18n._(
-                  t`Please select a day number between 1 and 31.`
-                );
+                errors.runOn = t`Please select a day number between 1 and 31.`;
               }
 
               return errors;
@@ -590,7 +583,6 @@ function ScheduleForm({
                 <FormColumnLayout>
                   <ScheduleFormFields
                     hasDaysToKeepField={hasDaysToKeepField}
-                    i18n={i18n}
                     zoneOptions={zoneOptions}
                     {...rest}
                   />
@@ -616,13 +608,13 @@ function ScheduleForm({
                     <ActionGroup>
                       <Button
                         ouiaId="schedule-form-save-button"
-                        aria-label={i18n._(t`Save`)}
+                        aria-label={t`Save`}
                         variant="primary"
                         type="button"
                         onClick={formik.handleSubmit}
                         isDisabled={isSaveDisabled}
                       >
-                        {i18n._(t`Save`)}
+                        {t`Save`}
                       </Button>
 
                       {isTemplate && showPromptButton && (
@@ -630,20 +622,20 @@ function ScheduleForm({
                           ouiaId="schedule-form-prompt-button"
                           variant="secondary"
                           type="button"
-                          aria-label={i18n._(t`Prompt`)}
+                          aria-label={t`Prompt`}
                           onClick={() => setIsWizardOpen(true)}
                         >
-                          {i18n._(t`Prompt`)}
+                          {t`Prompt`}
                         </Button>
                       )}
                       <Button
                         ouiaId="schedule-form-cancel-button"
-                        aria-label={i18n._(t`Cancel`)}
+                        aria-label={t`Cancel`}
                         variant="secondary"
                         type="button"
                         onClick={handleCancel}
                       >
-                        {i18n._(t`Cancel`)}
+                        {t`Cancel`}
                       </Button>
                     </ActionGroup>
                   </FormFullWidthLayout>
@@ -669,4 +661,4 @@ ScheduleForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(ScheduleForm);
+export default ScheduleForm;
diff --git a/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.jsx b/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.jsx
index e86485d6b3..72cac061e8 100644
--- a/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.jsx
+++ b/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Wizard } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useFormikContext } from 'formik';
 import AlertModal from '../../AlertModal';
@@ -18,7 +18,6 @@ function SchedulePromptableFields({
   credentials,
   resource,
   resourceDefaultCredentials,
-  i18n,
 }) {
   const {
     setFieldTouched,
@@ -38,7 +37,7 @@ function SchedulePromptableFields({
     launchConfig,
     schedule,
     resource,
-    i18n,
+
     credentials,
     resourceDefaultCredentials
   );
@@ -74,7 +73,7 @@ function SchedulePromptableFields({
       <AlertModal
         isOpen={error}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => {
           dismissError();
           onCloseWizard();
@@ -108,22 +107,22 @@ function SchedulePromptableFields({
           validateStep(nextStep.id);
         }
       }}
-      title={i18n._(t`Prompts`)}
+      title={t`Prompts`}
       steps={
         isReady
           ? steps
           : [
               {
-                name: i18n._(t`Content Loading`),
+                name: t`Content Loading`,
                 component: <ContentLoading />,
               },
             ]
       }
-      backButtonText={i18n._(t`Back`)}
-      cancelButtonText={i18n._(t`Cancel`)}
-      nextButtonText={i18n._(t`Next`)}
+      backButtonText={t`Back`}
+      cancelButtonText={t`Cancel`}
+      nextButtonText={t`Next`}
     />
   );
 }
 
-export default withI18n()(SchedulePromptableFields);
+export default SchedulePromptableFields;
diff --git a/awx/ui_next/src/components/Schedule/shared/buildRuleObj.js b/awx/ui_next/src/components/Schedule/shared/buildRuleObj.js
index 701fc65080..b2c145a868 100644
--- a/awx/ui_next/src/components/Schedule/shared/buildRuleObj.js
+++ b/awx/ui_next/src/components/Schedule/shared/buildRuleObj.js
@@ -2,7 +2,7 @@ import { t } from '@lingui/macro';
 import { RRule } from 'rrule';
 import { getRRuleDayConstants } from '../../../util/dates';
 
-export default function buildRuleObj(values, i18n) {
+export default function buildRuleObj(values) {
   const [startDate, startTime] = values.startDateTime.split('T');
   // Dates are formatted like "YYYY-MM-DD"
   const [startYear, startMonth, startDay] = startDate.split('-');
@@ -51,7 +51,7 @@ export default function buildRuleObj(values, i18n) {
         ruleObj.bymonthday = values.runOnDayNumber;
       } else if (values.runOn === 'the') {
         ruleObj.bysetpos = parseInt(values.runOnTheOccurrence, 10);
-        ruleObj.byweekday = getRRuleDayConstants(values.runOnTheDay, i18n);
+        ruleObj.byweekday = getRRuleDayConstants(values.runOnTheDay);
       }
       break;
     case 'year':
@@ -61,12 +61,12 @@ export default function buildRuleObj(values, i18n) {
         ruleObj.bymonthday = values.runOnDayNumber;
       } else if (values.runOn === 'the') {
         ruleObj.bysetpos = parseInt(values.runOnTheOccurrence, 10);
-        ruleObj.byweekday = getRRuleDayConstants(values.runOnTheDay, i18n);
+        ruleObj.byweekday = getRRuleDayConstants(values.runOnTheDay);
         ruleObj.bymonth = parseInt(values.runOnTheMonth, 10);
       }
       break;
     default:
-      throw new Error(i18n._(t`Frequency did not match an expected value`));
+      throw new Error(t`Frequency did not match an expected value`);
   }
 
   if (values.frequency !== 'none') {
@@ -93,7 +93,7 @@ export default function buildRuleObj(values, i18n) {
         break;
       }
       default:
-        throw new Error(i18n._(t`End did not match an expected value`));
+        throw new Error(t`End did not match an expected value`);
     }
   }
 
diff --git a/awx/ui_next/src/components/Schedule/shared/useSchedulePromptSteps.js b/awx/ui_next/src/components/Schedule/shared/useSchedulePromptSteps.js
index 6bc0c35291..5c28f35ed5 100644
--- a/awx/ui_next/src/components/Schedule/shared/useSchedulePromptSteps.js
+++ b/awx/ui_next/src/components/Schedule/shared/useSchedulePromptSteps.js
@@ -12,7 +12,7 @@ export default function useSchedulePromptSteps(
   launchConfig,
   schedule,
   resource,
-  i18n,
+
   scheduleCredentials,
   resourceDefaultCredentials
 ) {
@@ -22,15 +22,14 @@ export default function useSchedulePromptSteps(
   const [visited, setVisited] = useState({});
 
   const steps = [
-    useInventoryStep(launchConfig, sourceOfValues, i18n, visited),
+    useInventoryStep(launchConfig, sourceOfValues, visited),
     useCredentialsStep(
       launchConfig,
       sourceOfValues,
-      resourceDefaultCredentials,
-      i18n
+      resourceDefaultCredentials
     ),
-    useOtherPromptsStep(launchConfig, sourceOfValues, i18n),
-    useSurveyStep(launchConfig, surveyConfig, sourceOfValues, i18n, visited),
+    useOtherPromptsStep(launchConfig, sourceOfValues),
+    useSurveyStep(launchConfig, surveyConfig, sourceOfValues, visited),
   ];
 
   const hasErrors = steps.some(step => step.hasError);
@@ -38,12 +37,12 @@ export default function useSchedulePromptSteps(
   steps.push(
     usePreviewStep(
       launchConfig,
-      i18n,
+
       resource,
       surveyConfig,
       hasErrors,
       true,
-      i18n._(t`Save`)
+      t`Save`
     )
   );
 
diff --git a/awx/ui_next/src/components/ScreenHeader/ScreenHeader.jsx b/awx/ui_next/src/components/ScreenHeader/ScreenHeader.jsx
index 8446540392..f12a3cdd09 100644
--- a/awx/ui_next/src/components/ScreenHeader/ScreenHeader.jsx
+++ b/awx/ui_next/src/components/ScreenHeader/ScreenHeader.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Button,
@@ -14,7 +14,7 @@ import {
 import { HistoryIcon } from '@patternfly/react-icons';
 import { Link, Route, useRouteMatch } from 'react-router-dom';
 
-const ScreenHeader = ({ breadcrumbConfig, i18n, streamType }) => {
+const ScreenHeader = ({ breadcrumbConfig, streamType }) => {
   const { light } = PageSectionVariants;
   const oneCrumbMatch = useRouteMatch({
     path: Object.keys(breadcrumbConfig)[0],
@@ -51,10 +51,10 @@ const ScreenHeader = ({ breadcrumbConfig, i18n, streamType }) => {
         </div>
         {streamType !== 'none' && (
           <div>
-            <Tooltip content={i18n._(t`View activity stream`)} position="top">
+            <Tooltip content={t`View activity stream`} position="top">
               <Button
                 ouiaId="activity-stream-button"
-                aria-label={i18n._(t`View activity stream`)}
+                aria-label={t`View activity stream`}
                 variant="plain"
                 component={Link}
                 to={`/activity_stream${
@@ -133,4 +133,4 @@ Crumb.propTypes = {
   breadcrumbConfig: PropTypes.objectOf(PropTypes.string).isRequired,
 };
 
-export default withI18n()(ScreenHeader);
+export default ScreenHeader;
diff --git a/awx/ui_next/src/components/Search/AdvancedSearch.jsx b/awx/ui_next/src/components/Search/AdvancedSearch.jsx
index d98f0bbea5..e6a9d58ea1 100644
--- a/awx/ui_next/src/components/Search/AdvancedSearch.jsx
+++ b/awx/ui_next/src/components/Search/AdvancedSearch.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Button,
@@ -28,7 +28,6 @@ const AdvancedGroup = styled.div`
 `;
 
 function AdvancedSearch({
-  i18n,
   onSearch,
   searchableKeys,
   relatedSearchableKeys,
@@ -86,56 +85,50 @@ function AdvancedSearch({
   return (
     <AdvancedGroup>
       <Select
-        aria-label={i18n._(t`Set type select`)}
+        aria-label={t`Set type select`}
         className="setTypeSelect"
         variant={SelectVariant.typeahead}
-        typeAheadAriaLabel={i18n._(t`Set type typeahead`)}
+        typeAheadAriaLabel={t`Set type typeahead`}
         onToggle={setIsPrefixDropdownOpen}
         onSelect={(event, selection) => setPrefixSelection(selection)}
         onClear={() => setPrefixSelection(null)}
         selections={prefixSelection}
         isOpen={isPrefixDropdownOpen}
-        placeholderText={i18n._(t`Set type`)}
+        placeholderText={t`Set type`}
         maxHeight={maxSelectHeight}
-        noResultsFoundText={i18n._(t`No results found`)}
+        noResultsFoundText={t`No results found`}
       >
         <SelectOption
           key="and"
           value="and"
-          description={i18n._(
-            t`Returns results that satisfy this one as well as other filters.  This is the default set type if nothing is selected.`
-          )}
+          description={t`Returns results that satisfy this one as well as other filters.  This is the default set type if nothing is selected.`}
         />
         <SelectOption
           key="or"
           value="or"
-          description={i18n._(
-            t`Returns results that satisfy this one or any other filters.`
-          )}
+          description={t`Returns results that satisfy this one or any other filters.`}
         />
         <SelectOption
           key="not"
           value="not"
-          description={i18n._(
-            t`Returns results that have values other than this one as well as other filters.`
-          )}
+          description={t`Returns results that have values other than this one as well as other filters.`}
         />
       </Select>
       <Select
-        aria-label={i18n._(t`Key select`)}
+        aria-label={t`Key select`}
         className="keySelect"
         variant={SelectVariant.typeahead}
-        typeAheadAriaLabel={i18n._(t`Key typeahead`)}
+        typeAheadAriaLabel={t`Key typeahead`}
         onToggle={setIsKeyDropdownOpen}
         onSelect={(event, selection) => setKeySelection(selection)}
         onClear={() => setKeySelection(null)}
         selections={keySelection}
         isOpen={isKeyDropdownOpen}
-        placeholderText={i18n._(t`Key`)}
+        placeholderText={t`Key`}
         isCreatable
         onCreateOption={setKeySelection}
         maxHeight={maxSelectHeight}
-        noResultsFoundText={i18n._(t`No results found`)}
+        noResultsFoundText={t`No results found`}
       >
         {allKeys.map(optionKey => (
           <SelectOption key={optionKey} value={optionKey}>
@@ -144,114 +137,106 @@ function AdvancedSearch({
         ))}
       </Select>
       <Select
-        aria-label={i18n._(t`Lookup select`)}
+        aria-label={t`Lookup select`}
         className="lookupSelect"
         variant={SelectVariant.typeahead}
-        typeAheadAriaLabel={i18n._(t`Lookup typeahead`)}
+        typeAheadAriaLabel={t`Lookup typeahead`}
         onToggle={setIsLookupDropdownOpen}
         onSelect={(event, selection) => setLookupSelection(selection)}
         onClear={() => setLookupSelection(null)}
         selections={lookupSelection}
         isOpen={isLookupDropdownOpen}
-        placeholderText={i18n._(t`Lookup type`)}
+        placeholderText={t`Lookup type`}
         maxHeight={maxSelectHeight}
-        noResultsFoundText={i18n._(t`No results found`)}
+        noResultsFoundText={t`No results found`}
       >
         <SelectOption
           key="exact"
           value="exact"
-          description={i18n._(
-            t`Exact match (default lookup if not specified).`
-          )}
+          description={t`Exact match (default lookup if not specified).`}
         />
         <SelectOption
           key="iexact"
           value="iexact"
-          description={i18n._(t`Case-insensitive version of exact.`)}
+          description={t`Case-insensitive version of exact.`}
         />
         <SelectOption
           key="contains"
           value="contains"
-          description={i18n._(t`Field contains value.`)}
+          description={t`Field contains value.`}
         />
         <SelectOption
           key="icontains"
           value="icontains"
-          description={i18n._(t`Case-insensitive version of contains`)}
+          description={t`Case-insensitive version of contains`}
         />
         <SelectOption
           key="startswith"
           value="startswith"
-          description={i18n._(t`Field starts with value.`)}
+          description={t`Field starts with value.`}
         />
         <SelectOption
           key="istartswith"
           value="istartswith"
-          description={i18n._(t`Case-insensitive version of startswith.`)}
+          description={t`Case-insensitive version of startswith.`}
         />
         <SelectOption
           key="endswith"
           value="endswith"
-          description={i18n._(t`Field ends with value.`)}
+          description={t`Field ends with value.`}
         />
         <SelectOption
           key="iendswith"
           value="iendswith"
-          description={i18n._(t`Case-insensitive version of endswith.`)}
+          description={t`Case-insensitive version of endswith.`}
         />
         <SelectOption
           key="regex"
           value="regex"
-          description={i18n._(t`Field matches the given regular expression.`)}
+          description={t`Field matches the given regular expression.`}
         />
         <SelectOption
           key="iregex"
           value="iregex"
-          description={i18n._(t`Case-insensitive version of regex.`)}
+          description={t`Case-insensitive version of regex.`}
         />
         <SelectOption
           key="gt"
           value="gt"
-          description={i18n._(t`Greater than comparison.`)}
+          description={t`Greater than comparison.`}
         />
         <SelectOption
           key="gte"
           value="gte"
-          description={i18n._(t`Greater than or equal to comparison.`)}
+          description={t`Greater than or equal to comparison.`}
         />
         <SelectOption
           key="lt"
           value="lt"
-          description={i18n._(t`Less than comparison.`)}
+          description={t`Less than comparison.`}
         />
         <SelectOption
           key="lte"
           value="lte"
-          description={i18n._(t`Less than or equal to comparison.`)}
+          description={t`Less than or equal to comparison.`}
         />
         <SelectOption
           key="isnull"
           value="isnull"
-          description={i18n._(
-            t`Check whether the given field or related object is null; expects a boolean value.`
-          )}
+          description={t`Check whether the given field or related object is null; expects a boolean value.`}
         />
         <SelectOption
           key="in"
           value="in"
-          description={i18n._(
-            t`Check whether the given field's value is present in the list provided; expects a comma-separated list of items.`
-          )}
+          description={t`Check whether the given field's value is present in the list provided; expects a comma-separated list of items.`}
         />
       </Select>
       <InputGroup>
         <TextInput
           type="search"
-          aria-label={i18n._(t`Advanced search value input`)}
+          aria-label={t`Advanced search value input`}
           isDisabled={!keySelection}
-          value={
-            (!keySelection && i18n._(t`First, select a key`)) || searchValue
-          }
+          value={(!keySelection && t`First, select a key`) || searchValue}
           onChange={setSearchValue}
           onKeyDown={handleAdvancedTextKeyDown}
         />
@@ -259,17 +244,14 @@ function AdvancedSearch({
           <Button
             variant={ButtonVariant.control}
             isDisabled={!searchValue}
-            aria-label={i18n._(t`Search submit button`)}
+            aria-label={t`Search submit button`}
             onClick={handleAdvancedSearch}
           >
             <SearchIcon />
           </Button>
         </div>
       </InputGroup>
-      <Tooltip
-        content={i18n._(t`Advanced search documentation`)}
-        position="bottom"
-      >
+      <Tooltip content={t`Advanced search documentation`} position="bottom">
         <Button
           component="a"
           variant="plain"
@@ -296,4 +278,4 @@ AdvancedSearch.defaultProps = {
   maxSelectHeight: '300px',
 };
 
-export default withI18n()(AdvancedSearch);
+export default AdvancedSearch;
diff --git a/awx/ui_next/src/components/Search/Search.jsx b/awx/ui_next/src/components/Search/Search.jsx
index 31478f8b81..ef1161899e 100644
--- a/awx/ui_next/src/components/Search/Search.jsx
+++ b/awx/ui_next/src/components/Search/Search.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { Fragment, useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { withRouter } from 'react-router-dom';
 import {
@@ -32,7 +32,7 @@ const NoOptionDropdown = styled.div`
 
 function Search({
   columns,
-  i18n,
+
   onSearch,
   onReplaceSearch,
   onRemove,
@@ -174,8 +174,8 @@ function Search({
           <Select
             variant={SelectVariant.single}
             className="simpleKeySelect"
-            aria-label={i18n._(t`Simple key select`)}
-            typeAheadAriaLabel={i18n._(t`Simple key select`)}
+            aria-label={t`Simple key select`}
+            typeAheadAriaLabel={t`Simple key select`}
             onToggle={setIsSearchDropdownOpen}
             onSelect={handleDropdownSelect}
             selections={searchColumnName}
@@ -253,10 +253,10 @@ function Search({
                 maxHeight={maxSelectHeight}
               >
                 <SelectOption key="true" value="true">
-                  {booleanLabels.true || i18n._(t`Yes`)}
+                  {booleanLabels.true || t`Yes`}
                 </SelectOption>
                 <SelectOption key="false" value="false">
-                  {booleanLabels.false || i18n._(t`No`)}
+                  {booleanLabels.false || t`No`}
                 </SelectOption>
               </Select>
             )) || (
@@ -271,7 +271,7 @@ function Search({
                       'number') ||
                     'search'
                   }
-                  aria-label={i18n._(t`Search text input`)}
+                  aria-label={t`Search text input`}
                   value={searchValue}
                   onChange={setSearchValue}
                   onKeyDown={handleTextKeyDown}
@@ -281,7 +281,7 @@ function Search({
                   <Button
                     variant={ButtonVariant.control}
                     isDisabled={!searchValue || isDisabled}
-                    aria-label={i18n._(t`Search submit button`)}
+                    aria-label={t`Search submit button`}
                     onClick={handleSearch}
                   >
                     <SearchIcon />
@@ -332,4 +332,4 @@ Search.defaultProps = {
   maxSelectHeight: '300px',
 };
 
-export default withI18n()(withRouter(Search));
+export default withRouter(Search);
diff --git a/awx/ui_next/src/components/Sort/Sort.jsx b/awx/ui_next/src/components/Sort/Sort.jsx
index ee8599b531..341f4bdede 100644
--- a/awx/ui_next/src/components/Sort/Sort.jsx
+++ b/awx/ui_next/src/components/Sort/Sort.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { useLocation, withRouter } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import {
@@ -31,7 +31,7 @@ const NoOptionDropdown = styled.div`
   border-bottom-color: var(--pf-global--BorderColor--200);
 `;
 
-function Sort({ columns, qsConfig, onSort, i18n }) {
+function Sort({ columns, qsConfig, onSort }) {
   const location = useLocation();
   const [isSortDropdownOpen, setIsSortDropdownOpen] = useState(false);
 
@@ -126,7 +126,7 @@ function Sort({ columns, qsConfig, onSort, i18n }) {
 
           <Button
             variant={ButtonVariant.control}
-            aria-label={i18n._(t`Sort`)}
+            aria-label={t`Sort`}
             onClick={handleSort}
           >
             <SortIcon />
@@ -147,4 +147,4 @@ Sort.defaultProps = {
   onSort: null,
 };
 
-export default withI18n()(withRouter(Sort));
+export default withRouter(Sort);
diff --git a/awx/ui_next/src/components/Sparkline/Sparkline.jsx b/awx/ui_next/src/components/Sparkline/Sparkline.jsx
index c087705953..4b835bac2e 100644
--- a/awx/ui_next/src/components/Sparkline/Sparkline.jsx
+++ b/awx/ui_next/src/components/Sparkline/Sparkline.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 import { arrayOf } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { Link as _Link } from 'react-router-dom';
 import { Tooltip } from '@patternfly/react-core';
 import styled from 'styled-components';
@@ -21,18 +21,18 @@ const Wrapper = styled.div`
 `;
 /* eslint-enable react/jsx-pascal-case */
 
-const Sparkline = ({ i18n, jobs }) => {
+const Sparkline = ({ jobs }) => {
   const generateTooltip = job => (
     <Fragment>
       <div>
-        {i18n._(t`JOB ID:`)} {job.id}
+        {t`JOB ID:`} {job.id}
       </div>
       <div>
-        {i18n._(t`STATUS:`)} {job.status.toUpperCase()}
+        {t`STATUS:`} {job.status.toUpperCase()}
       </div>
       {job.finished && (
         <div>
-          {i18n._(t`FINISHED:`)} {formatDateString(job.finished)}
+          {t`FINISHED:`} {formatDateString(job.finished)}
         </div>
       )}
     </Fragment>
@@ -41,7 +41,7 @@ const Sparkline = ({ i18n, jobs }) => {
   const statusIcons = jobs.map(job => (
     <Tooltip position="top" content={generateTooltip(job)} key={job.id}>
       <Link
-        aria-label={i18n._(t`View job ${job.id}`)}
+        aria-label={t`View job ${job.id}`}
         to={`/jobs/${JOB_TYPE_URL_SEGMENTS[job.type]}/${job.id}`}
       >
         <StatusIcon status={job.status} />
@@ -59,4 +59,4 @@ Sparkline.defaultProps = {
   jobs: [],
 };
 
-export default withI18n()(Sparkline);
+export default Sparkline;
diff --git a/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx b/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
index 83f386beeb..9ae919a624 100644
--- a/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
+++ b/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import { Button, Tooltip, Chip } from '@patternfly/react-core';
 import { Tr, Td, ExpandableRowContent } from '@patternfly/react-table';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import {
   ExclamationTriangleIcon,
   PencilAltIcon,
@@ -32,7 +32,6 @@ const ExclamationTriangleIconWarning = styled(ExclamationTriangleIcon)`
 `;
 
 function TemplateListItem({
-  i18n,
   template,
   isSelected,
   onSelect,
@@ -88,7 +87,7 @@ function TemplateListItem({
         <Link to={`/inventories/${inventorykind}/${id}/details`}>
           {summaryFields.inventory.name}
         </Link>
-        <span> {i18n._(t`(Prompt on launch)`)}</span>
+        <span> {t`(Prompt on launch)`}</span>
       </>
     ) : (
       <Link to={`/inventories/${inventorykind}/${id}/details`}>
@@ -103,7 +102,7 @@ function TemplateListItem({
   if (mostRecentJob) {
     lastRun = mostRecentJob.finished
       ? formatDateString(mostRecentJob.finished)
-      : i18n._(t`Running`);
+      : t`Running`;
   }
 
   return (
@@ -122,16 +121,16 @@ function TemplateListItem({
             isSelected,
             onSelect,
           }}
-          dataLabel={i18n._(t`Selected`)}
+          dataLabel={t`Selected`}
         />
-        <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+        <Td id={labelId} dataLabel={t`Name`}>
           <Link to={`${detailUrl}`}>
             <b>{template.name}</b>
           </Link>
           {missingResourceIcon && (
             <span>
               <Tooltip
-                content={i18n._(t`Resources are missing from this template.`)}
+                content={t`Resources are missing from this template.`}
                 position="right"
               >
                 <ExclamationTriangleIcon css="color: #c9190b; margin-left: 20px;" />
@@ -142,9 +141,7 @@ function TemplateListItem({
             <span>
               <Tooltip
                 className="missing-execution-environment"
-                content={i18n._(
-                  t`Custom virtual environment ${template.custom_virtualenv} must be replaced by an execution environment.`
-                )}
+                content={t`Custom virtual environment ${template.custom_virtualenv} must be replaced by an execution environment.`}
                 position="right"
               >
                 <ExclamationTriangleIconWarning />
@@ -152,18 +149,18 @@ function TemplateListItem({
             </span>
           )}
         </Td>
-        <Td dataLabel={i18n._(t`Type`)}>{toTitleCase(template.type)}</Td>
-        <Td dataLabel={i18n._(t`Last Ran`)}>{lastRun}</Td>
-        <ActionsTd dataLabel={i18n._(t`Actions`)}>
+        <Td dataLabel={t`Type`}>{toTitleCase(template.type)}</Td>
+        <Td dataLabel={t`Last Ran`}>{lastRun}</Td>
+        <ActionsTd dataLabel={t`Actions`}>
           <ActionItem
             visible={template.type === 'workflow_job_template'}
-            tooltip={i18n._(t`Visualizer`)}
+            tooltip={t`Visualizer`}
           >
             <Button
               ouiaId={`${template.id}-visualizer-button`}
               id={`template-action-visualizer-${template.id}`}
               isDisabled={isDisabled}
-              aria-label={i18n._(t`Visualizer`)}
+              aria-label={t`Visualizer`}
               variant="plain"
               component={Link}
               to={`/templates/workflow_job_template/${template.id}/visualizer`}
@@ -173,7 +170,7 @@ function TemplateListItem({
           </ActionItem>
           <ActionItem
             visible={template.summary_fields.user_capabilities.start}
-            tooltip={i18n._(t`Launch Template`)}
+            tooltip={t`Launch Template`}
           >
             <LaunchButton resource={template}>
               {({ handleLaunch, isLaunching }) => (
@@ -181,7 +178,7 @@ function TemplateListItem({
                   ouiaId={`${template.id}-launch-button`}
                   id={`template-action-launch-${template.id}`}
                   isDisabled={isDisabled || isLaunching}
-                  aria-label={i18n._(t`Launch template`)}
+                  aria-label={t`Launch template`}
                   variant="plain"
                   onClick={handleLaunch}
                 >
@@ -192,13 +189,13 @@ function TemplateListItem({
           </ActionItem>
           <ActionItem
             visible={template.summary_fields.user_capabilities.edit}
-            tooltip={i18n._(t`Edit Template`)}
+            tooltip={t`Edit Template`}
           >
             <Button
               ouiaId={`${template.id}-edit-button`}
               id={`template-action-edit-${template.id}`}
               isDisabled={isDisabled}
-              aria-label={i18n._(t`Edit Template`)}
+              aria-label={t`Edit Template`}
               variant="plain"
               component={Link}
               to={`/templates/${template.type}/${template.id}/edit`}
@@ -207,12 +204,12 @@ function TemplateListItem({
             </Button>
           </ActionItem>
           <ActionItem
-            tooltip={i18n._(t`Copy Template`)}
+            tooltip={t`Copy Template`}
             visible={template.summary_fields.user_capabilities.copy}
           >
             <CopyButton
               id={`template-action-copy-${template.id}`}
-              errorMessage={i18n._(t`Failed to copy template.`)}
+              errorMessage={t`Failed to copy template.`}
               isDisabled={isDisabled}
               onCopyStart={handleCopyStart}
               onCopyFinish={handleCopyFinish}
@@ -227,20 +224,20 @@ function TemplateListItem({
           <ExpandableRowContent>
             <DetailList>
               <Detail
-                label={i18n._(t`Description`)}
+                label={t`Description`}
                 value={template.description}
                 dataCy={`template-${template.id}-description`}
               />
               {summaryFields.recent_jobs && summaryFields.recent_jobs.length ? (
                 <Detail
-                  label={i18n._(t`Activity`)}
+                  label={t`Activity`}
                   value={<Sparkline jobs={summaryFields.recent_jobs} />}
                   dataCy={`template-${template.id}-activity`}
                 />
               ) : null}
               {summaryFields.organization && (
                 <Detail
-                  label={i18n._(t`Organization`)}
+                  label={t`Organization`}
                   value={
                     <Link
                       to={`/organizations/${summaryFields.organization.id}/details`}
@@ -253,7 +250,7 @@ function TemplateListItem({
               )}
               {summaryFields.inventory ? (
                 <Detail
-                  label={i18n._(t`Inventory`)}
+                  label={t`Inventory`}
                   value={inventoryValue(
                     summaryFields.inventory.kind,
                     summaryFields.inventory.id
@@ -263,12 +260,12 @@ function TemplateListItem({
               ) : (
                 !askInventoryOnLaunch &&
                 template.type === 'job_template' && (
-                  <DeletedDetail label={i18n._(t`Inventory`)} />
+                  <DeletedDetail label={t`Inventory`} />
                 )
               )}
               {summaryFields.project && (
                 <Detail
-                  label={i18n._(t`Project`)}
+                  label={t`Project`}
                   value={
                     <Link to={`/projects/${summaryFields.project.id}/details`}>
                       {summaryFields.project.name}
@@ -282,14 +279,14 @@ function TemplateListItem({
                 executionEnvironment={summaryFields?.execution_environment}
               />
               <Detail
-                label={i18n._(t`Last Modified`)}
+                label={t`Last Modified`}
                 value={formatDateString(template.modified)}
                 dataCy={`template-${template.id}-last-modified`}
               />
               {summaryFields.credentials && summaryFields.credentials.length ? (
                 <Detail
                   fullWidth
-                  label={i18n._(t`Credentials`)}
+                  label={t`Credentials`}
                   value={
                     <ChipGroup
                       numChips={5}
@@ -306,7 +303,7 @@ function TemplateListItem({
               {summaryFields.labels && summaryFields.labels.results.length > 0 && (
                 <Detail
                   fullWidth
-                  label={i18n._(t`Labels`)}
+                  label={t`Labels`}
                   value={
                     <ChipGroup
                       numChips={5}
@@ -331,4 +328,4 @@ function TemplateListItem({
 }
 
 export { TemplateListItem as _TemplateListItem };
-export default withI18n()(TemplateListItem);
+export default TemplateListItem;
diff --git a/awx/ui_next/src/components/UserAndTeamAccessAdd/UserAndTeamAccessAdd.jsx b/awx/ui_next/src/components/UserAndTeamAccessAdd/UserAndTeamAccessAdd.jsx
index ea29ba2c1c..09cd75c868 100644
--- a/awx/ui_next/src/components/UserAndTeamAccessAdd/UserAndTeamAccessAdd.jsx
+++ b/awx/ui_next/src/components/UserAndTeamAccessAdd/UserAndTeamAccessAdd.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useEffect, useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useParams } from 'react-router-dom';
 import styled from 'styled-components';
@@ -22,7 +22,7 @@ const Grid = styled.div`
   grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
 `;
 
-function UserAndTeamAccessAdd({ i18n, title, onFetchData, apiModel }) {
+function UserAndTeamAccessAdd({ title, onFetchData, apiModel }) {
   const [selectedResourceType, setSelectedResourceType] = useState(null);
   const [isWizardOpen, setIsWizardOpen] = useState(false);
   const [stepIdReached, setStepIdReached] = useState(1);
@@ -70,10 +70,10 @@ function UserAndTeamAccessAdd({ i18n, title, onFetchData, apiModel }) {
   const steps = [
     {
       id: 1,
-      name: i18n._(t`Add resource type`),
+      name: t`Add resource type`,
       component: (
         <Grid>
-          {getResourceAccessConfig(i18n).map(resource => (
+          {getResourceAccessConfig().map(resource => (
             <SelectableCard
               key={resource.selectedResource}
               isSelected={
@@ -91,7 +91,7 @@ function UserAndTeamAccessAdd({ i18n, title, onFetchData, apiModel }) {
     },
     {
       id: 2,
-      name: i18n._(t`Select items from list`),
+      name: t`Select items from list`,
       component: selectedResourceType && (
         <SelectResourceStep
           searchColumns={selectedResourceType.searchColumns}
@@ -100,7 +100,7 @@ function UserAndTeamAccessAdd({ i18n, title, onFetchData, apiModel }) {
           onRowClick={handleResourceSelect}
           fetchItems={selectedResourceType.fetchItems}
           fetchOptions={selectedResourceType.fetchOptions}
-          selectedLabel={i18n._(t`Selected`)}
+          selectedLabel={t`Selected`}
           selectedResourceRows={resourcesSelected}
           sortedColumnKey="username"
         />
@@ -110,7 +110,7 @@ function UserAndTeamAccessAdd({ i18n, title, onFetchData, apiModel }) {
     },
     {
       id: 3,
-      name: i18n._(t`Select roles to apply`),
+      name: t`Select roles to apply`,
       component: resourcesSelected?.length > 0 && (
         <SelectRoleStep
           onRolesClick={handleRoleSelect}
@@ -118,12 +118,12 @@ function UserAndTeamAccessAdd({ i18n, title, onFetchData, apiModel }) {
           selectedListKey={
             selectedResourceType === 'users' ? 'username' : 'name'
           }
-          selectedListLabel={i18n._(t`Selected`)}
+          selectedListLabel={t`Selected`}
           selectedResourceRows={resourcesSelected}
           selectedRoleRows={rolesSelected}
         />
       ),
-      nextButtonText: i18n._(t`Save`),
+      nextButtonText: t`Save`,
       canJumpTo: stepIdReached >= 3,
     },
   ];
@@ -131,13 +131,13 @@ function UserAndTeamAccessAdd({ i18n, title, onFetchData, apiModel }) {
   if (error) {
     return (
       <AlertModal
-        aria-label={i18n._(t`Associate role error`)}
+        aria-label={t`Associate role error`}
         isOpen={error}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={dismissError}
       >
-        {i18n._(t`Failed to associate role`)}
+        {t`Failed to associate role`}
         <ErrorDetail error={error} />
       </AlertModal>
     );
@@ -149,20 +149,20 @@ function UserAndTeamAccessAdd({ i18n, title, onFetchData, apiModel }) {
         <DropdownItem
           key="add"
           component="button"
-          aria-label={i18n._(t`Add`)}
+          aria-label={t`Add`}
           onClick={() => setIsWizardOpen(true)}
         >
-          {i18n._(t`Add`)}
+          {t`Add`}
         </DropdownItem>
       ) : (
         <Button
           ouiaId="access-add-button"
           variant="primary"
-          aria-label={i18n._(t`Add`)}
+          aria-label={t`Add`}
           onClick={() => setIsWizardOpen(true)}
           key="add"
         >
-          {i18n._(t`Add`)}
+          {t`Add`}
         </Button>
       )}
       {isWizardOpen && (
@@ -181,4 +181,4 @@ function UserAndTeamAccessAdd({ i18n, title, onFetchData, apiModel }) {
   );
 }
 
-export default withI18n()(UserAndTeamAccessAdd);
+export default UserAndTeamAccessAdd;
diff --git a/awx/ui_next/src/components/UserAndTeamAccessAdd/getResourceAccessConfig.js b/awx/ui_next/src/components/UserAndTeamAccessAdd/getResourceAccessConfig.js
index 9333d1770c..e54bbe2cf6 100644
--- a/awx/ui_next/src/components/UserAndTeamAccessAdd/getResourceAccessConfig.js
+++ b/awx/ui_next/src/components/UserAndTeamAccessAdd/getResourceAccessConfig.js
@@ -8,33 +8,33 @@ import {
   OrganizationsAPI,
 } from '../../api';
 
-export default function getResourceAccessConfig(i18n) {
+export default function getResourceAccessConfig() {
   return [
     {
       selectedResource: 'jobTemplate',
-      label: i18n._(t`Job templates`),
+      label: t`Job templates`,
       searchColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Playbook name`),
+          name: t`Playbook name`,
           key: 'playbook__icontains',
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
       ],
       sortColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ],
@@ -43,29 +43,29 @@ export default function getResourceAccessConfig(i18n) {
     },
     {
       selectedResource: 'workflowJobTemplate',
-      label: i18n._(t`Workflow job templates`),
+      label: t`Workflow job templates`,
       searchColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Playbook name`),
+          name: t`Playbook name`,
           key: 'playbook__icontains',
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
       ],
       sortColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ],
@@ -74,40 +74,40 @@ export default function getResourceAccessConfig(i18n) {
     },
     {
       selectedResource: 'credential',
-      label: i18n._(t`Credentials`),
+      label: t`Credentials`,
       searchColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Type`),
+          name: t`Type`,
           key: 'or__scm_type',
           options: [
-            [``, i18n._(t`Manual`)],
-            [`git`, i18n._(t`Git`)],
-            [`svn`, i18n._(t`Subversion`)],
-            [`archive`, i18n._(t`Remote Archive`)],
-            [`insights`, i18n._(t`Red Hat Insights`)],
+            [``, t`Manual`],
+            [`git`, t`Git`],
+            [`svn`, t`Subversion`],
+            [`archive`, t`Remote Archive`],
+            [`insights`, t`Red Hat Insights`],
           ],
         },
         {
-          name: i18n._(t`Source Control URL`),
+          name: t`Source Control URL`,
           key: 'scm_url__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
       ],
       sortColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ],
@@ -116,25 +116,25 @@ export default function getResourceAccessConfig(i18n) {
     },
     {
       selectedResource: 'inventory',
-      label: i18n._(t`Inventories`),
+      label: t`Inventories`,
       searchColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
       ],
       sortColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ],
@@ -143,40 +143,40 @@ export default function getResourceAccessConfig(i18n) {
     },
     {
       selectedResource: 'project',
-      label: i18n._(t`Projects`),
+      label: t`Projects`,
       searchColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Type`),
+          name: t`Type`,
           key: 'or__scm_type',
           options: [
-            [``, i18n._(t`Manual`)],
-            [`git`, i18n._(t`Git`)],
-            [`svn`, i18n._(t`Subversion`)],
-            [`archive`, i18n._(t`Remote Archive`)],
-            [`insights`, i18n._(t`Red Hat Insights`)],
+            [``, t`Manual`],
+            [`git`, t`Git`],
+            [`svn`, t`Subversion`],
+            [`archive`, t`Remote Archive`],
+            [`insights`, t`Red Hat Insights`],
           ],
         },
         {
-          name: i18n._(t`Source Control URL`),
+          name: t`Source Control URL`,
           key: 'scm_url__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
       ],
       sortColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ],
@@ -185,25 +185,25 @@ export default function getResourceAccessConfig(i18n) {
     },
     {
       selectedResource: 'organization',
-      label: i18n._(t`Organizations`),
+      label: t`Organizations`,
       searchColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
       ],
       sortColumns: [
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ],
diff --git a/awx/ui_next/src/components/Workflow/WorkflowLegend.jsx b/awx/ui_next/src/components/Workflow/WorkflowLegend.jsx
index c571d0c9b4..bf2bcc3ffc 100644
--- a/awx/ui_next/src/components/Workflow/WorkflowLegend.jsx
+++ b/awx/ui_next/src/components/Workflow/WorkflowLegend.jsx
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import {
@@ -77,57 +77,57 @@ const Close = styled(TimesIcon)`
   top: 15px;
 `;
 
-function WorkflowLegend({ i18n }) {
+function WorkflowLegend() {
   const dispatch = useContext(WorkflowDispatchContext);
 
   return (
     <Wrapper>
       <Header>
-        <b>{i18n._(t`Legend`)}</b>
+        <b>{t`Legend`}</b>
         <Close onClick={() => dispatch({ type: 'TOGGLE_LEGEND' })} />
       </Header>
       <Legend>
         <li>
           <NodeTypeLetter>JT</NodeTypeLetter>
-          <span>{i18n._(t`Job Template`)}</span>
+          <span>{t`Job Template`}</span>
         </li>
         <li>
           <NodeTypeLetter>W</NodeTypeLetter>
-          <span>{i18n._(t`Workflow`)}</span>
+          <span>{t`Workflow`}</span>
         </li>
         <li>
           <NodeTypeLetter>I</NodeTypeLetter>
-          <span>{i18n._(t`Inventory Sync`)}</span>
+          <span>{t`Inventory Sync`}</span>
         </li>
         <li>
           <NodeTypeLetter>P</NodeTypeLetter>
-          <span>{i18n._(t`Project Sync`)}</span>
+          <span>{t`Project Sync`}</span>
         </li>
         <li>
           <NodeTypeLetter>
             <PauseIcon />
           </NodeTypeLetter>
-          <span>{i18n._(t`Approval`)}</span>
+          <span>{t`Approval`}</span>
         </li>
         <li>
           <StyledExclamationTriangleIcon />
-          <span>{i18n._(t`Warning`)}</span>
+          <span>{t`Warning`}</span>
         </li>
         <li>
           <SuccessLink />
-          <span>{i18n._(t`On Success`)}</span>
+          <span>{t`On Success`}</span>
         </li>
         <li>
           <FailureLink />
-          <span>{i18n._(t`On Failure`)}</span>
+          <span>{t`On Failure`}</span>
         </li>
         <li>
           <AlwaysLink />
-          <span>{i18n._(t`Always`)}</span>
+          <span>{t`Always`}</span>
         </li>
       </Legend>
     </Wrapper>
   );
 }
 
-export default withI18n()(WorkflowLegend);
+export default WorkflowLegend;
diff --git a/awx/ui_next/src/components/Workflow/WorkflowLinkHelp.jsx b/awx/ui_next/src/components/Workflow/WorkflowLinkHelp.jsx
index 5180ab3bba..756eb5022f 100644
--- a/awx/ui_next/src/components/Workflow/WorkflowLinkHelp.jsx
+++ b/awx/ui_next/src/components/Workflow/WorkflowLinkHelp.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import { shape } from 'prop-types';
@@ -17,17 +17,17 @@ const GridDL = styled.dl`
   }
 `;
 
-function WorkflowLinkHelp({ link, i18n }) {
+function WorkflowLinkHelp({ link }) {
   let linkType;
   switch (link.linkType) {
     case 'always':
-      linkType = i18n._(t`Always`);
+      linkType = t`Always`;
       break;
     case 'success':
-      linkType = i18n._(t`On Success`);
+      linkType = t`On Success`;
       break;
     case 'failure':
-      linkType = i18n._(t`On Failure`);
+      linkType = t`On Failure`;
       break;
     default:
       linkType = '';
@@ -36,7 +36,7 @@ function WorkflowLinkHelp({ link, i18n }) {
   return (
     <GridDL>
       <dt>
-        <b>{i18n._(t`Run`)}</b>
+        <b>{t`Run`}</b>
       </dt>
       <dd id="workflow-link-help-type">{linkType}</dd>
     </GridDL>
@@ -47,4 +47,4 @@ WorkflowLinkHelp.propTypes = {
   link: shape().isRequired,
 };
 
-export default withI18n()(WorkflowLinkHelp);
+export default WorkflowLinkHelp;
diff --git a/awx/ui_next/src/components/Workflow/WorkflowNodeHelp.jsx b/awx/ui_next/src/components/Workflow/WorkflowNodeHelp.jsx
index 909a7c3d6e..088cad8232 100644
--- a/awx/ui_next/src/components/Workflow/WorkflowNodeHelp.jsx
+++ b/awx/ui_next/src/components/Workflow/WorkflowNodeHelp.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import styled from 'styled-components';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons';
@@ -31,7 +31,7 @@ const StyledExclamationTriangleIcon = styled(ExclamationTriangleIcon)`
   width: 20px;
 `;
 
-function WorkflowNodeHelp({ node, i18n }) {
+function WorkflowNodeHelp({ node }) {
   let nodeType;
   const job = node?.originalNodeObject?.summary_fields?.job;
   const unifiedJobTemplate =
@@ -44,23 +44,23 @@ function WorkflowNodeHelp({ node, i18n }) {
     switch (type) {
       case 'job_template':
       case 'job':
-        nodeType = i18n._(t`Job Template`);
+        nodeType = t`Job Template`;
         break;
       case 'workflow_job_template':
       case 'workflow_job':
-        nodeType = i18n._(t`Workflow Job Template`);
+        nodeType = t`Workflow Job Template`;
         break;
       case 'project':
       case 'project_update':
-        nodeType = i18n._(t`Project Update`);
+        nodeType = t`Project Update`;
         break;
       case 'inventory_source':
       case 'inventory_update':
-        nodeType = i18n._(t`Inventory Update`);
+        nodeType = t`Inventory Update`;
         break;
       case 'workflow_approval_template':
       case 'workflow_approval':
-        nodeType = i18n._(t`Workflow Approval`);
+        nodeType = t`Workflow Approval`;
         break;
       default:
         nodeType = '';
@@ -71,43 +71,43 @@ function WorkflowNodeHelp({ node, i18n }) {
   if (job) {
     switch (job.status) {
       case 'new':
-        jobStatus = i18n._(t`New`);
+        jobStatus = t`New`;
         break;
       case 'pending':
-        jobStatus = i18n._(t`Pending`);
+        jobStatus = t`Pending`;
         break;
       case 'waiting':
-        jobStatus = i18n._(t`Waiting`);
+        jobStatus = t`Waiting`;
         break;
       case 'running':
-        jobStatus = i18n._(t`Running`);
+        jobStatus = t`Running`;
         break;
       case 'successful':
-        jobStatus = i18n._(t`Successful`);
+        jobStatus = t`Successful`;
         break;
       case 'failed':
-        jobStatus = i18n._(t`Failed`);
+        jobStatus = t`Failed`;
         break;
       case 'error':
-        jobStatus = i18n._(t`Error`);
+        jobStatus = t`Error`;
         break;
       case 'canceled':
-        jobStatus = i18n._(t`Canceled`);
+        jobStatus = t`Canceled`;
         break;
       case 'never updated':
-        jobStatus = i18n._(t`Never Updated`);
+        jobStatus = t`Never Updated`;
         break;
       case 'ok':
-        jobStatus = i18n._(t`OK`);
+        jobStatus = t`OK`;
         break;
       case 'missing':
-        jobStatus = i18n._(t`Missing`);
+        jobStatus = t`Missing`;
         break;
       case 'none':
-        jobStatus = i18n._(t`None`);
+        jobStatus = t`None`;
         break;
       case 'updating':
-        jobStatus = i18n._(t`Updating`);
+        jobStatus = t`Updating`;
         break;
       default:
         jobStatus = '';
@@ -129,21 +129,21 @@ function WorkflowNodeHelp({ node, i18n }) {
       {job && (
         <GridDL>
           <dt>
-            <b>{i18n._(t`Name`)}</b>
+            <b>{t`Name`}</b>
           </dt>
           <dd id="workflow-node-help-name">{job.name}</dd>
           <dt>
-            <b>{i18n._(t`Type`)}</b>
+            <b>{t`Type`}</b>
           </dt>
           <dd id="workflow-node-help-type">{nodeType}</dd>
           <dt>
-            <b>{i18n._(t`Job Status`)}</b>
+            <b>{t`Job Status`}</b>
           </dt>
           <dd id="workflow-node-help-status">{jobStatus}</dd>
           {typeof job.elapsed === 'number' && (
             <>
               <dt>
-                <b>{i18n._(t`Elapsed`)}</b>
+                <b>{t`Elapsed`}</b>
               </dt>
               <dd id="workflow-node-help-elapsed">
                 {secondsToHHMMSS(job.elapsed)}
@@ -155,17 +155,17 @@ function WorkflowNodeHelp({ node, i18n }) {
       {unifiedJobTemplate && !job && (
         <GridDL>
           <dt>
-            <b>{i18n._(t`Name`)}</b>
+            <b>{t`Name`}</b>
           </dt>
           <dd id="workflow-node-help-name">{unifiedJobTemplate.name}</dd>
           <dt>
-            <b>{i18n._(t`Type`)}</b>
+            <b>{t`Type`}</b>
           </dt>
           <dd id="workflow-node-help-type">{nodeType}</dd>
         </GridDL>
       )}
       {job && job.type !== 'workflow_approval' && (
-        <p css="margin-top: 10px">{i18n._(t`Click to view job details`)}</p>
+        <p css="margin-top: 10px">{t`Click to view job details`}</p>
       )}
     </>
   );
@@ -175,4 +175,4 @@ WorkflowNodeHelp.propTypes = {
   node: shape().isRequired,
 };
 
-export default withI18n()(WorkflowNodeHelp);
+export default WorkflowNodeHelp;
diff --git a/awx/ui_next/src/components/Workflow/WorkflowStartNode.jsx b/awx/ui_next/src/components/Workflow/WorkflowStartNode.jsx
index 23dbc06481..8f4c17d79c 100644
--- a/awx/ui_next/src/components/Workflow/WorkflowStartNode.jsx
+++ b/awx/ui_next/src/components/Workflow/WorkflowStartNode.jsx
@@ -1,6 +1,5 @@
 import React, { useContext, useRef, useState } from 'react';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { bool, func } from 'prop-types';
 import { PlusIcon } from '@patternfly/react-icons';
@@ -31,7 +30,7 @@ const StartDiv = styled.div`
   padding: 0px 10px;
 `;
 
-function WorkflowStartNode({ i18n, onUpdateHelpText, showActionTooltip }) {
+function WorkflowStartNode({ onUpdateHelpText, showActionTooltip }) {
   const ref = useRef(null);
   const startNodeRef = useRef(null);
   const [hovering, setHovering] = useState(false);
@@ -58,7 +57,7 @@ function WorkflowStartNode({ i18n, onUpdateHelpText, showActionTooltip }) {
         y="10"
         style={{ overflow: 'visible' }}
       >
-        <StartDiv ref={startNodeRef}>{i18n._(t`START`)}</StartDiv>
+        <StartDiv ref={startNodeRef}>{t`START`}</StartDiv>
       </StartForeignObject>
       {showActionTooltip && hovering && (
         <WorkflowActionTooltip
@@ -66,7 +65,7 @@ function WorkflowStartNode({ i18n, onUpdateHelpText, showActionTooltip }) {
             <WorkflowActionTooltipItem
               id="node-add"
               key="add"
-              onMouseEnter={() => onUpdateHelpText(i18n._(t`Add a new node`))}
+              onMouseEnter={() => onUpdateHelpText(t`Add a new node`)}
               onMouseLeave={() => onUpdateHelpText(null)}
               onClick={() => {
                 onUpdateHelpText(null);
@@ -94,4 +93,4 @@ WorkflowStartNode.defaultProps = {
   onUpdateHelpText: () => {},
 };
 
-export default withI18n()(WorkflowStartNode);
+export default WorkflowStartNode;
diff --git a/awx/ui_next/src/components/Workflow/WorkflowTools.jsx b/awx/ui_next/src/components/Workflow/WorkflowTools.jsx
index 7fa6a13621..499857abe1 100644
--- a/awx/ui_next/src/components/Workflow/WorkflowTools.jsx
+++ b/awx/ui_next/src/components/Workflow/WorkflowTools.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React, { useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import { func, number } from 'prop-types';
@@ -54,7 +54,6 @@ const Close = styled(TimesIcon)`
 `;
 
 function WorkflowTools({
-  i18n,
   onFitGraph,
   onPan,
   onPanToMiddle,
@@ -81,12 +80,12 @@ function WorkflowTools({
   return (
     <Wrapper>
       <Header>
-        <b>{i18n._(t`Tools`)}</b>
+        <b>{t`Tools`}</b>
         <Close onClick={() => dispatch({ type: 'TOGGLE_TOOLS' })} />
       </Header>
       <Tools>
         <Tooltip
-          content={i18n._(t`Fit the graph to the available screen size`)}
+          content={t`Fit the graph to the available screen size`}
           position="bottom"
         >
           <Button
@@ -98,7 +97,7 @@ function WorkflowTools({
             <DesktopIcon />
           </Button>
         </Tooltip>
-        <Tooltip content={i18n._(t`Zoom Out`)} position="bottom">
+        <Tooltip content={t`Zoom Out`} position="bottom">
           <Button
             ouiaId="visualizer-zoom-out-button"
             variant="tertiary"
@@ -119,7 +118,7 @@ function WorkflowTools({
           type="range"
           value={zoomPercentage}
         />
-        <Tooltip content={i18n._(t`Zoom In`)} position="bottom">
+        <Tooltip content={t`Zoom In`} position="bottom">
           <Button
             ouiaId="visualizer-zoom-in-button"
             variant="tertiary"
@@ -130,7 +129,7 @@ function WorkflowTools({
           </Button>
         </Tooltip>
         <Pan>
-          <Tooltip content={i18n._(t`Pan Left`)} position="left">
+          <Tooltip content={t`Pan Left`} position="left">
             <Button
               ouiaId="visualizer-pan-left-button"
               variant="tertiary"
@@ -141,7 +140,7 @@ function WorkflowTools({
             </Button>
           </Tooltip>
           <PanCenter>
-            <Tooltip content={i18n._(t`Pan Up`)} position="top">
+            <Tooltip content={t`Pan Up`} position="top">
               <Button
                 ouiaId="visualizer-pan-up-button"
                 variant="tertiary"
@@ -152,7 +151,7 @@ function WorkflowTools({
               </Button>
             </Tooltip>
             <Tooltip
-              content={i18n._(t`Set zoom to 100% and center graph`)}
+              content={t`Set zoom to 100% and center graph`}
               position="top"
             >
               <Button
@@ -163,7 +162,7 @@ function WorkflowTools({
                 <HomeIcon />
               </Button>
             </Tooltip>
-            <Tooltip content={i18n._(t`Pan Down`)} position="bottom">
+            <Tooltip content={t`Pan Down`} position="bottom">
               <Button
                 ouiaId="visualizer-pan-down-button"
                 variant="tertiary"
@@ -174,7 +173,7 @@ function WorkflowTools({
               </Button>
             </Tooltip>
           </PanCenter>
-          <Tooltip content={i18n._(t`Pan Right`)} position="right">
+          <Tooltip content={t`Pan Right`} position="right">
             <Button
               ouiaId="visualizer-pan-right-button"
               variant="tertiary"
@@ -198,4 +197,4 @@ WorkflowTools.propTypes = {
   zoomPercentage: number.isRequired,
 };
 
-export default withI18n()(WorkflowTools);
+export default WorkflowTools;
diff --git a/awx/ui_next/src/components/Workflow/workflowReducer.js b/awx/ui_next/src/components/Workflow/workflowReducer.js
index bb221cdbcb..7d5a7fde58 100644
--- a/awx/ui_next/src/components/Workflow/workflowReducer.js
+++ b/awx/ui_next/src/components/Workflow/workflowReducer.js
@@ -49,7 +49,7 @@ export default function visualizerReducer(state, action) {
     case 'DELETE_NODE':
       return deleteNode(state);
     case 'GENERATE_NODES_AND_LINKS':
-      return generateNodesAndLinks(state, action.nodes, action.i18n);
+      return generateNodesAndLinks(state, action.nodes);
     case 'RESET':
       return initReducer();
     case 'SELECT_SOURCE_FOR_LINKING':
@@ -400,7 +400,7 @@ function deleteNode(state) {
   };
 }
 
-function generateNodes(workflowNodes, i18n) {
+function generateNodes(workflowNodes) {
   const allNodeIds = [];
   const chartNodeIdToIndexMapping = {};
   const nodeIdToChartNodeIdMapping = {};
@@ -409,7 +409,7 @@ function generateNodes(workflowNodes, i18n) {
     {
       id: 1,
       fullUnifiedJobTemplate: {
-        name: i18n._(t`START`),
+        name: t`START`,
       },
     },
   ];
@@ -492,17 +492,14 @@ function generateLinks(
   return [arrayOfLinksForChart, nonRootNodeIds];
 }
 
-// TODO: check to make sure passing i18n into this reducer
-// actually works the way we want it to.  If not we may
-// have to explore other options
-function generateNodesAndLinks(state, workflowNodes, i18n) {
+function generateNodesAndLinks(state, workflowNodes) {
   const [
     arrayOfNodesForChart,
     allNodeIds,
     nodeIdToChartNodeIdMapping,
     chartNodeIdToIndexMapping,
     nodeIdCounter,
-  ] = generateNodes(workflowNodes, i18n);
+  ] = generateNodes(workflowNodes);
   const [arrayOfLinksForChart, nonRootNodeIds] = generateLinks(
     workflowNodes,
     chartNodeIdToIndexMapping,
diff --git a/awx/ui_next/src/components/Workflow/workflowReducer.test.js b/awx/ui_next/src/components/Workflow/workflowReducer.test.js
index 60013abe85..3570f701dd 100644
--- a/awx/ui_next/src/components/Workflow/workflowReducer.test.js
+++ b/awx/ui_next/src/components/Workflow/workflowReducer.test.js
@@ -962,7 +962,7 @@ describe('Workflow reducer', () => {
             source: {
               id: 1,
               fullUnifiedJobTemplate: {
-                name: undefined,
+                name: 'START',
               },
             },
             target: {
@@ -987,7 +987,7 @@ describe('Workflow reducer', () => {
             source: {
               id: 1,
               fullUnifiedJobTemplate: {
-                name: undefined,
+                name: 'START',
               },
             },
             target: {
@@ -1013,7 +1013,7 @@ describe('Workflow reducer', () => {
           {
             id: 1,
             fullUnifiedJobTemplate: {
-              name: undefined,
+              name: 'START',
             },
           },
           {
diff --git a/awx/ui_next/src/contexts/Config.jsx b/awx/ui_next/src/contexts/Config.jsx
index 1511b236e8..d2e184f32f 100644
--- a/awx/ui_next/src/contexts/Config.jsx
+++ b/awx/ui_next/src/contexts/Config.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useEffect, useMemo } from 'react';
 import { useLocation, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import { ConfigAPI, MeAPI, RootAPI } from '../api';
@@ -21,7 +21,7 @@ export const useConfig = () => {
   return context;
 };
 
-export const ConfigProvider = withI18n()(({ i18n, children }) => {
+export const ConfigProvider = ({ children }) => {
   const { pathname } = useLocation();
 
   const {
@@ -71,18 +71,18 @@ export const ConfigProvider = withI18n()(({ i18n, children }) => {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
           ouiaId="config-error-modal"
         >
-          {i18n._(t`Failed to retrieve configuration.`)}
+          {t`Failed to retrieve configuration.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
       {children}
     </ConfigContext.Provider>
   );
-});
+};
 
 export const useAuthorizedPath = () => {
   const config = useConfig();
diff --git a/awx/ui_next/src/routeConfig.js b/awx/ui_next/src/routeConfig.jsx
similarity index 70%
rename from awx/ui_next/src/routeConfig.js
rename to awx/ui_next/src/routeConfig.jsx
index 507bc4e6d7..fba640a2d8 100644
--- a/awx/ui_next/src/routeConfig.js
+++ b/awx/ui_next/src/routeConfig.jsx
@@ -1,4 +1,5 @@
-import { t } from '@lingui/macro';
+import React from 'react';
+import { Trans } from '@lingui/macro';
 
 import ActivityStream from './screens/ActivityStream';
 import Applications from './screens/Application';
@@ -21,137 +22,133 @@ import Users from './screens/User';
 import WorkflowApprovals from './screens/WorkflowApproval';
 import { Jobs } from './screens/Job';
 
-// Ideally, this should just be a regular object that we export, but we
-// need the i18n. When lingui3 arrives, we will be able to import i18n
-// directly and we can replace this function with a simple export.
-
-function getRouteConfig(i18n) {
+function getRouteConfig() {
   return [
     {
-      groupTitle: i18n._(t`Views`),
+      groupTitle: <Trans>Views</Trans>,
       groupId: 'views_group',
       routes: [
         {
-          title: i18n._(t`Dashboard`),
+          title: <Trans>Dashboard</Trans>,
           path: '/home',
           screen: Dashboard,
         },
         {
-          title: i18n._(t`Jobs`),
+          title: <Trans>Jobs</Trans>,
           path: '/jobs',
           screen: Jobs,
         },
         {
-          title: i18n._(t`Schedules`),
+          title: <Trans>Schedules</Trans>,
           path: '/schedules',
           screen: Schedules,
         },
         {
-          title: i18n._(t`Activity Stream`),
+          title: <Trans>Activity Stream</Trans>,
           path: '/activity_stream',
           screen: ActivityStream,
         },
         {
-          title: i18n._(t`Workflow Approvals`),
+          title: <Trans>Workflow Approvals</Trans>,
           path: '/workflow_approvals',
           screen: WorkflowApprovals,
         },
       ],
     },
     {
-      groupTitle: i18n._(t`Resources`),
+      groupTitle: <Trans>Resources</Trans>,
       groupId: 'resources_group',
       routes: [
         {
-          title: i18n._(t`Templates`),
+          title: <Trans>Templates</Trans>,
           path: '/templates',
           screen: Templates,
         },
         {
-          title: i18n._(t`Credentials`),
+          title: <Trans>Credentials</Trans>,
           path: '/credentials',
           screen: Credentials,
         },
         {
-          title: i18n._(t`Projects`),
+          title: <Trans>Projects</Trans>,
           path: '/projects',
           screen: Projects,
         },
         {
-          title: i18n._(t`Inventories`),
+          title: <Trans>Inventories</Trans>,
           path: '/inventories',
           screen: Inventory,
         },
         {
-          title: i18n._(t`Hosts`),
+          title: <Trans>Hosts</Trans>,
           path: '/hosts',
           screen: Hosts,
         },
       ],
     },
     {
-      groupTitle: i18n._(t`Access`),
+      groupTitle: <Trans>Access</Trans>,
       groupId: 'access_group',
       routes: [
         {
-          title: i18n._(t`Organizations`),
+          title: <Trans>Organizations</Trans>,
           path: '/organizations',
           screen: Organizations,
         },
         {
-          title: i18n._(t`Users`),
+          title: <Trans>Users</Trans>,
           path: '/users',
           screen: Users,
         },
         {
-          title: i18n._(t`Teams`),
+          title: <Trans>Teams</Trans>,
           path: '/teams',
           screen: Teams,
         },
       ],
     },
     {
-      groupTitle: i18n._(t`Administration`),
+      groupTitle: <Trans>Administration</Trans>,
       groupId: 'administration_group',
       routes: [
         {
-          title: i18n._(t`Credential Types`),
+          title: <Trans>Credential Types</Trans>,
           path: '/credential_types',
           screen: CredentialTypes,
         },
         {
-          title: i18n._(t`Notifications`),
+          title: <Trans>Notifications</Trans>,
           path: '/notification_templates',
           screen: NotificationTemplates,
         },
         {
-          title: i18n._(t`Management Jobs`),
+          title: <Trans>Management Jobs</Trans>,
           path: '/management_jobs',
           screen: ManagementJobs,
         },
         {
-          title: i18n._(t`Instance Groups`),
+          title: <Trans>Instance Groups</Trans>,
           path: '/instance_groups',
           screen: InstanceGroups,
         },
         {
-          title: i18n._(t`Applications`),
+          title: <Trans>Applications</Trans>,
           path: '/applications',
           screen: Applications,
         },
         {
-          title: i18n._(t`Execution Environments`),
+          title: <Trans>Execution Environments</Trans>,
           path: '/execution_environments',
           screen: ExecutionEnvironments,
         },
       ],
     },
     {
-      groupTitle: i18n._(t`Settings`),
+      groupTitle: <Trans>Settings</Trans>,
       groupId: 'settings',
       routes: [
         {
-          title: i18n._(t`Settings`),
+          title: <Trans>Settings</Trans>,
           path: '/settings',
           screen: Settings,
         },
diff --git a/awx/ui_next/src/screens/ActivityStream/ActivityStream.jsx b/awx/ui_next/src/screens/ActivityStream/ActivityStream.jsx
index f67970ff90..b7751118d2 100644
--- a/awx/ui_next/src/screens/ActivityStream/ActivityStream.jsx
+++ b/awx/ui_next/src/screens/ActivityStream/ActivityStream.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useState, useEffect, useCallback } from 'react';
 import { useLocation, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Card,
@@ -29,7 +29,7 @@ import { ActivityStreamAPI } from '../../api';
 
 import ActivityStreamListItem from './ActivityStreamListItem';
 
-function ActivityStream({ i18n }) {
+function ActivityStream() {
   const { light } = PageSectionVariants;
 
   const [isTypeDropdownOpen, setIsTypeDropdownOpen] = useState(false);
@@ -116,10 +116,10 @@ function ActivityStream({ i18n }) {
         style={{ display: 'flex', justifyContent: 'space-between' }}
       >
         <Title size="2xl" headingLevel="h2">
-          {i18n._(t`Activity Stream`)}
+          {t`Activity Stream`}
         </Title>
         <span id="grouped-type-select-id" hidden>
-          {i18n._(t`Activity Stream type selector`)}
+          {t`Activity Stream type selector`}
         </span>
         <Select
           width="250px"
@@ -140,80 +140,80 @@ function ActivityStream({ i18n }) {
           isOpen={isTypeDropdownOpen}
           isGrouped
         >
-          <SelectGroup label={i18n._(t`Views`)} key="views">
+          <SelectGroup label={t`Views`} key="views">
             <SelectOption key="all_activity" value="all">
-              {i18n._(t`Dashboard (all activity)`)}
+              {t`Dashboard (all activity)`}
             </SelectOption>
             <SelectOption key="jobs" value="job">
-              {i18n._(t`Jobs`)}
+              {t`Jobs`}
             </SelectOption>
             <SelectOption key="schedules" value="schedule">
-              {i18n._(t`Schedules`)}
+              {t`Schedules`}
             </SelectOption>
             <SelectOption key="workflow_approvals" value="workflow_approval">
-              {i18n._(t`Workflow Approvals`)}
+              {t`Workflow Approvals`}
             </SelectOption>
           </SelectGroup>
-          <SelectGroup label={i18n._(t`Resources`)} key="resources">
+          <SelectGroup label={t`Resources`} key="resources">
             <SelectOption
               key="templates"
               value="job_template,workflow_job_template,workflow_job_template_node"
             >
-              {i18n._(t`Templates`)}
+              {t`Templates`}
             </SelectOption>
             <SelectOption key="credentials" value="credential">
-              {i18n._(t`Credentials`)}
+              {t`Credentials`}
             </SelectOption>
             <SelectOption key="projects" value="project">
-              {i18n._(t`Projects`)}
+              {t`Projects`}
             </SelectOption>
             <SelectOption key="inventories" value="inventory">
-              {i18n._(t`Inventories`)}
+              {t`Inventories`}
             </SelectOption>
             <SelectOption key="hosts" value="host">
-              {i18n._(t`Hosts`)}
+              {t`Hosts`}
             </SelectOption>
           </SelectGroup>
-          <SelectGroup label={i18n._(t`Access`)} key="access">
+          <SelectGroup label={t`Access`} key="access">
             <SelectOption key="organizations" value="organization">
-              {i18n._(t`Organizations`)}
+              {t`Organizations`}
             </SelectOption>
             <SelectOption key="users" value="user">
-              {i18n._(t`Users`)}
+              {t`Users`}
             </SelectOption>
             <SelectOption key="teams" value="team">
-              {i18n._(t`Teams`)}
+              {t`Teams`}
             </SelectOption>
           </SelectGroup>
-          <SelectGroup label={i18n._(t`Administration`)} key="administration">
+          <SelectGroup label={t`Administration`} key="administration">
             <SelectOption key="credential_types" value="credential_type">
-              {i18n._(t`Credential Types`)}
+              {t`Credential Types`}
             </SelectOption>
             <SelectOption
               key="notification_templates"
               value="notification_template"
             >
-              {i18n._(t`Notification Templates`)}
+              {t`Notification Templates`}
             </SelectOption>
             <SelectOption key="instance_groups" value="instance_group">
-              {i18n._(t`Instance Groups`)}
+              {t`Instance Groups`}
             </SelectOption>
             <SelectOption
               key="applications"
               value="o_auth2_application,o_auth2_access_token"
             >
-              {i18n._(t`Applications & Tokens`)}
+              {t`Applications & Tokens`}
             </SelectOption>
             <SelectOption
               key="execution_environments"
               value="execution_environment"
             >
-              {i18n._(t`Execution Environments`)}
+              {t`Execution Environments`}
             </SelectOption>
           </SelectGroup>
-          <SelectGroup label={i18n._(t`Settings`)} key="settings">
+          <SelectGroup label={t`Settings`} key="settings">
             <SelectOption key="settings" value="setting">
-              {i18n._(t`Settings`)}
+              {t`Settings`}
             </SelectOption>
           </SelectGroup>
         </Select>
@@ -225,26 +225,26 @@ function ActivityStream({ i18n }) {
             hasContentLoading={isLoading}
             items={results}
             itemCount={count}
-            pluralizedItemName={i18n._(t`Events`)}
+            pluralizedItemName={t`Events`}
             qsConfig={QS_CONFIG}
             toolbarSearchColumns={[
               {
-                name: i18n._(t`Keyword`),
+                name: t`Keyword`,
                 key: 'search',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Initiated by (username)`),
+                name: t`Initiated by (username)`,
                 key: 'actor__username__icontains',
               },
             ]}
             toolbarSortColumns={[
               {
-                name: i18n._(t`Time`),
+                name: t`Time`,
                 key: 'timestamp',
               },
               {
-                name: i18n._(t`Initiated by`),
+                name: t`Initiated by`,
                 key: 'actor__username',
               },
             ]}
@@ -252,12 +252,12 @@ function ActivityStream({ i18n }) {
             toolbarRelatedSearchableKeys={relatedSearchableKeys}
             headerRow={
               <HeaderRow qsConfig={QS_CONFIG}>
-                <HeaderCell sortKey="timestamp">{i18n._(t`Time`)}</HeaderCell>
+                <HeaderCell sortKey="timestamp">{t`Time`}</HeaderCell>
                 <HeaderCell sortKey="actor__username">
-                  {i18n._(t`Initiated by`)}
+                  {t`Initiated by`}
                 </HeaderCell>
-                <HeaderCell>{i18n._(t`Event`)}</HeaderCell>
-                <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
+                <HeaderCell>{t`Event`}</HeaderCell>
+                <HeaderCell>{t`Actions`}</HeaderCell>
               </HeaderRow>
             }
             renderToolbar={props => (
@@ -273,4 +273,4 @@ function ActivityStream({ i18n }) {
   );
 }
 
-export default withI18n()(ActivityStream);
+export default ActivityStream;
diff --git a/awx/ui_next/src/screens/ActivityStream/ActivityStreamDescription.jsx b/awx/ui_next/src/screens/ActivityStream/ActivityStreamDescription.jsx
index 517491797a..a4c1994446 100644
--- a/awx/ui_next/src/screens/ActivityStream/ActivityStreamDescription.jsx
+++ b/awx/ui_next/src/screens/ActivityStream/ActivityStreamDescription.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
 
 const buildAnchor = (obj, resource, activity) => {
   let url;
@@ -151,7 +150,7 @@ const buildLabeledLink = (label, link) => {
   );
 };
 
-function ActivityStreamDescription({ i18n, activity }) {
+function ActivityStreamDescription({ activity }) {
   const labeledLinks = [];
   // Activity stream objects will outlive the resources they reference
   // in that case, summary_fields will not be available - show generic error text instead
@@ -511,18 +510,18 @@ function ActivityStreamDescription({ i18n, activity }) {
             ) {
               let operationText = '';
               if (activity.changes.status[1] === 'successful') {
-                operationText = i18n._(t`approved`);
+                operationText = t`approved`;
               } else if (activity.changes.status[1] === 'failed') {
                 if (
                   activity.changes.timed_out &&
                   activity.changes.timed_out[1] === true
                 ) {
-                  operationText = i18n._(t`timed out`);
+                  operationText = t`timed out`;
                 } else {
-                  operationText = i18n._(t`denied`);
+                  operationText = t`denied`;
                 }
               } else {
-                operationText = i18n._(t`updated`);
+                operationText = t`updated`;
               }
               labeledLinks.push(
                 buildLabeledLink(
@@ -561,7 +560,7 @@ function ActivityStreamDescription({ i18n, activity }) {
         break;
     }
   } catch (err) {
-    return <span>{i18n._(t`Event summary not available`)}</span>;
+    return <span>{t`Event summary not available`}</span>;
   }
 
   return (
@@ -581,4 +580,4 @@ function ActivityStreamDescription({ i18n, activity }) {
   );
 }
 
-export default withI18n()(ActivityStreamDescription);
+export default ActivityStreamDescription;
diff --git a/awx/ui_next/src/screens/ActivityStream/ActivityStreamDetailButton.jsx b/awx/ui_next/src/screens/ActivityStream/ActivityStreamDetailButton.jsx
index 12fc841f07..395a8cb43c 100644
--- a/awx/ui_next/src/screens/ActivityStream/ActivityStreamDetailButton.jsx
+++ b/awx/ui_next/src/screens/ActivityStream/ActivityStreamDetailButton.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Modal } from '@patternfly/react-core';
 import { SearchPlusIcon } from '@patternfly/react-icons';
@@ -9,7 +9,7 @@ import { formatDateString } from '../../util/dates';
 import { DetailList, Detail } from '../../components/DetailList';
 import { VariablesDetail } from '../../components/CodeEditor';
 
-function ActivityStreamDetailButton({ i18n, streamItem, user, description }) {
+function ActivityStreamDetailButton({ streamItem, user, description }) {
   const [isOpen, setIsOpen] = useState(false);
 
   const setting = streamItem?.summary_fields?.setting;
@@ -22,7 +22,7 @@ function ActivityStreamDetailButton({ i18n, streamItem, user, description }) {
     <>
       <Button
         ouiaId={`${streamItem.id}-view-details-button`}
-        aria-label={i18n._(t`View event details`)}
+        aria-label={t`View event details`}
         variant="plain"
         component="button"
         onClick={() => setIsOpen(true)}
@@ -32,28 +32,25 @@ function ActivityStreamDetailButton({ i18n, streamItem, user, description }) {
       <Modal
         variant="large"
         isOpen={isOpen}
-        title={i18n._(t`Event detail`)}
-        aria-label={i18n._(t`Event detail modal`)}
+        title={t`Event detail`}
+        aria-label={t`Event detail modal`}
         onClose={() => setIsOpen(false)}
       >
         <DetailList gutter="sm">
           <Detail
-            label={i18n._(t`Time`)}
+            label={t`Time`}
             value={formatDateString(streamItem.timestamp)}
           />
-          <Detail label={i18n._(t`Initiated by`)} value={user} />
+          <Detail label={t`Initiated by`} value={user} />
           <Detail
-            label={i18n._(t`Setting category`)}
+            label={t`Setting category`}
             value={setting && setting[0]?.category}
           />
-          <Detail
-            label={i18n._(t`Setting name`)}
-            value={setting && setting[0]?.name}
-          />
-          <Detail fullWidth label={i18n._(t`Action`)} value={description} />
+          <Detail label={t`Setting name`} value={setting && setting[0]?.name} />
+          <Detail fullWidth label={t`Action`} value={description} />
           {streamItem?.changes && (
             <VariablesDetail
-              label={i18n._(t`Changes`)}
+              label={t`Changes`}
               rows={changeRows}
               value={streamItem?.changes}
             />
@@ -64,4 +61,4 @@ function ActivityStreamDetailButton({ i18n, streamItem, user, description }) {
   );
 }
 
-export default withI18n()(ActivityStreamDetailButton);
+export default ActivityStreamDetailButton;
diff --git a/awx/ui_next/src/screens/ActivityStream/ActivityStreamListItem.jsx b/awx/ui_next/src/screens/ActivityStream/ActivityStreamListItem.jsx
index c5463565bb..f5c0d8c7a8 100644
--- a/awx/ui_next/src/screens/ActivityStream/ActivityStreamListItem.jsx
+++ b/awx/ui_next/src/screens/ActivityStream/ActivityStreamListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shape } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { Tr, Td } from '@patternfly/react-table';
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
@@ -11,7 +11,7 @@ import { ActionsTd, ActionItem } from '../../components/PaginatedTable';
 import ActivityStreamDetailButton from './ActivityStreamDetailButton';
 import ActivityStreamDescription from './ActivityStreamDescription';
 
-function ActivityStreamListItem({ streamItem, i18n }) {
+function ActivityStreamListItem({ streamItem }) {
   ActivityStreamListItem.propTypes = {
     streamItem: shape({}).isRequired,
   };
@@ -25,9 +25,9 @@ function ActivityStreamListItem({ streamItem, i18n }) {
         </Link>
       );
     } else if (item?.summary_fields?.actor) {
-      link = i18n._(t`${item.summary_fields.actor.username} (deleted)`);
+      link = t`${item.summary_fields.actor.username} (deleted)`;
     } else {
-      link = i18n._(t`system`);
+      link = t`system`;
     }
     return link;
   };
@@ -39,15 +39,15 @@ function ActivityStreamListItem({ streamItem, i18n }) {
   return (
     <Tr id={streamItem.id} aria-labelledby={labelId}>
       <Td />
-      <Td dataLabel={i18n._(t`Time`)}>
+      <Td dataLabel={t`Time`}>
         {streamItem.timestamp ? formatDateString(streamItem.timestamp) : ''}
       </Td>
-      <Td dataLabel={i18n._(t`Initiated By`)}>{user}</Td>
-      <Td id={labelId} dataLabel={i18n._(t`Event`)}>
+      <Td dataLabel={t`Initiated By`}>{user}</Td>
+      <Td id={labelId} dataLabel={t`Event`}>
         {description}
       </Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)}>
-        <ActionItem visible tooltip={i18n._(t`View event details`)}>
+      <ActionsTd dataLabel={t`Actions`}>
+        <ActionItem visible tooltip={t`View event details`}>
           <ActivityStreamDetailButton
             streamItem={streamItem}
             user={user}
@@ -58,4 +58,4 @@ function ActivityStreamListItem({ streamItem, i18n }) {
     </Tr>
   );
 }
-export default withI18n()(ActivityStreamListItem);
+export default ActivityStreamListItem;
diff --git a/awx/ui_next/src/screens/Application/Application/Application.jsx b/awx/ui_next/src/screens/Application/Application/Application.jsx
index 2414d8b4c3..6bdf8a3404 100644
--- a/awx/ui_next/src/screens/Application/Application/Application.jsx
+++ b/awx/ui_next/src/screens/Application/Application/Application.jsx
@@ -8,7 +8,7 @@ import {
   Link,
 } from 'react-router-dom';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 
@@ -20,7 +20,7 @@ import ApplicationDetails from '../ApplicationDetails';
 import ApplicationTokens from '../ApplicationTokens';
 import RoutedTabs from '../../../components/RoutedTabs';
 
-function Application({ setBreadcrumb, i18n }) {
+function Application({ setBreadcrumb }) {
   const { id } = useParams();
   const { pathname } = useLocation();
   const {
@@ -68,14 +68,14 @@ function Application({ setBreadcrumb, i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to applications`)}
+          {t`Back to applications`}
         </>
       ),
       link: '/applications',
       id: 0,
     },
-    { name: i18n._(t`Details`), link: `/applications/${id}/details`, id: 1 },
-    { name: i18n._(t`Tokens`), link: `/applications/${id}/tokens`, id: 2 },
+    { name: t`Details`, link: `/applications/${id}/details`, id: 1 },
+    { name: t`Tokens`, link: `/applications/${id}/tokens`, id: 2 },
   ];
 
   let cardHeader = <RoutedTabs tabsArray={tabsArray} />;
@@ -90,10 +90,8 @@ function Application({ setBreadcrumb, i18n }) {
           <ContentError error={error}>
             {error.response?.status === 404 && (
               <span>
-                {i18n._(t`Application not found.`)}{' '}
-                <Link to="/applications">
-                  {i18n._(t`View all applications.`)}
-                </Link>
+                {t`Application not found.`}{' '}
+                <Link to="/applications">{t`View all applications.`}</Link>
               </span>
             )}
           </ContentError>
@@ -138,4 +136,4 @@ function Application({ setBreadcrumb, i18n }) {
     </PageSection>
   );
 }
-export default withI18n()(Application);
+export default Application;
diff --git a/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.jsx b/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.jsx
index 4960ad09c2..923e6f9a24 100644
--- a/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.jsx
+++ b/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link, useHistory } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
@@ -17,7 +17,6 @@ import DeleteButton from '../../../components/DeleteButton';
 import ErrorDetail from '../../../components/ErrorDetail';
 
 function ApplicationDetails({
-  i18n,
   application,
   authorizationOptions,
   clientTypeOptions,
@@ -60,17 +59,17 @@ function ApplicationDetails({
     <CardBody>
       <DetailList>
         <Detail
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={application.name}
           dataCy="app-detail-name"
         />
         <Detail
-          label={i18n._(t`Description`)}
+          label={t`Description`}
           value={application.description}
           dataCy="app-detail-description"
         />
         <Detail
-          label={i18n._(t`Organization`)}
+          label={t`Organization`}
           value={
             <Link
               to={`/organizations/${application.summary_fields.organization.id}/details`}
@@ -81,32 +80,29 @@ function ApplicationDetails({
           dataCy="app-detail-organization"
         />
         <Detail
-          label={i18n._(t`Authorization grant type`)}
+          label={t`Authorization grant type`}
           value={getAuthorizationGrantType(
             application.authorization_grant_type
           )}
           dataCy="app-detail-authorization-grant-type"
         />
         <Detail
-          label={i18n._(t`Client ID`)}
+          label={t`Client ID`}
           value={application.client_id}
           dataCy="app-detail-client-id"
         />
         <Detail
-          label={i18n._(t`Redirect uris`)}
+          label={t`Redirect uris`}
           value={application.redirect_uris}
           dataCy="app-detail-redirect-uris"
         />
         <Detail
-          label={i18n._(t`Client type`)}
+          label={t`Client type`}
           value={getClientType(application.client_type)}
           dataCy="app-detail-client-type"
         />
-        <UserDateDetail label={i18n._(t`Created`)} date={application.created} />
-        <UserDateDetail
-          label={i18n._(t`Last Modified`)}
-          date={application.modified}
-        />
+        <UserDateDetail label={t`Created`} date={application.created} />
+        <UserDateDetail label={t`Last Modified`} date={application.modified} />
       </DetailList>
       <CardActionsRow>
         {application.summary_fields.user_capabilities &&
@@ -115,20 +111,20 @@ function ApplicationDetails({
               ouiaId="application-details-edit-button"
               component={Link}
               to={`/applications/${application.id}/edit`}
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
         {application.summary_fields.user_capabilities &&
           application.summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={application.name}
-              modalTitle={i18n._(t`Delete application`)}
+              modalTitle={t`Delete application`}
               onConfirm={deleteApplications}
               isDisabled={deleteLoading}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -136,14 +132,14 @@ function ApplicationDetails({
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete application.`)}
+          {t`Failed to delete application.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
     </CardBody>
   );
 }
-export default withI18n()(ApplicationDetails);
+export default ApplicationDetails;
diff --git a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.jsx b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.jsx
index 018829623d..02f17863a4 100644
--- a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.jsx
+++ b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenList.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import PaginatedDataList, {
   ToolbarDeleteButton,
 } from '../../../components/PaginatedDataList';
@@ -20,7 +20,7 @@ const QS_CONFIG = getQSConfig('applications', {
   order_by: 'user__username',
 });
 
-function ApplicationTokenList({ i18n }) {
+function ApplicationTokenList() {
   const { id } = useParams();
   const location = useLocation();
   const {
@@ -100,35 +100,35 @@ function ApplicationTokenList({ i18n }) {
         hasContentLoading={isLoading || deleteLoading}
         items={tokens}
         itemCount={itemCount}
-        pluralizedItemName={i18n._(t`Tokens`)}
+        pluralizedItemName={t`Tokens`}
         qsConfig={QS_CONFIG}
         onRowClick={handleSelect}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'user__username__icontains',
             isDefault: true,
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'user__username',
           },
           {
-            name: i18n._(t`Scope`),
+            name: t`Scope`,
             key: 'scope',
           },
           {
-            name: i18n._(t`Expiration`),
+            name: t`Expiration`,
             key: 'expires',
           },
           {
-            name: i18n._(t`Created`),
+            name: t`Created`,
             key: 'created',
           },
           {
-            name: i18n._(t`Modified`),
+            name: t`Modified`,
             key: 'modified',
           },
         ]}
@@ -148,7 +148,7 @@ function ApplicationTokenList({ i18n }) {
                 key="delete"
                 onDelete={handleDelete}
                 itemsToDelete={selected}
-                pluralizedItemName={i18n._(t`Tokens`)}
+                pluralizedItemName={t`Tokens`}
               />,
             ]}
           />
@@ -167,14 +167,14 @@ function ApplicationTokenList({ i18n }) {
       <AlertModal
         isOpen={deletionError}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={clearDeletionError}
       >
-        {i18n._(t`Failed to delete one or more tokens.`)}
+        {t`Failed to delete one or more tokens.`}
         <ErrorDetail error={deletionError} />
       </AlertModal>
     </>
   );
 }
 
-export default withI18n()(ApplicationTokenList);
+export default ApplicationTokenList;
diff --git a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenListItem.jsx b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenListItem.jsx
index 142561ea7e..7a32738f83 100644
--- a/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenListItem.jsx
+++ b/awx/ui_next/src/screens/Application/ApplicationTokens/ApplicationTokenListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import {
@@ -20,13 +20,7 @@ const Label = styled.b`
   margin-right: 20px;
 `;
 
-function ApplicationTokenListItem({
-  token,
-  isSelected,
-  onSelect,
-  detailUrl,
-  i18n,
-}) {
+function ApplicationTokenListItem({ token, isSelected, onSelect, detailUrl }) {
   const labelId = `check-action-${token.id}`;
   return (
     <DataListItem key={token.id} aria-labelledby={labelId} id={`${token.id}`}>
@@ -39,17 +33,17 @@ function ApplicationTokenListItem({
         />
         <DataListItemCells
           dataListCells={[
-            <DataListCell key="divider" aria-label={i18n._(t`token name`)}>
+            <DataListCell key="divider" aria-label={t`token name`}>
               <Link to={`${detailUrl}`}>
                 <b>{token.summary_fields.user.username}</b>
               </Link>
             </DataListCell>,
-            <DataListCell key="scope" aria-label={i18n._(t`scope`)}>
-              <Label>{i18n._(t`Scope`)}</Label>
+            <DataListCell key="scope" aria-label={t`scope`}>
+              <Label>{t`Scope`}</Label>
               <span>{toTitleCase(token.scope)}</span>
             </DataListCell>,
-            <DataListCell key="expiration" aria-label={i18n._(t`expiration`)}>
-              <Label>{i18n._(t`Expiration`)}</Label>
+            <DataListCell key="expiration" aria-label={t`expiration`}>
+              <Label>{t`Expiration`}</Label>
               <span>{formatDateString(token.expires)}</span>
             </DataListCell>,
           ]}
@@ -66,4 +60,4 @@ ApplicationTokenListItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(ApplicationTokenListItem);
+export default ApplicationTokenListItem;
diff --git a/awx/ui_next/src/screens/Application/Applications.jsx b/awx/ui_next/src/screens/Application/Applications.jsx
index ae6fa94af1..dbffa80f1c 100644
--- a/awx/ui_next/src/screens/Application/Applications.jsx
+++ b/awx/ui_next/src/screens/Application/Applications.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import { Route, Switch } from 'react-router-dom';
@@ -19,29 +19,26 @@ const ApplicationAlert = styled(Alert)`
   margin-bottom: 20px;
 `;
 
-function Applications({ i18n }) {
+function Applications() {
   const [applicationModalSource, setApplicationModalSource] = useState(null);
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/applications': i18n._(t`Applications`),
-    '/applications/add': i18n._(t`Create New Application`),
+    '/applications': t`Applications`,
+    '/applications/add': t`Create New Application`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    application => {
-      if (!application) {
-        return;
-      }
-      setBreadcrumbConfig({
-        '/applications': i18n._(t`Applications`),
-        '/applications/add': i18n._(t`Create New Application`),
-        [`/applications/${application.id}`]: `${application.name}`,
-        [`/applications/${application.id}/edit`]: i18n._(t`Edit Details`),
-        [`/applications/${application.id}/details`]: i18n._(t`Details`),
-        [`/applications/${application.id}/tokens`]: i18n._(t`Tokens`),
-      });
-    },
-    [i18n]
-  );
+  const buildBreadcrumbConfig = useCallback(application => {
+    if (!application) {
+      return;
+    }
+    setBreadcrumbConfig({
+      '/applications': t`Applications`,
+      '/applications/add': t`Create New Application`,
+      [`/applications/${application.id}`]: `${application.name}`,
+      [`/applications/${application.id}/edit`]: t`Edit Details`,
+      [`/applications/${application.id}/details`]: t`Details`,
+      [`/applications/${application.id}/tokens`]: t`Tokens`,
+    });
+  }, []);
 
   return (
     <>
@@ -64,29 +61,24 @@ function Applications({ i18n }) {
       </Switch>
       {applicationModalSource && (
         <Modal
-          aria-label={i18n._(t`Application information`)}
+          aria-label={t`Application information`}
           isOpen
           variant="medium"
-          title={i18n._(t`Application information`)}
+          title={t`Application information`}
           onClose={() => setApplicationModalSource(null)}
         >
           {applicationModalSource.client_secret && (
             <ApplicationAlert
               variant="info"
               isInline
-              title={i18n._(
-                t`This is the only time the client secret will be shown.`
-              )}
+              title={t`This is the only time the client secret will be shown.`}
             />
           )}
           <DetailList stacked>
-            <Detail
-              label={i18n._(t`Name`)}
-              value={applicationModalSource.name}
-            />
+            <Detail label={t`Name`} value={applicationModalSource.name} />
             {applicationModalSource.client_id && (
               <Detail
-                label={i18n._(t`Client ID`)}
+                label={t`Client ID`}
                 value={
                   <ClipboardCopy
                     isReadOnly
@@ -99,7 +91,7 @@ function Applications({ i18n }) {
             )}
             {applicationModalSource.client_secret && (
               <Detail
-                label={i18n._(t`Client secret`)}
+                label={t`Client secret`}
                 value={
                   <ClipboardCopy
                     isReadOnly
@@ -117,4 +109,4 @@ function Applications({ i18n }) {
   );
 }
 
-export default withI18n()(Applications);
+export default Applications;
diff --git a/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationListItem.jsx b/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationListItem.jsx
index bb21d76622..e1f935c8fa 100644
--- a/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationListItem.jsx
+++ b/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { Button } from '@patternfly/react-core';
 import { Tr, Td } from '@patternfly/react-table';
 import { t } from '@lingui/macro';
@@ -16,7 +16,6 @@ function ApplicationListItem({
   onSelect,
   detailUrl,
   rowIndex,
-  i18n,
 }) {
   const labelId = `check-action-${application.id}`;
   return (
@@ -27,31 +26,31 @@ function ApplicationListItem({
           isSelected,
           onSelect,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
           <b>{application.name}</b>
         </Link>
       </Td>
-      <Td dataLabel={i18n._(t`Organization`)}>
+      <Td dataLabel={t`Organization`}>
         <Link
           to={`/organizations/${application.summary_fields.organization.id}`}
         >
           <b>{application.summary_fields.organization.name}</b>
         </Link>
       </Td>
-      <Td dataLabel={i18n._(t`Last Modified`)}>
+      <Td dataLabel={t`Last Modified`}>
         {formatDateString(application.modified)}
       </Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)}>
+      <ActionsTd dataLabel={t`Actions`}>
         <ActionItem
           visible={application.summary_fields.user_capabilities.edit}
-          tooltip={i18n._(t`Edit application`)}
+          tooltip={t`Edit application`}
         >
           <Button
             ouiaId={`${application.id}-edit-button`}
-            aria-label={i18n._(t`Edit application`)}
+            aria-label={t`Edit application`}
             variant="plain"
             component={Link}
             to={`/applications/${application.id}/edit`}
@@ -71,4 +70,4 @@ ApplicationListItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(ApplicationListItem);
+export default ApplicationListItem;
diff --git a/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.jsx b/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.jsx
index 5ed5e092da..23af1fb071 100644
--- a/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.jsx
+++ b/awx/ui_next/src/screens/Application/ApplicationsList/ApplicationsList.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { useLocation, useRouteMatch } from 'react-router-dom';
 
 import { Card, PageSection } from '@patternfly/react-core';
@@ -28,7 +28,7 @@ const QS_CONFIG = getQSConfig('applications', {
   page_size: 20,
   order_by: 'name',
 });
-function ApplicationsList({ i18n }) {
+function ApplicationsList() {
   const location = useLocation();
   const match = useRouteMatch();
 
@@ -113,17 +113,17 @@ function ApplicationsList({ i18n }) {
             hasContentLoading={isLoading || deleteLoading}
             items={applications}
             itemCount={itemCount}
-            pluralizedItemName={i18n._(t`Applications`)}
+            pluralizedItemName={t`Applications`}
             qsConfig={QS_CONFIG}
             onRowClick={handleSelect}
             toolbarSearchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Description`),
+                name: t`Description`,
                 key: 'description__icontains',
               },
             ]}
@@ -151,19 +151,19 @@ function ApplicationsList({ i18n }) {
                     key="delete"
                     onDelete={handleDeleteApplications}
                     itemsToDelete={selected}
-                    pluralizedItemName={i18n._(t`Applications`)}
+                    pluralizedItemName={t`Applications`}
                   />,
                 ]}
               />
             )}
             headerRow={
               <HeaderRow qsConfig={QS_CONFIG}>
-                <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
+                <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
                 <HeaderCell sortKey="organization">
-                  {i18n._(t`Organization`)}
+                  {t`Organization`}
                 </HeaderCell>
-                <HeaderCell>{i18n._(t`Last Modified`)}</HeaderCell>
-                <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
+                <HeaderCell>{t`Last Modified`}</HeaderCell>
+                <HeaderCell>{t`Actions`}</HeaderCell>
               </HeaderRow>
             }
             renderRow={(application, index) => (
@@ -188,13 +188,13 @@ function ApplicationsList({ i18n }) {
       <AlertModal
         isOpen={deletionError}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={clearDeletionError}
       >
-        {i18n._(t`Failed to delete one or more applications.`)}
+        {t`Failed to delete one or more applications.`}
         <ErrorDetail error={deletionError} />
       </AlertModal>
     </>
   );
 }
-export default withI18n()(ApplicationsList);
+export default ApplicationsList;
diff --git a/awx/ui_next/src/screens/Application/shared/ApplicationForm.jsx b/awx/ui_next/src/screens/Application/shared/ApplicationForm.jsx
index 75be8595fb..5f37614fbe 100644
--- a/awx/ui_next/src/screens/Application/shared/ApplicationForm.jsx
+++ b/awx/ui_next/src/screens/Application/shared/ApplicationForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik, useField, useFormikContext } from 'formik';
 import { Form, FormGroup } from '@patternfly/react-core';
@@ -15,7 +15,6 @@ import AnsibleSelect from '../../../components/AnsibleSelect';
 import Popover from '../../../components/Popover';
 
 function ApplicationFormFields({
-  i18n,
   application,
   authorizationOptions,
   clientTypeOptions,
@@ -24,7 +23,7 @@ function ApplicationFormFields({
   const { setFieldValue } = useFormikContext();
   const [organizationField, organizationMeta, organizationHelpers] = useField({
     name: 'organization',
-    validate: required(null, i18n),
+    validate: required(null),
   });
   const [
     authorizationTypeField,
@@ -32,12 +31,12 @@ function ApplicationFormFields({
     authorizationTypeHelpers,
   ] = useField({
     name: 'authorization_grant_type',
-    validate: required(null, i18n),
+    validate: required(null),
   });
 
   const [clientTypeField, clientTypeMeta, clientTypeHelpers] = useField({
     name: 'client_type',
-    validate: required(null, i18n),
+    validate: required(null),
   });
 
   const onOrganizationChange = useCallback(
@@ -51,15 +50,15 @@ function ApplicationFormFields({
     <>
       <FormField
         id="name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
@@ -81,12 +80,10 @@ function ApplicationFormFields({
             : 'error'
         }
         isRequired
-        label={i18n._(t`Authorization grant type`)}
+        label={t`Authorization grant type`}
         labelIcon={
           <Popover
-            content={i18n._(
-              t`The Grant type the user must use for acquire tokens for this application`
-            )}
+            content={t`The Grant type the user must use for acquire tokens for this application`}
           />
         }
       >
@@ -105,7 +102,7 @@ function ApplicationFormFields({
       </FormGroup>
       <FormField
         id="redirect_uris"
-        label={i18n._(t`Redirect URIs`)}
+        label={t`Redirect URIs`}
         name="redirect_uris"
         type="text"
         isRequired={Boolean(
@@ -113,10 +110,10 @@ function ApplicationFormFields({
         )}
         validate={
           authorizationTypeField.value === 'authorization-code'
-            ? required(null, i18n)
+            ? required(null)
             : null
         }
-        tooltip={i18n._(t`Allowed URIs list, space separated`)}
+        tooltip={t`Allowed URIs list, space separated`}
       />
       <FormGroup
         fieldId="clientType"
@@ -125,12 +122,10 @@ function ApplicationFormFields({
           !clientTypeMeta.touched || !clientTypeMeta.error ? 'default' : 'error'
         }
         isRequired
-        label={i18n._(t`Client type`)}
+        label={t`Client type`}
         labelIcon={
           <Popover
-            content={i18n._(
-              t`Set to Public or Confidential depending on how secure the client device is.`
-            )}
+            content={t`Set to Public or Confidential depending on how secure the client device is.`}
           />
         }
       >
@@ -150,7 +145,7 @@ function ApplicationFormFields({
 function ApplicationForm({
   onCancel,
   onSubmit,
-  i18n,
+
   submitError,
   application,
   authorizationOptions,
@@ -175,7 +170,6 @@ function ApplicationForm({
               application={application}
               authorizationOptions={authorizationOptions}
               clientTypeOptions={clientTypeOptions}
-              i18n={i18n}
             />
             {submitError && <FormSubmitError error={submitError} />}
             <FormActionGroup
@@ -196,4 +190,4 @@ ApplicationForm.propTypes = {
   clientTypeOptions: PropTypes.arrayOf(PropTypes.object).isRequired,
 };
 
-export default withI18n()(ApplicationForm);
+export default ApplicationForm;
diff --git a/awx/ui_next/src/screens/Credential/Credential.jsx b/awx/ui_next/src/screens/Credential/Credential.jsx
index 42c18a0d41..b2e07ed137 100644
--- a/awx/ui_next/src/screens/Credential/Credential.jsx
+++ b/awx/ui_next/src/screens/Credential/Credential.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 import {
@@ -19,7 +19,7 @@ import CredentialDetail from './CredentialDetail';
 import CredentialEdit from './CredentialEdit';
 import { CredentialsAPI } from '../../api';
 
-function Credential({ i18n, setBreadcrumb }) {
+function Credential({ setBreadcrumb }) {
   const [credential, setCredential] = useState(null);
   const [contentError, setContentError] = useState(null);
   const [hasContentLoading, setHasContentLoading] = useState(true);
@@ -49,15 +49,15 @@ function Credential({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Credentials`)}
+          {t`Back to Credentials`}
         </>
       ),
       link: `/credentials`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `/credentials/${id}/details`, id: 0 },
+    { name: t`Details`, link: `/credentials/${id}/details`, id: 0 },
     {
-      name: i18n._(t`Access`),
+      name: t`Access`,
       link: `/credentials/${id}/access`,
       id: 1,
     },
@@ -76,10 +76,8 @@ function Credential({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response && contentError.response.status === 404 && (
               <span>
-                {i18n._(t`Credential not found.`)}{' '}
-                <Link to="/credentials">
-                  {i18n._(t`View all Credentials.`)}
-                </Link>
+                {t`Credential not found.`}{' '}
+                <Link to="/credentials">{t`View all Credentials.`}</Link>
               </span>
             )}
           </ContentError>
@@ -116,7 +114,7 @@ function Credential({ i18n, setBreadcrumb }) {
                 <ContentError isNotFound>
                   {match.params.id && (
                     <Link to={`/credentials/${match.params.id}/details`}>
-                      {i18n._(t`View Credential Details`)}
+                      {t`View Credential Details`}
                     </Link>
                   )}
                 </ContentError>
@@ -128,7 +126,7 @@ function Credential({ i18n, setBreadcrumb }) {
               <ContentError isNotFound>
                 {id && (
                   <Link to={`/credentials/${id}/details`}>
-                    {i18n._(t`View Credential Details`)}
+                    {t`View Credential Details`}
                   </Link>
                 )}
               </ContentError>
@@ -140,4 +138,4 @@ function Credential({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(Credential);
+export default Credential;
diff --git a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx
index 35444cf311..6c74f82767 100644
--- a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx
@@ -1,8 +1,7 @@
 import React, { Fragment, useEffect, useCallback } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
-import { shape } from 'prop-types';
 import styled from 'styled-components';
 import { Button, List, ListItem } from '@patternfly/react-core';
 import AlertModal from '../../../components/AlertModal';
@@ -32,7 +31,7 @@ const PluginFieldText = styled.p`
   margin-top: 10px;
 `;
 
-function CredentialDetail({ i18n, credential }) {
+function CredentialDetail({ credential }) {
   const {
     id: credentialId,
     name,
@@ -138,7 +137,7 @@ function CredentialDetail({ i18n, credential }) {
           dataCy={`credential-${id}-detail`}
           id={`credential-${id}-detail`}
           key={id}
-          label={i18n._(t`Options`)}
+          label={t`Options`}
           value={<List>{inputs[id] && <ListItem>{label}</ListItem>}</List>}
         />
       );
@@ -151,7 +150,7 @@ function CredentialDetail({ i18n, credential }) {
           id={`credential-${id}-detail`}
           key={id}
           label={label}
-          value={i18n._(t`Encrypted`)}
+          value={t`Encrypted`}
           isEncrypted
         />
       );
@@ -164,7 +163,7 @@ function CredentialDetail({ i18n, credential }) {
           id={`credential-${id}-detail`}
           key={id}
           label={label}
-          value={i18n._(t`Prompt on launch`)}
+          value={t`Prompt on launch`}
         />
       );
     }
@@ -202,20 +201,20 @@ function CredentialDetail({ i18n, credential }) {
         <Detail
           dataCy="credential-name-detail"
           id="credential-name-detail"
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={name}
         />
         <Detail
           dataCy="credential-description-detail"
           id="credential-description-detail"
-          label={i18n._(t`Description`)}
+          label={t`Description`}
           value={description}
         />
         {organization && (
           <Detail
             dataCy="credential-organization-detail"
             id="credential-organization-detail"
-            label={i18n._(t`Organization`)}
+            label={t`Organization`}
             value={
               <Link to={`/organizations/${organization.id}/details`}>
                 {organization.name}
@@ -226,7 +225,7 @@ function CredentialDetail({ i18n, credential }) {
         <Detail
           dataCy="credential-credential_type-detail"
           id="credential-credential_type-detail"
-          label={i18n._(t`Credential Type`)}
+          label={t`Credential Type`}
           value={
             managedByTower ? (
               credential_type.name
@@ -243,23 +242,21 @@ function CredentialDetail({ i18n, credential }) {
         <UserDateDetail
           dataCy="credential-created-detail"
           id="credential-created-detail"
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={created}
           user={created_by}
         />
         <UserDateDetail
           dataCy="credential-last_modified-detail"
           id="credential-last_modified-detail"
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={modified}
           user={modified_by}
         />
       </DetailList>
       {Object.keys(inputSources).length > 0 && (
         <PluginFieldText>
-          {i18n._(
-            t`* This field will be retrieved from an external secret management system using the specified credential.`
-          )}
+          {t`* This field will be retrieved from an external secret management system using the specified credential.`}
         </PluginFieldText>
       )}
       <CardActionsRow>
@@ -269,22 +266,20 @@ function CredentialDetail({ i18n, credential }) {
             component={Link}
             to={`/credentials/${credentialId}/edit`}
           >
-            {i18n._(t`Edit`)}
+            {t`Edit`}
           </Button>
         )}
         {user_capabilities.delete && (
           <DeleteButton
             name={name}
             itemToDelete={credential}
-            modalTitle={i18n._(t`Delete Credential`)}
+            modalTitle={t`Delete Credential`}
             onConfirm={deleteCredential}
             isLoading={isLoading}
             deleteDetailsRequests={deleteDetailsRequests}
-            deleteMessage={i18n._(
-              t`This credential is currently being used by other resources. Are you sure you want to delete it?`
-            )}
+            deleteMessage={t`This credential is currently being used by other resources. Are you sure you want to delete it?`}
           >
-            {i18n._(t`Delete`)}
+            {t`Delete`}
           </DeleteButton>
         )}
       </CardActionsRow>
@@ -292,10 +287,10 @@ function CredentialDetail({ i18n, credential }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete credential.`)}
+          {t`Failed to delete credential.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -305,7 +300,6 @@ function CredentialDetail({ i18n, credential }) {
 
 CredentialDetail.propTypes = {
   credential: Credential.isRequired,
-  i18n: shape({}).isRequired,
 };
 
-export default withI18n()(CredentialDetail);
+export default CredentialDetail;
diff --git a/awx/ui_next/src/screens/Credential/CredentialList/CredentialListItem.jsx b/awx/ui_next/src/screens/Credential/CredentialList/CredentialListItem.jsx
index 78bc9b74e4..547ac51cf2 100644
--- a/awx/ui_next/src/screens/Credential/CredentialList/CredentialListItem.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialList/CredentialListItem.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
@@ -18,7 +18,7 @@ function CredentialListItem({
   detailUrl,
   isSelected,
   onSelect,
-  i18n,
+
   fetchCredentials,
   rowIndex,
 }) {
@@ -50,22 +50,22 @@ function CredentialListItem({
           isSelected,
           onSelect,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
           <b>{credential.name}</b>
         </Link>
       </Td>
-      <Td dataLabel={i18n._(t`Type`)}>
+      <Td dataLabel={t`Type`}>
         {credential.summary_fields.credential_type.name}
       </Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)}>
-        <ActionItem visible={canEdit} tooltip={i18n._(t`Edit Credential`)}>
+      <ActionsTd dataLabel={t`Actions`}>
+        <ActionItem visible={canEdit} tooltip={t`Edit Credential`}>
           <Button
             ouiaId={`${credential.id}-edit-button`}
             isDisabled={isDisabled}
-            aria-label={i18n._(t`Edit Credential`)}
+            aria-label={t`Edit Credential`}
             variant="plain"
             component={Link}
             to={`/credentials/${credential.id}/edit`}
@@ -74,7 +74,7 @@ function CredentialListItem({
           </Button>
         </ActionItem>
         <ActionItem
-          tooltip={i18n._(t`Copy Credential`)}
+          tooltip={t`Copy Credential`}
           visible={credential.summary_fields.user_capabilities.copy}
         >
           <CopyButton
@@ -82,7 +82,7 @@ function CredentialListItem({
             onCopyStart={handleCopyStart}
             onCopyFinish={handleCopyFinish}
             copyItem={copyCredential}
-            errorMessage={i18n._(t`Failed to copy credential.`)}
+            errorMessage={t`Failed to copy credential.`}
           />
         </ActionItem>
       </ActionsTd>
@@ -97,4 +97,4 @@ CredentialListItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(CredentialListItem);
+export default CredentialListItem;
diff --git a/awx/ui_next/src/screens/Credential/Credentials.jsx b/awx/ui_next/src/screens/Credential/Credentials.jsx
index d883aa0dca..5d1624cb69 100644
--- a/awx/ui_next/src/screens/Credential/Credentials.jsx
+++ b/awx/ui_next/src/screens/Credential/Credentials.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Config } from '../../contexts/Config';
 import ScreenHeader from '../../components/ScreenHeader';
@@ -8,29 +8,26 @@ import Credential from './Credential';
 import CredentialAdd from './CredentialAdd';
 import { CredentialList } from './CredentialList';
 
-function Credentials({ i18n }) {
+function Credentials() {
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/credentials': i18n._(t`Credentials`),
-    '/credentials/add': i18n._(t`Create New Credential`),
+    '/credentials': t`Credentials`,
+    '/credentials/add': t`Create New Credential`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    credential => {
-      if (!credential) {
-        return;
-      }
+  const buildBreadcrumbConfig = useCallback(credential => {
+    if (!credential) {
+      return;
+    }
 
-      setBreadcrumbConfig({
-        '/credentials': i18n._(t`Credentials`),
-        '/credentials/add': i18n._(t`Create New Credential`),
-        [`/credentials/${credential.id}`]: `${credential.name}`,
-        [`/credentials/${credential.id}/edit`]: i18n._(t`Edit Details`),
-        [`/credentials/${credential.id}/details`]: i18n._(t`Details`),
-        [`/credentials/${credential.id}/access`]: i18n._(t`Access`),
-      });
-    },
-    [i18n]
-  );
+    setBreadcrumbConfig({
+      '/credentials': t`Credentials`,
+      '/credentials/add': t`Create New Credential`,
+      [`/credentials/${credential.id}`]: `${credential.name}`,
+      [`/credentials/${credential.id}/edit`]: t`Edit Details`,
+      [`/credentials/${credential.id}/details`]: t`Details`,
+      [`/credentials/${credential.id}/access`]: t`Access`,
+    });
+  }, []);
 
   return (
     <>
@@ -53,4 +50,4 @@ function Credentials({ i18n }) {
   );
 }
 
-export default withI18n()(Credentials);
+export default Credentials;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
index 3e76a34234..e11655856b 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { shape } from 'prop-types';
 import { Formik, useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   ActionGroup,
@@ -38,13 +38,13 @@ const SelectOption = styled(PFSelectOption)`
   overflow: hidden;
 `;
 
-function CredentialFormFields({ i18n, initialTypeId, credentialTypes }) {
+function CredentialFormFields({ initialTypeId, credentialTypes }) {
   const { pathname } = useLocation();
   const { setFieldValue, initialValues, setFieldTouched } = useFormikContext();
   const [isSelectOpen, setIsSelectOpen] = useState(false);
   const [credTypeField, credTypeMeta, credTypeHelpers] = useField({
     name: 'credential_type',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   const [credentialTypeId, setCredentialTypeId] = useState(initialTypeId);
@@ -56,10 +56,7 @@ function CredentialFormFields({ i18n, initialTypeId, credentialTypes }) {
     name: 'organization',
     validate:
       isGalaxyCredential &&
-      required(
-        i18n._(t`Galaxy credentials must be owned by an Organization.`),
-        i18n
-      ),
+      required(t`Galaxy credentials must be owned by an Organization.`),
   });
 
   const credentialTypeOptions = Object.keys(credentialTypes)
@@ -137,8 +134,8 @@ function CredentialFormFields({ i18n, initialTypeId, credentialTypes }) {
     <Select
       isDisabled={isCredentialTypeDisabled}
       ouiaId="CredentialForm-credential_type"
-      aria-label={i18n._(t`Credential Type`)}
-      typeAheadAriaLabel={i18n._(t`Select Credential Type`)}
+      aria-label={t`Credential Type`}
+      typeAheadAriaLabel={t`Select Credential Type`}
       isOpen={isSelectOpen}
       variant={SelectVariant.typeahead}
       onToggle={setIsSelectOpen}
@@ -148,7 +145,7 @@ function CredentialFormFields({ i18n, initialTypeId, credentialTypes }) {
         setIsSelectOpen(false);
       }}
       selections={credTypeField.value}
-      placeholder={i18n._(t`Select a credential Type`)}
+      placeholder={t`Select a credential Type`}
       isCreatable={false}
       maxHeight="300px"
       width="100%"
@@ -169,15 +166,15 @@ function CredentialFormFields({ i18n, initialTypeId, credentialTypes }) {
     <>
       <FormField
         id="credential-name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="credential-description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
@@ -199,14 +196,12 @@ function CredentialFormFields({ i18n, initialTypeId, credentialTypes }) {
         validated={
           !credTypeMeta.touched || !credTypeMeta.error ? 'default' : 'error'
         }
-        label={i18n._(t`Credential Type`)}
+        label={t`Credential Type`}
       >
         {isCredentialTypeDisabled ? (
           <Tooltip
-            content={i18n._(
-              `You cannot change the credential type of a credential,
-              as it may break the functionality of the resources using it.`
-            )}
+            content={`You cannot change the credential type of a credential,
+              as it may break the functionality of the resources using it.`}
           >
             {credentialTypeSelect}
           </Tooltip>
@@ -226,7 +221,6 @@ function CredentialFormFields({ i18n, initialTypeId, credentialTypes }) {
 }
 
 function CredentialForm({
-  i18n,
   credential = {},
   credentialTypes,
   inputSources,
@@ -311,7 +305,6 @@ function CredentialForm({
               <CredentialFormFields
                 initialTypeId={initialTypeId}
                 credentialTypes={credentialTypes}
-                i18n={i18n}
                 {...rest}
               />
               <FormSubmitError error={submitError} />
@@ -320,12 +313,12 @@ function CredentialForm({
                   <Button
                     ouiaId="credential-form-save-button"
                     id="credential-form-save-button"
-                    aria-label={i18n._(t`Save`)}
+                    aria-label={t`Save`}
                     variant="primary"
                     type="button"
                     onClick={formik.handleSubmit}
                   >
-                    {i18n._(t`Save`)}
+                    {t`Save`}
                   </Button>
                   {formik?.values?.credential_type &&
                     credentialTypes[formik.values.credential_type]?.kind ===
@@ -333,24 +326,24 @@ function CredentialForm({
                       <Button
                         ouiaId="credential-form-test-button"
                         id="credential-form-test-button"
-                        aria-label={i18n._(t`Test`)}
+                        aria-label={t`Test`}
                         variant="secondary"
                         type="button"
                         onClick={() => setShowExternalTestModal(true)}
                         isDisabled={!formik.isValid}
                       >
-                        {i18n._(t`Test`)}
+                        {t`Test`}
                       </Button>
                     )}
                   <Button
                     ouiaId="credential-form-cancel-button"
                     id="credential-form-cancel-button"
-                    aria-label={i18n._(t`Cancel`)}
+                    aria-label={t`Cancel`}
                     variant="link"
                     type="button"
                     onClick={onCancel}
                   >
-                    {i18n._(t`Cancel`)}
+                    {t`Cancel`}
                   </Button>
                 </ActionGroup>
               </FormFullWidthLayout>
@@ -383,4 +376,4 @@ CredentialForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(CredentialForm);
+export default CredentialForm;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
index d0665186a9..42897cab7b 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { useField, useFormikContext } from 'formik';
 import { shape, string } from 'prop-types';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Button,
@@ -26,7 +26,7 @@ const FileUpload = styled(PFFileUpload)`
   flex-grow: 1;
 `;
 
-function CredentialInput({ i18n, fieldOptions, credentialKind, ...rest }) {
+function CredentialInput({ fieldOptions, credentialKind, ...rest }) {
   const [fileName, setFileName] = useState('');
   const [fileIsUploading, setFileIsUploading] = useState(false);
   const [subFormField, meta, helpers] = useField(`inputs.${fieldOptions.id}`);
@@ -39,19 +39,15 @@ function CredentialInput({ i18n, fieldOptions, credentialKind, ...rest }) {
         !meta.initialValue.credential && (
           <Tooltip
             id={`credential-${fieldOptions.id}-replace-tooltip`}
-            content={
-              meta.value !== meta.initialValue
-                ? i18n._(t`Revert`)
-                : i18n._(t`Replace`)
-            }
+            content={meta.value !== meta.initialValue ? t`Revert` : t`Replace`}
           >
             <Button
               id={`credential-${fieldOptions.id}-replace-button`}
               variant={ButtonVariant.control}
               aria-label={
                 meta.touched
-                  ? i18n._(t`Revert field to previously saved value`)
-                  : i18n._(t`Replace field with new value`)
+                  ? t`Revert field to previously saved value`
+                  : t`Replace field with new value`
               }
               onClick={() => {
                 if (meta.value !== meta.initialValue) {
@@ -153,18 +149,16 @@ CredentialInput.defaultProps = {
   credentialKind: '',
 };
 
-function CredentialField({ credentialType, fieldOptions, i18n }) {
+function CredentialField({ credentialType, fieldOptions }) {
   const { values: formikValues } = useFormikContext();
   const requiredFields = credentialType?.inputs?.required || [];
   const isRequired = requiredFields.includes(fieldOptions.id);
   const validateField = () => {
     if (isRequired && !formikValues?.passwordPrompts[fieldOptions.id]) {
       const validationMsg = fieldOptions.ask_at_runtime
-        ? i18n._(
-            t`Provide a value for this field or select the Prompt on launch option.`
-          )
+        ? t`Provide a value for this field or select the Prompt on launch option.`
         : null;
-      return required(validationMsg, i18n);
+      return required(validationMsg);
     }
     return null;
   };
@@ -214,7 +208,6 @@ function CredentialField({ credentialType, fieldOptions, i18n }) {
         validated={isValid ? 'default' : 'error'}
       >
         <CredentialInput
-          i18n={i18n}
           credentialKind={credentialType.kind}
           fieldOptions={fieldOptions}
           isDisabled={
@@ -239,7 +232,7 @@ function CredentialField({ credentialType, fieldOptions, i18n }) {
       isRequired={isRequired}
       validated={isValid ? 'default' : 'error'}
     >
-      <CredentialInput i18n={i18n} fieldOptions={fieldOptions} />
+      <CredentialInput fieldOptions={fieldOptions} />
     </CredentialPluginField>
   );
 }
@@ -254,4 +247,4 @@ CredentialField.propTypes = {
 
 CredentialField.defaultProps = {};
 
-export default withI18n()(CredentialField);
+export default CredentialField;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx
index e49f44c275..367752b641 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx
@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import { FileUpload, FormGroup } from '@patternfly/react-core';
 
-function GceFileUploadField({ i18n }) {
+function GceFileUploadField() {
   const [fileError, setFileError] = useState(null);
   const [filename, setFilename] = useState('');
   const [file, setFile] = useState('');
@@ -21,17 +21,15 @@ function GceFileUploadField({ i18n }) {
     <FormGroup
       fieldId="credential-gce-file"
       validated={!fileError ? 'default' : 'error'}
-      label={i18n._(t`Service account JSON file`)}
-      helperText={i18n._(
-        t`Select a JSON formatted service account key to autopopulate the following fields.`
-      )}
+      label={t`Service account JSON file`}
+      helperText={t`Select a JSON formatted service account key to autopopulate the following fields.`}
       helperTextInvalid={fileError}
     >
       <FileUpload
         id="credential-gce-file"
         value={file}
         filename={filename}
-        filenamePlaceholder={i18n._(t`Choose a .json file`)}
+        filenamePlaceholder={t`Choose a .json file`}
         onChange={async value => {
           if (value) {
             try {
@@ -45,9 +43,7 @@ function GceFileUploadField({ i18n }) {
                 !fileJSON.private_key
               ) {
                 setFileError(
-                  i18n._(
-                    t`Expected at least one of client_email, project_id or private_key to be present in the file.`
-                  )
+                  t`Expected at least one of client_email, project_id or private_key to be present in the file.`
                 );
               } else {
                 inputsUsernameHelpers.setValue(fileJSON.client_email || '');
@@ -57,9 +53,7 @@ function GceFileUploadField({ i18n }) {
               }
             } catch {
               setFileError(
-                i18n._(
-                  t`There was an error parsing the file. Please check the file formatting and try again.`
-                )
+                t`There was an error parsing the file. Please check the file formatting and try again.`
               );
             }
           } else {
@@ -75,9 +69,7 @@ function GceFileUploadField({ i18n }) {
           accept: '.json',
           onDropRejected: () => {
             setFileError(
-              i18n._(
-                t`File upload rejected. Please select a single .json file.`
-              )
+              t`File upload rejected. Please select a single .json file.`
             );
           },
         }}
@@ -86,4 +78,4 @@ function GceFileUploadField({ i18n }) {
   );
 }
 
-export default withI18n()(GceFileUploadField);
+export default GceFileUploadField;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
index 63986ea0ce..c944f26ce2 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import {
@@ -21,7 +21,7 @@ import CredentialPluginSelected from './CredentialPluginSelected';
 function CredentialPluginInput(props) {
   const {
     children,
-    i18n,
+
     isDisabled,
     isRequired,
     validated,
@@ -61,17 +61,13 @@ function CredentialPluginInput(props) {
             },
           })}
           <Tooltip
-            content={i18n._(
-              t`Populate field from an external secret management system`
-            )}
+            content={t`Populate field from an external secret management system`}
           >
             <Button
               ouiaId={`credential-field-${fieldOptions.id}-external-button`}
               id={`credential-${fieldOptions.id}-external-button`}
               variant={ButtonVariant.control}
-              aria-label={i18n._(
-                t`Populate field from an external secret management system`
-              )}
+              aria-label={t`Populate field from an external secret management system`}
               onClick={() => setShowPluginWizard(true)}
               isDisabled={isDisabled || disableFieldAndButtons}
             >
@@ -170,4 +166,4 @@ CredentialPluginField.defaultProps = {
   isRequired: false,
 };
 
-export default withI18n()(CredentialPluginField);
+export default CredentialPluginField;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx
index 1fb1c60230..9ac1491d07 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { func, shape } from 'prop-types';
 import { Formik, useField } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Button,
@@ -16,7 +16,7 @@ import { CredentialsAPI } from '../../../../../api';
 import useRequest from '../../../../../util/useRequest';
 import { CredentialPluginTestAlert } from '..';
 
-function CredentialPluginWizard({ i18n, handleSubmit, onClose }) {
+function CredentialPluginWizard({ handleSubmit, onClose }) {
   const [selectedCredential] = useField('credential');
   const [inputValues] = useField('inputs');
 
@@ -38,14 +38,14 @@ function CredentialPluginWizard({ i18n, handleSubmit, onClose }) {
   const steps = [
     {
       id: 1,
-      name: i18n._(t`Credential`),
+      name: t`Credential`,
       key: 'credential',
       component: <CredentialsStep />,
       enableNext: !!selectedCredential.value,
     },
     {
       id: 2,
-      name: i18n._(t`Metadata`),
+      name: t`Metadata`,
       key: 'metadata',
       component: <MetadataStep />,
       canJumpTo: !!selectedCredential.value,
@@ -64,14 +64,12 @@ function CredentialPluginWizard({ i18n, handleSubmit, onClose }) {
               onClick={onNext}
               isDisabled={!selectedCredential.value}
             >
-              {activeStep.key === 'metadata' ? i18n._(t`OK`) : i18n._(t`Next`)}
+              {activeStep.key === 'metadata' ? t`OK` : t`Next`}
             </Button>
             {activeStep && activeStep.key === 'metadata' && (
               <>
                 <Tooltip
-                  content={i18n._(
-                    t`Click this button to verify connection to the secret management system using the selected credential and specified inputs.`
-                  )}
+                  content={t`Click this button to verify connection to the secret management system using the selected credential and specified inputs.`}
                   position="right"
                 >
                   <Button
@@ -80,7 +78,7 @@ function CredentialPluginWizard({ i18n, handleSubmit, onClose }) {
                     variant="secondary"
                     onClick={() => testPluginMetadata()}
                   >
-                    {i18n._(t`Test`)}
+                    {t`Test`}
                   </Button>
                 </Tooltip>
 
@@ -90,7 +88,7 @@ function CredentialPluginWizard({ i18n, handleSubmit, onClose }) {
                   variant="secondary"
                   onClick={onBack}
                 >
-                  {i18n._(t`Back`)}
+                  {t`Back`}
                 </Button>
               </>
             )}
@@ -100,7 +98,7 @@ function CredentialPluginWizard({ i18n, handleSubmit, onClose }) {
               variant="link"
               onClick={onClose}
             >
-              {i18n._(t`Cancel`)}
+              {t`Cancel`}
             </Button>
           </>
         )}
@@ -113,7 +111,7 @@ function CredentialPluginWizard({ i18n, handleSubmit, onClose }) {
       <Wizard
         isOpen
         onClose={onClose}
-        title={i18n._(t`External Secret Management System`)}
+        title={t`External Secret Management System`}
         steps={steps}
         onSave={handleSubmit}
         footer={CustomFooter}
@@ -129,7 +127,7 @@ function CredentialPluginWizard({ i18n, handleSubmit, onClose }) {
   );
 }
 
-function CredentialPluginPrompt({ i18n, onClose, onSubmit, initialValues }) {
+function CredentialPluginPrompt({ onClose, onSubmit, initialValues }) {
   return (
     <Formik
       initialValues={{
@@ -139,11 +137,7 @@ function CredentialPluginPrompt({ i18n, onClose, onSubmit, initialValues }) {
       onSubmit={onSubmit}
     >
       {({ handleSubmit }) => (
-        <CredentialPluginWizard
-          handleSubmit={handleSubmit}
-          i18n={i18n}
-          onClose={onClose}
-        />
+        <CredentialPluginWizard handleSubmit={handleSubmit} onClose={onClose} />
       )}
     </Formik>
   );
@@ -159,4 +153,4 @@ CredentialPluginPrompt.defaultProps = {
   initialValues: {},
 };
 
-export default withI18n()(CredentialPluginPrompt);
+export default CredentialPluginPrompt;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx
index 328d17c8a9..93173a37f9 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import { CredentialsAPI } from '../../../../../api';
@@ -18,7 +18,7 @@ const QS_CONFIG = getQSConfig('credential', {
   credential_type__kind: 'external',
 });
 
-function CredentialsStep({ i18n }) {
+function CredentialsStep() {
   const [selectedCredential, , selectedCredentialHelper] = useField(
     'credential'
   );
@@ -82,22 +82,22 @@ function CredentialsStep({ i18n }) {
       showPageSizeOptions={false}
       toolbarSearchColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
       ]}
       toolbarSortColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ]}
@@ -107,4 +107,4 @@ function CredentialsStep({ i18n }) {
   );
 }
 
-export default withI18n()(CredentialsStep);
+export default CredentialsStep;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx
index aeed0fc3e6..46a0b982b5 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { useField, useFormikContext } from 'formik';
 import { Form, FormGroup } from '@patternfly/react-core';
 import { CredentialTypesAPI } from '../../../../../api';
@@ -12,7 +12,7 @@ import Popover from '../../../../../components/Popover';
 import useRequest from '../../../../../util/useRequest';
 import { required } from '../../../../../util/validators';
 
-function MetadataStep({ i18n }) {
+function MetadataStep() {
   const form = useFormikContext();
   const [selectedCredential] = useField('credential');
   const [inputValues] = useField('inputs');
@@ -95,7 +95,7 @@ function MetadataStep({ i18n }) {
                         onChange={(event, value) => {
                           form.setFieldValue(`inputs.${field.id}`, value);
                         }}
-                        validate={field.required ? required(null, i18n) : null}
+                        validate={field.required ? required(null) : null}
                       />
                     </FormGroup>
                   );
@@ -110,7 +110,7 @@ function MetadataStep({ i18n }) {
                     name={`inputs.${field.id}`}
                     type={field.multiline ? 'textarea' : 'text'}
                     isRequired={field.required}
-                    validate={field.required ? required(null, i18n) : null}
+                    validate={field.required ? required(null) : null}
                   />
                 );
               }
@@ -124,4 +124,4 @@ function MetadataStep({ i18n }) {
   );
 }
 
-export default withI18n()(MetadataStep);
+export default MetadataStep;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.jsx
index a71993ed96..aaa10289af 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import styled from 'styled-components';
 import { Button, ButtonVariant, Tooltip } from '@patternfly/react-core';
@@ -24,7 +24,6 @@ const PluginHelpText = styled.p`
 `;
 
 function CredentialPluginSelected({
-  i18n,
   credential,
   onEditPlugin,
   onClearPlugin,
@@ -35,12 +34,12 @@ function CredentialPluginSelected({
       <SelectedCredential>
         <SpacedCredentialChip onClick={onClearPlugin} credential={credential} />
         <Tooltip
-          content={i18n._(t`Edit Credential Plugin Configuration`)}
+          content={t`Edit Credential Plugin Configuration`}
           position="top"
         >
           <Button
             ouiaId={`credential-field-${fieldId}-edit-plugin-button`}
-            aria-label={i18n._(t`Edit Credential Plugin Configuration`)}
+            aria-label={t`Edit Credential Plugin Configuration`}
             onClick={onEditPlugin}
             variant={ButtonVariant.control}
           >
@@ -69,4 +68,4 @@ CredentialPluginSelected.defaultProps = {
   onClearPlugin: () => {},
 };
 
-export default withI18n()(CredentialPluginSelected);
+export default CredentialPluginSelected;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginTestAlert.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginTestAlert.jsx
index 01b2c56598..3085b30b41 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginTestAlert.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginTestAlert.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { string, shape } from 'prop-types';
 import {
@@ -9,7 +9,6 @@ import {
 } from '@patternfly/react-core';
 
 function CredentialPluginTestAlert({
-  i18n,
   credentialName,
   successResponse,
   errorResponse,
@@ -39,17 +38,15 @@ function CredentialPluginTestAlert({
         }
       } else {
         setTestMessage(
-          i18n._(
-            t`Something went wrong with the request to test this credential and metadata.`
-          )
+          t`Something went wrong with the request to test this credential and metadata.`
         );
       }
       setTestVariant('danger');
     } else if (successResponse) {
-      setTestMessage(i18n._(t`Test passed`));
+      setTestMessage(t`Test passed`);
       setTestVariant('success');
     }
-  }, [i18n, successResponse, errorResponse]);
+  }, [successResponse, errorResponse]);
 
   return (
     <AlertGroup isToast>
@@ -87,4 +84,4 @@ CredentialPluginTestAlert.defaultProps = {
   errorResponse: null,
 };
 
-export default withI18n()(CredentialPluginTestAlert);
+export default CredentialPluginTestAlert;
diff --git a/awx/ui_next/src/screens/Credential/shared/ExternalTestModal.jsx b/awx/ui_next/src/screens/Credential/shared/ExternalTestModal.jsx
index 01075f9c76..4206246045 100644
--- a/awx/ui_next/src/screens/Credential/shared/ExternalTestModal.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/ExternalTestModal.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import { Formik } from 'formik';
@@ -14,7 +14,6 @@ import useRequest from '../../../util/useRequest';
 import { CredentialPluginTestAlert } from './CredentialPlugins';
 
 function ExternalTestModal({
-  i18n,
   credential,
   credentialType,
   credentialFormValues,
@@ -75,7 +74,7 @@ function ExternalTestModal({
       >
         {({ handleSubmit, setFieldValue }) => (
           <Modal
-            title={i18n._(t`Test External Credential`)}
+            title={t`Test External Credential`}
             isOpen
             onClose={() => onClose()}
             variant="small"
@@ -87,7 +86,7 @@ function ExternalTestModal({
                 variant="primary"
                 onClick={() => handleSubmit()}
               >
-                {i18n._(t`Run`)}
+                {t`Run`}
               </Button>,
               <Button
                 ouiaId="external-test-modal-cancel-button"
@@ -96,7 +95,7 @@ function ExternalTestModal({
                 variant="link"
                 onClick={() => onClose()}
               >
-                {i18n._(t`Cancel`)}
+                {t`Cancel`}
               </Button>,
             ]}
           >
@@ -134,7 +133,7 @@ function ExternalTestModal({
                             onChange={(event, value) => {
                               setFieldValue(field.id, value);
                             }}
-                            validate={isRequired ? required(null, i18n) : null}
+                            validate={isRequired ? required(null) : null}
                           />
                         </FormGroup>
                       );
@@ -149,7 +148,7 @@ function ExternalTestModal({
                         name={field.id}
                         type={field.multiline ? 'textarea' : 'text'}
                         isRequired={isRequired}
-                        validate={isRequired ? required(null, i18n) : null}
+                        validate={isRequired ? required(null) : null}
                       />
                     );
                   }
@@ -181,4 +180,4 @@ ExternalTestModal.defaultProps = {
   credential: null,
 };
 
-export default withI18n()(ExternalTestModal);
+export default ExternalTestModal;
diff --git a/awx/ui_next/src/screens/Credential/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/Credential/shared/TypeInputsSubForm.jsx
index c0a21b65b5..73023d02cd 100644
--- a/awx/ui_next/src/screens/Credential/shared/TypeInputsSubForm.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/TypeInputsSubForm.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { FormGroup, Title } from '@patternfly/react-core';
 import {
@@ -12,7 +12,7 @@ import { CheckboxField } from '../../../components/FormField';
 import { CredentialType } from '../../../types';
 import { CredentialField, GceFileUploadField } from './CredentialFormFields';
 
-function TypeInputsSubForm({ credentialType, i18n }) {
+function TypeInputsSubForm({ credentialType }) {
   const stringFields = credentialType.inputs.fields.filter(
     fieldOptions => fieldOptions.type === 'string' || fieldOptions.choices
   );
@@ -22,7 +22,7 @@ function TypeInputsSubForm({ credentialType, i18n }) {
   return (
     <SubFormLayout>
       <Title size="md" headingLevel="h4">
-        {i18n._(t`Type Details`)}
+        {t`Type Details`}
       </Title>
       <FormColumnLayout>
         {credentialType.namespace === 'gce' && <GceFileUploadField />}
@@ -44,10 +44,7 @@ function TypeInputsSubForm({ credentialType, i18n }) {
         )}
         {booleanFields.length > 0 && (
           <FormFullWidthLayout>
-            <FormGroup
-              fieldId="credential-checkboxes"
-              label={i18n._(t`Options`)}
-            >
+            <FormGroup fieldId="credential-checkboxes" label={t`Options`}>
               <FormCheckboxLayout>
                 {booleanFields.map(fieldOptions => (
                   <CheckboxField
@@ -73,4 +70,4 @@ TypeInputsSubForm.propTypes = {
 
 TypeInputsSubForm.defaultProps = {};
 
-export default withI18n()(TypeInputsSubForm);
+export default TypeInputsSubForm;
diff --git a/awx/ui_next/src/screens/CredentialType/CredentialType.jsx b/awx/ui_next/src/screens/CredentialType/CredentialType.jsx
index 17dc115a44..9501667eb7 100644
--- a/awx/ui_next/src/screens/CredentialType/CredentialType.jsx
+++ b/awx/ui_next/src/screens/CredentialType/CredentialType.jsx
@@ -7,7 +7,7 @@ import {
   useLocation,
   useParams,
 } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -21,7 +21,7 @@ import ContentLoading from '../../components/ContentLoading';
 import CredentialTypeDetails from './CredentialTypeDetails';
 import CredentialTypeEdit from './CredentialTypeEdit';
 
-function CredentialType({ i18n, setBreadcrumb }) {
+function CredentialType({ setBreadcrumb }) {
   const { id } = useParams();
   const { pathname } = useLocation();
 
@@ -52,14 +52,14 @@ function CredentialType({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to credential types`)}
+          {t`Back to credential types`}
         </>
       ),
       link: '/credential_types',
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/credential_types/${id}/details`,
       id: 0,
     },
@@ -72,9 +72,9 @@ function CredentialType({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response?.status === 404 && (
               <span>
-                {i18n._(t`Credential type not found.`)}{' '}
+                {t`Credential type not found.`}{' '}
                 <Link to="/credential_types">
-                  {i18n._(t`View all credential types`)}
+                  {t`View all credential types`}
                 </Link>
               </span>
             )}
@@ -118,4 +118,4 @@ function CredentialType({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(CredentialType);
+export default CredentialType;
diff --git a/awx/ui_next/src/screens/CredentialType/CredentialTypeDetails/CredentialTypeDetails.jsx b/awx/ui_next/src/screens/CredentialType/CredentialTypeDetails/CredentialTypeDetails.jsx
index 087757d6aa..72aebabfa3 100644
--- a/awx/ui_next/src/screens/CredentialType/CredentialTypeDetails/CredentialTypeDetails.jsx
+++ b/awx/ui_next/src/screens/CredentialType/CredentialTypeDetails/CredentialTypeDetails.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link, useHistory } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
@@ -22,7 +22,7 @@ import {
 } from '../../../util/getRelatedResourceDeleteDetails';
 import ErrorDetail from '../../../components/ErrorDetail';
 
-function CredentialTypeDetails({ credentialType, i18n }) {
+function CredentialTypeDetails({ credentialType }) {
   const { id, name, description, injectors, inputs } = credentialType;
   const history = useHistory();
 
@@ -47,7 +47,7 @@ function CredentialTypeDetails({ credentialType, i18n }) {
         results: deleteDetails,
         error,
       } = await getRelatedResourceDeleteCounts(
-        relatedResourceDeleteRequests.credentialType(credentialType, i18n)
+        relatedResourceDeleteRequests.credentialType(credentialType)
       );
       if (error) {
         throw new Error(error);
@@ -56,7 +56,7 @@ function CredentialTypeDetails({ credentialType, i18n }) {
         return { isDeleteDisabled: true };
       }
       return { isDeleteDisabled: false };
-    }, [credentialType, i18n]),
+    }, [credentialType]),
     { isDeleteDisabled: false }
   );
 
@@ -71,28 +71,28 @@ function CredentialTypeDetails({ credentialType, i18n }) {
     <CardBody>
       <DetailList>
         <Detail
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={name}
           dataCy="credential-type-detail-name"
         />
-        <Detail label={i18n._(t`Description`)} value={description} />
+        <Detail label={t`Description`} value={description} />
         <VariablesDetail
-          label={i18n._(t`Input configuration`)}
+          label={t`Input configuration`}
           value={jsonToYaml(JSON.stringify(inputs))}
           rows={6}
         />
         <VariablesDetail
-          label={i18n._(t`Injector configuration`)}
+          label={t`Injector configuration`}
           value={jsonToYaml(JSON.stringify(injectors))}
           rows={6}
         />
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={credentialType.created}
           user={credentialType.summary_fields.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={credentialType.modified}
           user={credentialType.summary_fields.modified_by}
         />
@@ -102,28 +102,26 @@ function CredentialTypeDetails({ credentialType, i18n }) {
           credentialType.summary_fields.user_capabilities.edit && (
             <Button
               ouiaId="credential-type-detail-edit-button"
-              aria-label={i18n._(t`edit`)}
+              aria-label={t`edit`}
               component={Link}
               to={`/credential_types/${id}/edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
         {credentialType.summary_fields.user_capabilities &&
           credentialType.summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={name}
-              modalTitle={i18n._(t`Delete credential type`)}
+              modalTitle={t`Delete credential type`}
               onConfirm={deleteCredentialType}
               isDisabled={isLoading || isDeleteDisabled}
               disabledTooltip={
                 isDeleteDisabled &&
-                i18n._(
-                  t`This credential type is currently being used by some credentials and cannot be deleted`
-                )
+                t`This credential type is currently being used by some credentials and cannot be deleted`
               }
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -132,7 +130,7 @@ function CredentialTypeDetails({ credentialType, i18n }) {
         <AlertModal
           isOpen={error}
           onClose={dismissError}
-          title={i18n._(t`Error`)}
+          title={t`Error`}
           variant="error"
         >
           <ErrorDetail error={error} />
@@ -142,4 +140,4 @@ function CredentialTypeDetails({ credentialType, i18n }) {
   );
 }
 
-export default withI18n()(CredentialTypeDetails);
+export default CredentialTypeDetails;
diff --git a/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeListItem.jsx b/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeListItem.jsx
index b05a47bf73..b95b416425 100644
--- a/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeListItem.jsx
+++ b/awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
@@ -15,7 +15,6 @@ function CredentialTypeListItem({
   isSelected,
   onSelect,
   rowIndex,
-  i18n,
 }) {
   const labelId = `check-action-${credentialType.id}`;
 
@@ -27,21 +26,21 @@ function CredentialTypeListItem({
           isSelected,
           onSelect,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
           <b>{credentialType.name}</b>
         </Link>
       </Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)}>
+      <ActionsTd dataLabel={t`Actions`}>
         <ActionItem
           visible={credentialType.summary_fields.user_capabilities.edit}
-          tooltip={i18n._(t`Edit credential type`)}
+          tooltip={t`Edit credential type`}
         >
           <Button
             ouiaId={`${credentialType.id}-edit-button`}
-            aria-label={i18n._(t`Edit credential type`)}
+            aria-label={t`Edit credential type`}
             variant="plain"
             component={Link}
             to={`/credential_types/${credentialType.id}/edit`}
@@ -61,4 +60,4 @@ CredentialTypeListItem.prototype = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(CredentialTypeListItem);
+export default CredentialTypeListItem;
diff --git a/awx/ui_next/src/screens/CredentialType/CredentialTypes.jsx b/awx/ui_next/src/screens/CredentialType/CredentialTypes.jsx
index 4eb47c1892..bc664749e3 100644
--- a/awx/ui_next/src/screens/CredentialType/CredentialTypes.jsx
+++ b/awx/ui_next/src/screens/CredentialType/CredentialTypes.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Route, Switch } from 'react-router-dom';
 
@@ -8,29 +8,24 @@ import CredentialTypeList from './CredentialTypeList';
 import CredentialType from './CredentialType';
 import ScreenHeader from '../../components/ScreenHeader';
 
-function CredentialTypes({ i18n }) {
+function CredentialTypes() {
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/credential_types': i18n._(t`Credential Types`),
-    '/credential_types/add': i18n._(t`Create new credential type`),
+    '/credential_types': t`Credential Types`,
+    '/credential_types/add': t`Create new credential type`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    credentialTypes => {
-      if (!credentialTypes) {
-        return;
-      }
-      setBreadcrumbConfig({
-        '/credential_types': i18n._(t`Credential Types`),
-        '/credential_types/add': i18n._(t`Create new credential Type`),
-        [`/credential_types/${credentialTypes.id}`]: `${credentialTypes.name}`,
-        [`/credential_types/${credentialTypes.id}/edit`]: i18n._(
-          t`Edit details`
-        ),
-        [`/credential_types/${credentialTypes.id}/details`]: i18n._(t`Details`),
-      });
-    },
-    [i18n]
-  );
+  const buildBreadcrumbConfig = useCallback(credentialTypes => {
+    if (!credentialTypes) {
+      return;
+    }
+    setBreadcrumbConfig({
+      '/credential_types': t`Credential Types`,
+      '/credential_types/add': t`Create new credential Type`,
+      [`/credential_types/${credentialTypes.id}`]: `${credentialTypes.name}`,
+      [`/credential_types/${credentialTypes.id}/edit`]: t`Edit details`,
+      [`/credential_types/${credentialTypes.id}/details`]: t`Details`,
+    });
+  }, []);
   return (
     <>
       <ScreenHeader
@@ -52,4 +47,4 @@ function CredentialTypes({ i18n }) {
   );
 }
 
-export default withI18n()(CredentialTypes);
+export default CredentialTypes;
diff --git a/awx/ui_next/src/screens/CredentialType/shared/CredentialTypeForm.jsx b/awx/ui_next/src/screens/CredentialType/shared/CredentialTypeForm.jsx
index 4192d02c19..ddda5f30ff 100644
--- a/awx/ui_next/src/screens/CredentialType/shared/CredentialTypeForm.jsx
+++ b/awx/ui_next/src/screens/CredentialType/shared/CredentialTypeForm.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { func, shape } from 'prop-types';
 import { Formik } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import { Form } from '@patternfly/react-core';
@@ -16,41 +16,37 @@ import {
 
 import { jsonToYaml } from '../../../util/yaml';
 
-function CredentialTypeFormFields({ i18n }) {
+function CredentialTypeFormFields() {
   return (
     <>
       <FormField
         id="credential-type-name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="credential-type-description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
       <FormFullWidthLayout>
         <VariablesField
-          tooltip={i18n._(
-            t`Enter inputs using either JSON or YAML syntax. Refer to the documentation for example syntax.`
-          )}
+          tooltip={t`Enter inputs using either JSON or YAML syntax. Refer to the Ansible Tower documentation for example syntax.`}
           id="credential-type-inputs-configuration"
           name="inputs"
-          label={i18n._(t`Input configuration`)}
+          label={t`Input configuration`}
         />
       </FormFullWidthLayout>
       <FormFullWidthLayout>
         <VariablesField
-          tooltip={i18n._(
-            t`Enter injectors using either JSON or YAML syntax. Refer to the documentation for example syntax.`
-          )}
+          tooltip={t`Enter injectors using either JSON or YAML syntax. Refer to the Ansible Tower documentation for example syntax.`}
           id="credential-type-injectors-configuration"
           name="injectors"
-          label={i18n._(t`Injector configuration`)}
+          label={t`Injector configuration`}
         />
       </FormFullWidthLayout>
     </>
@@ -104,4 +100,4 @@ CredentialTypeForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(CredentialTypeForm);
+export default CredentialTypeForm;
diff --git a/awx/ui_next/src/screens/Dashboard/Dashboard.jsx b/awx/ui_next/src/screens/Dashboard/Dashboard.jsx
index d135a813f1..f8772f5185 100644
--- a/awx/ui_next/src/screens/Dashboard/Dashboard.jsx
+++ b/awx/ui_next/src/screens/Dashboard/Dashboard.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useCallback, useEffect, useState } from 'react';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Card,
@@ -54,7 +54,7 @@ const GraphCardActions = styled(CardActions)`
   padding-left: 0;
 `;
 
-function Dashboard({ i18n }) {
+function Dashboard() {
   const [isPeriodDropdownOpen, setIsPeriodDropdownOpen] = useState(false);
   const [isJobTypeDropdownOpen, setIsJobTypeDropdownOpen] = useState(false);
   const [periodSelection, setPeriodSelection] = useState('month');
@@ -119,42 +119,42 @@ function Dashboard({ i18n }) {
     <Fragment>
       <ScreenHeader
         streamType="all"
-        breadcrumbConfig={{ '/home': i18n._(t`Dashboard`) }}
+        breadcrumbConfig={{ '/home': t`Dashboard` }}
       />
       <PageSection>
         <Counts>
           <Count
             link="/hosts"
             data={countData?.hosts?.total}
-            label={i18n._(t`Hosts`)}
+            label={t`Hosts`}
           />
           <Count
             failed
             link="/hosts?host.last_job_host_summary__failed=true"
             data={countData?.hosts?.failed}
-            label={i18n._(t`Failed hosts`)}
+            label={t`Failed hosts`}
           />
           <Count
             link="/inventories"
             data={countData?.inventories?.total}
-            label={i18n._(t`Inventories`)}
+            label={t`Inventories`}
           />
           <Count
             failed
             link="/inventories?inventory.inventory_sources_with_failures__gt=0"
             data={countData?.inventories?.inventory_failed}
-            label={i18n._(t`Inventory sync failures`)}
+            label={t`Inventory sync failures`}
           />
           <Count
             link="/projects"
             data={countData?.projects?.total}
-            label={i18n._(t`Projects`)}
+            label={t`Projects`}
           />
           <Count
             failed
             link="/projects?project.status__in=failed,canceled"
             data={countData?.projects?.failed}
-            label={i18n._(t`Project sync failures`)}
+            label={t`Project sync failures`}
           />
         </Counts>
       </PageSection>
@@ -162,23 +162,23 @@ function Dashboard({ i18n }) {
         <div className="spacer">
           <Card id="dashboard-main-container">
             <Tabs
-              aria-label={i18n._(t`Tabs`)}
+              aria-label={t`Tabs`}
               activeKey={activeTabId}
               onSelect={(key, eventKey) => setActiveTabId(eventKey)}
             >
               <Tab
-                aria-label={i18n._(t`Job status graph tab`)}
+                aria-label={t`Job status graph tab`}
                 eventKey={0}
-                title={<TabTitleText>{i18n._(t`Job status`)}</TabTitleText>}
+                title={<TabTitleText>{t`Job status`}</TabTitleText>}
               >
                 <Fragment>
                   <GraphCardHeader>
                     <GraphCardActions>
                       <Select
                         variant={SelectVariant.single}
-                        placeholderText={i18n._(t`Select period`)}
-                        aria-label={i18n._(t`Select period`)}
-                        typeAheadAriaLabel={i18n._(t`Select period`)}
+                        placeholderText={t`Select period`}
+                        aria-label={t`Select period`}
+                        typeAheadAriaLabel={t`Select period`}
                         className="periodSelect"
                         onToggle={setIsPeriodDropdownOpen}
                         onSelect={(event, selection) =>
@@ -188,19 +188,19 @@ function Dashboard({ i18n }) {
                         isOpen={isPeriodDropdownOpen}
                       >
                         <SelectOption key="month" value="month">
-                          {i18n._(t`Past month`)}
+                          {t`Past month`}
                         </SelectOption>
                         <SelectOption key="two_weeks" value="two_weeks">
-                          {i18n._(t`Past two weeks`)}
+                          {t`Past two weeks`}
                         </SelectOption>
                         <SelectOption key="week" value="week">
-                          {i18n._(t`Past week`)}
+                          {t`Past week`}
                         </SelectOption>
                       </Select>
                       <Select
                         variant={SelectVariant.single}
-                        placeholderText={i18n._(t`Select job type`)}
-                        aria-label={i18n._(t`Select job type`)}
+                        placeholderText={t`Select job type`}
+                        aria-label={t`Select job type`}
                         className="jobTypeSelect"
                         onToggle={setIsJobTypeDropdownOpen}
                         onSelect={(event, selection) =>
@@ -210,16 +210,16 @@ function Dashboard({ i18n }) {
                         isOpen={isJobTypeDropdownOpen}
                       >
                         <SelectOption key="all" value="all">
-                          {i18n._(t`All job types`)}
+                          {t`All job types`}
                         </SelectOption>
                         <SelectOption key="inv_sync" value="inv_sync">
-                          {i18n._(t`Inventory sync`)}
+                          {t`Inventory sync`}
                         </SelectOption>
                         <SelectOption key="scm_update" value="scm_update">
-                          {i18n._(t`SCM update`)}
+                          {t`SCM update`}
                         </SelectOption>
                         <SelectOption key="playbook_run" value="playbook_run">
-                          {i18n._(t`Playbook run`)}
+                          {t`Playbook run`}
                         </SelectOption>
                       </Select>
                     </GraphCardActions>
@@ -234,9 +234,9 @@ function Dashboard({ i18n }) {
                 </Fragment>
               </Tab>
               <Tab
-                aria-label={i18n._(t`Recent Jobs list tab`)}
+                aria-label={t`Recent Jobs list tab`}
                 eventKey={1}
-                title={<TabTitleText>{i18n._(t`Recent Jobs`)}</TabTitleText>}
+                title={<TabTitleText>{t`Recent Jobs`}</TabTitleText>}
               >
                 <div>
                   {activeTabId === 1 && (
@@ -245,11 +245,9 @@ function Dashboard({ i18n }) {
                 </div>
               </Tab>
               <Tab
-                aria-label={i18n._(t`Recent Templates list tab`)}
+                aria-label={t`Recent Templates list tab`}
                 eventKey={2}
-                title={
-                  <TabTitleText>{i18n._(t`Recent Templates`)}</TabTitleText>
-                }
+                title={<TabTitleText>{t`Recent Templates`}</TabTitleText>}
               >
                 <div>
                   {activeTabId === 2 && (
@@ -265,4 +263,4 @@ function Dashboard({ i18n }) {
   );
 }
 
-export default withI18n()(Dashboard);
+export default Dashboard;
diff --git a/awx/ui_next/src/screens/Dashboard/shared/ChartTooltip.jsx b/awx/ui_next/src/screens/Dashboard/shared/ChartTooltip.jsx
index 6db109796e..b84483ded3 100644
--- a/awx/ui_next/src/screens/Dashboard/shared/ChartTooltip.jsx
+++ b/awx/ui_next/src/screens/Dashboard/shared/ChartTooltip.jsx
@@ -6,7 +6,7 @@ class Tooltip {
     this.label = opts.label;
     this.svg = opts.svg;
     this.colors = opts.colors;
-    this.i18n = opts.i18n;
+
     this.draw();
   }
 
@@ -56,14 +56,14 @@ class Tooltip {
       .attr('y', 4)
       .attr('font-size', 12)
       .attr('fill', 'white')
-      .text(this.i18n._(t`Successful`));
+      .text(t`Successful`);
     this.failText = this.toolTipBase
       .append('text')
       .attr('x', 43)
       .attr('y', 28)
       .attr('font-size', 12)
       .attr('fill', 'white')
-      .text(this.i18n._(t`Failed`));
+      .text(t`Failed`);
     this.icon = this.toolTipBase
       .append('text')
       .attr('fill', 'white')
@@ -79,7 +79,7 @@ class Tooltip {
       .attr('y', -21)
       .attr('font-size', 12)
       .attr('text-anchor', 'end')
-      .text(this.i18n._(t`No Jobs`));
+      .text(t`No Jobs`);
     this.successful = this.toolTipBase
       .append('text')
       .attr('fill', 'white')
@@ -103,7 +103,7 @@ class Tooltip {
       .attr('x', 20)
       .attr('y', -21)
       .attr('font-size', 12)
-      .text(this.i18n._(t`Never`));
+      .text(t`Never`);
   }
 
   handleMouseOver = d => {
diff --git a/awx/ui_next/src/screens/Dashboard/shared/LineChart.jsx b/awx/ui_next/src/screens/Dashboard/shared/LineChart.jsx
index cebd59c7a3..ddf9d62458 100644
--- a/awx/ui_next/src/screens/Dashboard/shared/LineChart.jsx
+++ b/awx/ui_next/src/screens/Dashboard/shared/LineChart.jsx
@@ -2,12 +2,12 @@ import React, { useEffect, useCallback } from 'react';
 import { string, number, shape, arrayOf } from 'prop-types';
 import * as d3 from 'd3';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { PageContextConsumer } from '@patternfly/react-core';
 
 import ChartTooltip from './ChartTooltip';
 
-function LineChart({ id, data, height, i18n, pageContext }) {
+function LineChart({ id, data, height, pageContext }) {
   const { isNavOpen } = pageContext;
 
   // Methods
@@ -66,8 +66,7 @@ function LineChart({ id, data, height, i18n, pageContext }) {
     const tooltip = new ChartTooltip({
       svg: `#${id}`,
       colors,
-      label: i18n._(t`Jobs`),
-      i18n,
+      label: t`Jobs`,
     });
     const parseTime = d3.timeParse('%Y-%m-%d');
 
@@ -252,7 +251,7 @@ function LineChart({ id, data, height, i18n, pageContext }) {
       .on('mouseover', handleMouseOver)
       .on('mousemove', handleMouseMove)
       .on('mouseout', handleMouseOut);
-  }, [data, height, i18n, id]);
+  }, [data, height, id]);
 
   useEffect(() => {
     draw();
@@ -289,4 +288,4 @@ const withPageContext = Component => {
   };
 };
 
-export default withI18n()(withPageContext(LineChart));
+export default withPageContext(LineChart);
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironment.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironment.jsx
index bb86dc2f57..9c035d428e 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironment.jsx
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironment.jsx
@@ -7,7 +7,7 @@ import {
   useLocation,
   useParams,
 } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -22,7 +22,7 @@ import ExecutionEnvironmentDetails from './ExecutionEnvironmentDetails';
 import ExecutionEnvironmentEdit from './ExecutionEnvironmentEdit';
 import ExecutionEnvironmentTemplateList from './ExecutionEnvironmentTemplate';
 
-function ExecutionEnvironment({ i18n, setBreadcrumb }) {
+function ExecutionEnvironment({ setBreadcrumb }) {
   const { id } = useParams();
   const { pathname } = useLocation();
 
@@ -54,19 +54,19 @@ function ExecutionEnvironment({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to execution environments`)}
+          {t`Back to execution environments`}
         </>
       ),
       link: '/execution_environments',
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/execution_environments/${id}/details`,
       id: 0,
     },
     {
-      name: i18n._(t`Templates`),
+      name: t`Templates`,
       link: `/execution_environments/${id}/templates`,
       id: 1,
     },
@@ -79,9 +79,9 @@ function ExecutionEnvironment({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response?.status === 404 && (
               <span>
-                {i18n._(t`Execution environment not found.`)}{' '}
+                {t`Execution environment not found.`}{' '}
                 <Link to="/execution_environments">
-                  {i18n._(t`View all execution environments`)}
+                  {t`View all execution environments`}
                 </Link>
               </span>
             )}
@@ -134,4 +134,4 @@ function ExecutionEnvironment({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(ExecutionEnvironment);
+export default ExecutionEnvironment;
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.jsx
index 9c9e556ad1..91089240f5 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.jsx
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link, useHistory } from 'react-router-dom';
 import { Button, Label } from '@patternfly/react-core';
@@ -17,7 +17,7 @@ import { toTitleCase } from '../../../util/strings';
 import { ExecutionEnvironmentsAPI } from '../../../api';
 import { relatedResourceDeleteRequests } from '../../../util/getRelatedResourceDeleteDetails';
 
-function ExecutionEnvironmentDetails({ executionEnvironment, i18n }) {
+function ExecutionEnvironmentDetails({ executionEnvironment }) {
   const history = useHistory();
   const {
     id,
@@ -49,27 +49,27 @@ function ExecutionEnvironmentDetails({ executionEnvironment, i18n }) {
     <CardBody>
       <DetailList>
         <Detail
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={name}
           dataCy="execution-environment-detail-name"
         />
         <Detail
-          label={i18n._(t`Image`)}
+          label={t`Image`}
           value={image}
           dataCy="execution-environment-detail-image"
         />
         <Detail
-          label={i18n._(t`Description`)}
+          label={t`Description`}
           value={description}
           dataCy="execution-environment-detail-description"
         />
         <Detail
-          label={i18n._(t`Managed by Tower`)}
-          value={managedByTower ? i18n._(t`True`) : i18n._(t`False`)}
+          label={t`Managed by Tower`}
+          value={managedByTower ? t`True` : t`False`}
           dataCy="execution-environment-managed-by-tower"
         />
         <Detail
-          label={i18n._(t`Organization`)}
+          label={t`Organization`}
           value={
             organization ? (
               <Link
@@ -78,20 +78,20 @@ function ExecutionEnvironmentDetails({ executionEnvironment, i18n }) {
                 {summary_fields.organization.name}
               </Link>
             ) : (
-              i18n._(t`Globally Available`)
+              t`Globally Available`
             )
           }
           dataCy="execution-environment-detail-organization"
         />
 
         <Detail
-          label={i18n._(t`Pull`)}
-          value={pull === '' ? i18n._(t`Missing`) : toTitleCase(pull)}
+          label={t`Pull`}
+          value={pull === '' ? t`Missing` : toTitleCase(pull)}
           dataCy="execution-environment-pull"
         />
         {executionEnvironment.summary_fields.credential && (
           <Detail
-            label={i18n._(t`Credential`)}
+            label={t`Credential`}
             value={
               <Label variant="outline" color="blue">
                 {executionEnvironment.summary_fields.credential.name}
@@ -101,13 +101,13 @@ function ExecutionEnvironmentDetails({ executionEnvironment, i18n }) {
           />
         )}
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={executionEnvironment.created}
           user={executionEnvironment.summary_fields.created_by}
           dataCy="execution-environment-created"
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={executionEnvironment.modified}
           user={executionEnvironment.summary_fields.modified_by}
           dataCy="execution-environment-modified"
@@ -118,26 +118,24 @@ function ExecutionEnvironmentDetails({ executionEnvironment, i18n }) {
           {summary_fields.user_capabilities?.edit && (
             <Button
               ouiaId="execution-environment-detail-edit-button"
-              aria-label={i18n._(t`edit`)}
+              aria-label={t`edit`}
               component={Link}
               to={`/execution_environments/${id}/edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
           {summary_fields.user_capabilities?.delete && (
             <DeleteButton
               name={image}
-              modalTitle={i18n._(t`Delete Execution Environment`)}
+              modalTitle={t`Delete Execution Environment`}
               onConfirm={deleteExecutionEnvironment}
               isDisabled={isLoading}
               ouiaId="delete-button"
               deleteDetailsRequests={deleteDetailsRequests}
-              deleteMessage={i18n._(
-                t`This execution environment is currently being used by other resources. Are you sure you want to delete it?`
-              )}
+              deleteMessage={t`This execution environment is currently being used by other resources. Are you sure you want to delete it?`}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
         </CardActionsRow>
@@ -147,7 +145,7 @@ function ExecutionEnvironmentDetails({ executionEnvironment, i18n }) {
         <AlertModal
           isOpen={error}
           onClose={dismissError}
-          title={i18n._(t`Error`)}
+          title={t`Error`}
           variant="error"
         />
       )}
@@ -155,4 +153,4 @@ function ExecutionEnvironmentDetails({ executionEnvironment, i18n }) {
   );
 }
 
-export default withI18n()(ExecutionEnvironmentDetails);
+export default ExecutionEnvironmentDetails;
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentListItem.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentListItem.jsx
index 05655925f4..2f1c816e4e 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentListItem.jsx
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentListItem.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
@@ -18,7 +18,7 @@ function ExecutionEnvironmentListItem({
   detailUrl,
   isSelected,
   onSelect,
-  i18n,
+
   rowIndex,
   fetchExecutionEnvironments,
 }) {
@@ -52,15 +52,15 @@ function ExecutionEnvironmentListItem({
           onSelect,
           disable: false,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={`ee-name-${executionEnvironment.id}`} dataLabel={i18n._(t`Name`)}>
+      <Td id={`ee-name-${executionEnvironment.id}`} dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
           <b>{executionEnvironment.name}</b>
         </Link>
       </Td>
-      <Td dataLabel={i18n._(t`Image`)}>{executionEnvironment.image}</Td>
-      <Td dataLabel={i18n._(t`Organization`)}>
+      <Td dataLabel={t`Image`}>{executionEnvironment.image}</Td>
+      <Td dataLabel={t`Organization`}>
         {executionEnvironment.organization ? (
           <Link
             to={`/organizations/${executionEnvironment?.summary_fields?.organization?.id}/details`}
@@ -68,17 +68,17 @@ function ExecutionEnvironmentListItem({
             <b>{executionEnvironment?.summary_fields?.organization?.name}</b>
           </Link>
         ) : (
-          i18n._(t`Globally Available`)
+          t`Globally Available`
         )}
       </Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)} gridColumns="auto 40px">
+      <ActionsTd dataLabel={t`Actions`} gridColumns="auto 40px">
         <ActionItem
           visible={executionEnvironment.summary_fields.user_capabilities.edit}
-          tooltip={i18n._(t`Edit Execution Environment`)}
+          tooltip={t`Edit Execution Environment`}
         >
           <Button
             ouiaId={`${executionEnvironment.id}-edit-button`}
-            aria-label={i18n._(t`Edit Execution Environment`)}
+            aria-label={t`Edit Execution Environment`}
             variant="plain"
             component={Link}
             to={`/execution_environments/${executionEnvironment.id}/edit`}
@@ -88,7 +88,7 @@ function ExecutionEnvironmentListItem({
         </ActionItem>
         <ActionItem
           visible={executionEnvironment.summary_fields.user_capabilities.copy}
-          tooltip={i18n._(t`Copy Execution Environment`)}
+          tooltip={t`Copy Execution Environment`}
         >
           <CopyButton
             ouiaId={`copy-ee-${executionEnvironment.id}`}
@@ -96,7 +96,7 @@ function ExecutionEnvironmentListItem({
             onCopyStart={handleCopyStart}
             onCopyFinish={handleCopyFinish}
             copyItem={copyExecutionEnvironment}
-            errorMessage={i18n._(t`Failed to copy execution environment`)}
+            errorMessage={t`Failed to copy execution environment`}
           />
         </ActionItem>
       </ActionsTd>
@@ -111,4 +111,4 @@ ExecutionEnvironmentListItem.prototype = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(ExecutionEnvironmentListItem);
+export default ExecutionEnvironmentListItem;
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateList.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateList.jsx
index c2b36eee30..c4538b3076 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateList.jsx
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Card } from '@patternfly/react-core';
 
@@ -23,7 +23,7 @@ const QS_CONFIG = getQSConfig(
   ['id', 'page', 'page_size']
 );
 
-function ExecutionEnvironmentTemplateList({ i18n, executionEnvironment }) {
+function ExecutionEnvironmentTemplateList({ executionEnvironment }) {
   const { id } = executionEnvironment;
   const location = useLocation();
 
@@ -79,44 +79,44 @@ function ExecutionEnvironmentTemplateList({ i18n, executionEnvironment }) {
           hasContentLoading={isLoading}
           items={templates}
           itemCount={templatesCount}
-          pluralizedItemName={i18n._(t`Templates`)}
+          pluralizedItemName={t`Templates`}
           qsConfig={QS_CONFIG}
           toolbarSearchableKeys={searchableKeys}
           toolbarRelatedSearchableKeys={relatedSearchableKeys}
           toolbarSearchColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: 'name__icontains',
               isDefault: true,
             },
             {
-              name: i18n._(t`Type`),
+              name: t`Type`,
               key: 'or__type',
               options: [
-                [`job_template`, i18n._(t`Job Template`)],
-                [`workflow_job_template`, i18n._(t`Workflow Template`)],
+                [`job_template`, t`Job Template`],
+                [`workflow_job_template`, t`Workflow Template`],
               ],
             },
             {
-              name: i18n._(t`Created By (Username)`),
+              name: t`Created By (Username)`,
               key: 'created_by__username__icontains',
             },
             {
-              name: i18n._(t`Modified By (Username)`),
+              name: t`Modified By (Username)`,
               key: 'modified_by__username__icontains',
             },
           ]}
           toolbarSortColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: 'name',
             },
             {
-              name: i18n._(t`Created`),
+              name: t`Created`,
               key: 'created',
             },
             {
-              name: i18n._(t`Modified`),
+              name: t`Modified`,
               key: 'modified',
             },
           ]}
@@ -136,4 +136,4 @@ function ExecutionEnvironmentTemplateList({ i18n, executionEnvironment }) {
   );
 }
 
-export default withI18n()(ExecutionEnvironmentTemplateList);
+export default ExecutionEnvironmentTemplateList;
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateListItem.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateListItem.jsx
index 4a33126386..4ae93ea1d7 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateListItem.jsx
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentTemplate/ExecutionEnvironmentTemplateListItem.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import {
@@ -10,7 +9,7 @@ import {
 
 import DataListCell from '../../../components/DataListCell';
 
-function ExecutionEnvironmentTemplateListItem({ template, detailUrl, i18n }) {
+function ExecutionEnvironmentTemplateListItem({ template, detailUrl }) {
   return (
     <DataListItem
       key={template.id}
@@ -20,18 +19,15 @@ function ExecutionEnvironmentTemplateListItem({ template, detailUrl, i18n }) {
       <DataListItemRow>
         <DataListItemCells
           dataListCells={[
-            <DataListCell key="name" aria-label={i18n._(t`Name`)}>
+            <DataListCell key="name" aria-label={t`Name`}>
               <Link to={`${detailUrl}`}>
                 <b>{template.name}</b>
               </Link>
             </DataListCell>,
-            <DataListCell
-              key="template-type"
-              aria-label={i18n._(t`Template type`)}
-            >
+            <DataListCell key="template-type" aria-label={t`Template type`}>
               {template.type === 'job_template'
-                ? i18n._(t`Job Template`)
-                : i18n._(t`Workflow Job Template`)}
+                ? t`Job Template`
+                : t`Workflow Job Template`}
             </DataListCell>,
           ]}
         />
@@ -40,4 +36,4 @@ function ExecutionEnvironmentTemplateListItem({ template, detailUrl, i18n }) {
   );
 }
 
-export default withI18n()(ExecutionEnvironmentTemplateListItem);
+export default ExecutionEnvironmentTemplateListItem;
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironments.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironments.jsx
index 1fcd89cddf..7f278760dc 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironments.jsx
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironments.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Route, Switch } from 'react-router-dom';
 
@@ -8,33 +8,24 @@ import ExecutionEnvironmentAdd from './ExecutionEnvironmentAdd';
 import ExecutionEnvironmentList from './ExecutionEnvironmentList';
 import ScreenHeader from '../../components/ScreenHeader/ScreenHeader';
 
-function ExecutionEnvironments({ i18n }) {
+function ExecutionEnvironments() {
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/execution_environments': i18n._(t`Execution Environments`),
-    '/execution_environments/add': i18n._(t`Create new execution environment`),
+    '/execution_environments': t`Execution Environments`,
+    '/execution_environments/add': t`Create new execution environment`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    executionEnvironments => {
-      if (!executionEnvironments) {
-        return;
-      }
-      setBreadcrumbConfig({
-        '/execution_environments': i18n._(t`Execution Environments`),
-        '/execution_environments/add': i18n._(
-          t`Create new execution environment`
-        ),
-        [`/execution_environments/${executionEnvironments.id}`]: `${executionEnvironments.name}`,
-        [`/execution_environments/${executionEnvironments.id}/edit`]: i18n._(
-          t`Edit details`
-        ),
-        [`/execution_environments/${executionEnvironments.id}/details`]: i18n._(
-          t`Details`
-        ),
-      });
-    },
-    [i18n]
-  );
+  const buildBreadcrumbConfig = useCallback(executionEnvironments => {
+    if (!executionEnvironments) {
+      return;
+    }
+    setBreadcrumbConfig({
+      '/execution_environments': t`Execution Environments`,
+      '/execution_environments/add': t`Create new execution environment`,
+      [`/execution_environments/${executionEnvironments.id}`]: `${executionEnvironments.name}`,
+      [`/execution_environments/${executionEnvironments.id}/edit`]: t`Edit details`,
+      [`/execution_environments/${executionEnvironments.id}/details`]: t`Details`,
+    });
+  }, []);
   return (
     <>
       <ScreenHeader
@@ -55,4 +46,4 @@ function ExecutionEnvironments({ i18n }) {
     </>
   );
 }
-export default withI18n()(ExecutionEnvironments);
+export default ExecutionEnvironments;
diff --git a/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.jsx b/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.jsx
index 30cc2bb350..59dff9fc16 100644
--- a/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.jsx
+++ b/awx/ui_next/src/screens/ExecutionEnvironment/shared/ExecutionEnvironmentForm.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useRef } from 'react';
 import { func, shape, bool } from 'prop-types';
 import { Formik, useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Form, FormGroup, Tooltip } from '@patternfly/react-core';
 
@@ -18,7 +18,6 @@ import { required } from '../../../util/validators';
 import useRequest from '../../../util/useRequest';
 
 function ExecutionEnvironmentFormFields({
-  i18n,
   me,
   options,
   executionEnvironment,
@@ -29,9 +28,7 @@ function ExecutionEnvironmentFormFields({
   );
   const [organizationField, organizationMeta, organizationHelpers] = useField({
     name: 'organization',
-    validate:
-      !me?.is_superuser &&
-      required(i18n._(t`Select a value for this field`), i18n),
+    validate: !me?.is_superuser && required(t`Select a value for this field`),
   });
 
   const isGloballyAvailable = useRef(!organizationField.value);
@@ -77,9 +74,7 @@ function ExecutionEnvironmentFormFields({
           me?.is_superuser &&
           ((!isOrgLookupDisabled && isGloballyAvailable) ||
             organizationField.value === null)
-            ? i18n._(
-                t`Leave this field blank to make the execution environment globally available.`
-              )
+            ? t`Leave this field blank to make the execution environment globally available.`
             : null
         }
         autoPopulate={!me?.is_superuser ? !executionEnvironment?.id : null}
@@ -92,22 +87,20 @@ function ExecutionEnvironmentFormFields({
     <>
       <FormField
         id="execution-environment-name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="execution-environment-image"
-        label={i18n._(t`Image name`)}
+        label={t`Image name`}
         name="image"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
-        tooltip={i18n._(
-          t`The registry location where the container is stored.`
-        )}
+        tooltip={t`The registry location where the container is stored.`}
       />
       <FormGroup
         fieldId="execution-environment-container-options"
@@ -117,7 +110,7 @@ function ExecutionEnvironmentFormFields({
             ? 'default'
             : 'error'
         }
-        label={i18n._(t`Pull`)}
+        label={t`Pull`}
       >
         <AnsibleSelect
           {...containerOptionsField}
@@ -130,15 +123,13 @@ function ExecutionEnvironmentFormFields({
       </FormGroup>
       <FormField
         id="execution-environment-description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
       {isOrgLookupDisabled && isGloballyAvailable.current ? (
         <Tooltip
-          content={i18n._(
-            t`Globally available execution environment can not be reassigned to a specific Organization`
-          )}
+          content={t`Globally available execution environment can not be reassigned to a specific Organization`}
         >
           {renderOrganizationLookup()}
         </Tooltip>
@@ -147,16 +138,14 @@ function ExecutionEnvironmentFormFields({
       )}
 
       <CredentialLookup
-        label={i18n._(t`Registry credential`)}
+        label={t`Registry credential`}
         credentialTypeKind="registry"
         helperTextInvalid={credentialMeta.error}
         isValid={!credentialMeta.touched || !credentialMeta.error}
         onBlur={() => credentialHelpers.setTouched()}
         onChange={onCredentialChange}
         value={credentialField.value}
-        tooltip={i18n._(
-          t`Credential to authenticate with a protected container registry.`
-        )}
+        tooltip={t`Credential to authenticate with a protected container registry.`}
       />
     </>
   );
@@ -243,4 +232,4 @@ ExecutionEnvironmentForm.defaultProps = {
   isOrgLookupDisabled: false,
 };
 
-export default withI18n()(ExecutionEnvironmentForm);
+export default ExecutionEnvironmentForm;
diff --git a/awx/ui_next/src/screens/Host/Host.jsx b/awx/ui_next/src/screens/Host/Host.jsx
index 2c29893b7c..dcd1d8c140 100644
--- a/awx/ui_next/src/screens/Host/Host.jsx
+++ b/awx/ui_next/src/screens/Host/Host.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Switch,
@@ -22,7 +22,7 @@ import HostGroups from './HostGroups';
 import { HostsAPI } from '../../api';
 import useRequest from '../../util/useRequest';
 
-function Host({ i18n, setBreadcrumb }) {
+function Host({ setBreadcrumb }) {
   const location = useLocation();
   const match = useRouteMatch('/hosts/:id');
   const { error, isLoading, result: host, request: fetchHost } = useRequest(
@@ -42,29 +42,29 @@ function Host({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Hosts`)}
+          {t`Back to Hosts`}
         </>
       ),
       link: `/hosts`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `${match.url}/details`,
       id: 0,
     },
     {
-      name: i18n._(t`Facts`),
+      name: t`Facts`,
       link: `${match.url}/facts`,
       id: 1,
     },
     {
-      name: i18n._(t`Groups`),
+      name: t`Groups`,
       link: `${match.url}/groups`,
       id: 2,
     },
     {
-      name: i18n._(t`Jobs`),
+      name: t`Jobs`,
       link: `${match.url}/jobs`,
       id: 3,
     },
@@ -87,8 +87,8 @@ function Host({ i18n, setBreadcrumb }) {
           <ContentError error={error}>
             {error?.response?.status === 404 && (
               <span>
-                {i18n._(t`Host not found.`)}{' '}
-                <Link to="/hosts">{i18n._(t`View all Hosts.`)}</Link>
+                {t`Host not found.`}{' '}
+                <Link to="/hosts">{t`View all Hosts.`}</Link>
               </span>
             )}
           </ContentError>
@@ -128,9 +128,7 @@ function Host({ i18n, setBreadcrumb }) {
           ]}
           <Route key="not-found" path="*">
             <ContentError isNotFound>
-              <Link to={`${match.url}/details`}>
-                {i18n._(t`View Host Details`)}
-              </Link>
+              <Link to={`${match.url}/details`}>{t`View Host Details`}</Link>
             </ContentError>
           </Route>
         </Switch>
@@ -139,5 +137,5 @@ function Host({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(Host);
+export default Host;
 export { Host as _Host };
diff --git a/awx/ui_next/src/screens/Host/HostDetail/HostDetail.jsx b/awx/ui_next/src/screens/Host/HostDetail/HostDetail.jsx
index 30f543d3ee..204f7afa99 100644
--- a/awx/ui_next/src/screens/Host/HostDetail/HostDetail.jsx
+++ b/awx/ui_next/src/screens/Host/HostDetail/HostDetail.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { useState } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { Host } from '../../../types';
@@ -19,7 +19,7 @@ import DeleteButton from '../../../components/DeleteButton';
 import { HostsAPI } from '../../../api';
 import HostToggle from '../../../components/HostToggle';
 
-function HostDetail({ i18n, host }) {
+function HostDetail({ host }) {
   const {
     created,
     description,
@@ -57,10 +57,10 @@ function HostDetail({ i18n, host }) {
       <AlertModal
         isOpen={deletionError}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => setDeletionError(false)}
       >
-        {i18n._(t`Failed to delete ${name}.`)}
+        {t`Failed to delete ${name}.`}
         <ErrorDetail error={deletionError} />
       </AlertModal>
     );
@@ -71,16 +71,16 @@ function HostDetail({ i18n, host }) {
     <CardBody>
       <HostToggle host={host} css="padding-bottom: 40px" />
       <DetailList gutter="sm">
-        <Detail label={i18n._(t`Name`)} value={name} dataCy="host-name" />
+        <Detail label={t`Name`} value={name} dataCy="host-name" />
         {recentPlaybookJobs?.length > 0 && (
           <Detail
-            label={i18n._(t`Activity`)}
+            label={t`Activity`}
             value={<Sparkline jobs={recentPlaybookJobs} />}
           />
         )}
-        <Detail label={i18n._(t`Description`)} value={description} />
+        <Detail label={t`Description`} value={description} />
         <Detail
-          label={i18n._(t`Inventory`)}
+          label={t`Inventory`}
           dataCy="host-inventory"
           value={
             <Link to={`/inventories/inventory/${inventory.id}/details`}>
@@ -90,37 +90,33 @@ function HostDetail({ i18n, host }) {
         />
         <UserDateDetail
           date={created}
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           user={created_by}
           dataCy="host-created-by"
         />
         <UserDateDetail
           date={modified}
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           user={modified_by}
           dataCy="host-last-modified-by"
         />
-        <VariablesDetail
-          label={i18n._(t`Variables`)}
-          rows={4}
-          value={variables}
-        />
+        <VariablesDetail label={t`Variables`} rows={4} value={variables} />
       </DetailList>
       <CardActionsRow>
         {user_capabilities?.edit && (
           <Button
             ouiaId="host-detail-edit-button"
-            aria-label={i18n._(t`edit`)}
+            aria-label={t`edit`}
             component={Link}
             to={`/hosts/${id}/edit`}
           >
-            {i18n._(t`Edit`)}
+            {t`Edit`}
           </Button>
         )}
         {user_capabilities?.delete && (
           <DeleteButton
             onConfirm={() => handleHostDelete()}
-            modalTitle={i18n._(t`Delete Host`)}
+            modalTitle={t`Delete Host`}
             name={name}
           />
         )}
@@ -129,10 +125,10 @@ function HostDetail({ i18n, host }) {
         <AlertModal
           isOpen={deletionError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={() => setDeletionError(null)}
         >
-          {i18n._(t`Failed to delete host.`)}
+          {t`Failed to delete host.`}
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
@@ -144,4 +140,4 @@ HostDetail.propTypes = {
   host: Host.isRequired,
 };
 
-export default withI18n()(HostDetail);
+export default HostDetail;
diff --git a/awx/ui_next/src/screens/Host/HostFacts/HostFacts.jsx b/awx/ui_next/src/screens/Host/HostFacts/HostFacts.jsx
index 08b447a991..ac62cddf42 100644
--- a/awx/ui_next/src/screens/Host/HostFacts/HostFacts.jsx
+++ b/awx/ui_next/src/screens/Host/HostFacts/HostFacts.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Host } from '../../../types';
 import { CardBody } from '../../../components/Card';
@@ -10,7 +10,7 @@ import ContentLoading from '../../../components/ContentLoading';
 import useRequest from '../../../util/useRequest';
 import { HostsAPI } from '../../../api';
 
-function HostFacts({ i18n, host }) {
+function HostFacts({ host }) {
   const { result: facts, isLoading, error, request: fetchFacts } = useRequest(
     useCallback(async () => {
       const [{ data: factsObj }] = await Promise.all([
@@ -36,7 +36,7 @@ function HostFacts({ i18n, host }) {
   return (
     <CardBody>
       <DetailList gutter="sm">
-        <VariablesDetail label={i18n._(t`Facts`)} rows="auto" value={facts} />
+        <VariablesDetail label={t`Facts`} rows="auto" value={facts} />
       </DetailList>
     </CardBody>
   );
@@ -46,4 +46,4 @@ HostFacts.propTypes = {
   host: Host.isRequired,
 };
 
-export default withI18n()(HostFacts);
+export default HostFacts;
diff --git a/awx/ui_next/src/screens/Host/HostGroups/HostGroupItem.jsx b/awx/ui_next/src/screens/Host/HostGroups/HostGroupItem.jsx
index 9f26cc3bc4..ca1bb97f21 100644
--- a/awx/ui_next/src/screens/Host/HostGroups/HostGroupItem.jsx
+++ b/awx/ui_next/src/screens/Host/HostGroups/HostGroupItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { bool, func, number, oneOfType, string } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import {
@@ -18,7 +18,7 @@ import { PencilAltIcon } from '@patternfly/react-icons';
 import DataListCell from '../../../components/DataListCell';
 import { Group } from '../../../types';
 
-function HostGroupItem({ i18n, group, inventoryId, isSelected, onSelect }) {
+function HostGroupItem({ group, inventoryId, isSelected, onSelect }) {
   const labelId = `check-action-${group.id}`;
   const detailUrl = `/inventories/inventory/${inventoryId}/groups/${group.id}/details`;
   const editUrl = `/inventories/inventory/${inventoryId}/groups/${group.id}/edit`;
@@ -42,12 +42,12 @@ function HostGroupItem({ i18n, group, inventoryId, isSelected, onSelect }) {
           ]}
         />
         <DataListAction
-          aria-label={i18n._(t`actions`)}
+          aria-label={t`actions`}
           aria-labelledby={labelId}
           id={labelId}
         >
           {group.summary_fields.user_capabilities.edit && (
-            <Tooltip content={i18n._(t`Edit Group`)} position="top">
+            <Tooltip content={t`Edit Group`} position="top">
               <Button
                 ouiaId={`${group.id}-edit-button`}
                 variant="plain"
@@ -71,4 +71,4 @@ HostGroupItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(HostGroupItem);
+export default HostGroupItem;
diff --git a/awx/ui_next/src/screens/Host/HostGroups/HostGroups.jsx b/awx/ui_next/src/screens/Host/HostGroups/HostGroups.jsx
index 235d233493..eb8bf05d66 100644
--- a/awx/ui_next/src/screens/Host/HostGroups/HostGroups.jsx
+++ b/awx/ui_next/src/screens/Host/HostGroups/HostGroups.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { Switch, Route } from 'react-router-dom';
 import HostGroupsList from './HostGroupsList';
 
@@ -14,4 +14,4 @@ function HostGroups({ host }) {
 }
 
 export { HostGroups as _HostGroups };
-export default withI18n()(HostGroups);
+export default HostGroups;
diff --git a/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.jsx b/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.jsx
index 3cb8974d2a..3f1a8da99d 100644
--- a/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.jsx
+++ b/awx/ui_next/src/screens/Host/HostGroups/HostGroupsList.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { getQSConfig, parseQueryString, mergeParams } from '../../../util/qs';
 import useRequest, {
@@ -25,7 +25,7 @@ const QS_CONFIG = getQSConfig('group', {
   order_by: 'name',
 });
 
-function HostGroupsList({ i18n, host }) {
+function HostGroupsList({ host }) {
   const [isModalOpen, setIsModalOpen] = useState(false);
 
   const { id: hostId } = useParams();
@@ -155,22 +155,22 @@ function HostGroupsList({ i18n, host }) {
         onRowClick={handleSelect}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Created By (Username)`),
+            name: t`Created By (Username)`,
             key: 'created_by__username__icontains',
           },
           {
-            name: i18n._(t`Modified By (Username)`),
+            name: t`Modified By (Username)`,
             key: 'modified_by__username__icontains',
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
           },
         ]}
@@ -208,13 +208,13 @@ function HostGroupsList({ i18n, host }) {
                 key="disassociate"
                 onDisassociate={handleDisassociate}
                 itemsToDisassociate={selected}
-                modalTitle={i18n._(t`Disassociate group from host?`)}
-                modalNote={i18n._(t`
+                modalTitle={t`Disassociate group from host?`}
+                modalNote={t`
                   Note that you may still see the group in the list after
-                  disassociating if the host is also a member of that group’s 
-                  children.  This list shows all groups the host is associated 
+                  disassociating if the host is also a member of that group’s
+                  children.  This list shows all groups the host is associated
                   with directly and indirectly.
-                `)}
+                `}
               />,
             ]}
           />
@@ -227,29 +227,29 @@ function HostGroupsList({ i18n, host }) {
       />
       {isModalOpen && (
         <AssociateModal
-          header={i18n._(t`Groups`)}
+          header={t`Groups`}
           fetchRequest={fetchGroupsToAssociate}
           optionsRequest={fetchGroupsOptions}
           isModalOpen={isModalOpen}
           onAssociate={handleAssociate}
           onClose={() => setIsModalOpen(false)}
-          title={i18n._(t`Select Groups`)}
+          title={t`Select Groups`}
         />
       )}
       {error && (
         <AlertModal
           isOpen={error}
           onClose={dismissError}
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           variant="error"
         >
           {associateError
-            ? i18n._(t`Failed to associate.`)
-            : i18n._(t`Failed to disassociate one or more groups.`)}
+            ? t`Failed to associate.`
+            : t`Failed to disassociate one or more groups.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
     </>
   );
 }
-export default withI18n()(HostGroupsList);
+export default HostGroupsList;
diff --git a/awx/ui_next/src/screens/Host/HostList/HostList.jsx b/awx/ui_next/src/screens/Host/HostList/HostList.jsx
index 684d195ac9..5c2bbd8670 100644
--- a/awx/ui_next/src/screens/Host/HostList/HostList.jsx
+++ b/awx/ui_next/src/screens/Host/HostList/HostList.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { useHistory, useLocation, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 
@@ -32,7 +32,7 @@ const QS_CONFIG = getQSConfig('host', {
   order_by: 'name',
 });
 
-function HostList({ i18n }) {
+function HostList() {
   const history = useHistory();
   const location = useLocation();
   const match = useRouteMatch();
@@ -139,25 +139,25 @@ function HostList({ i18n }) {
           hasContentLoading={isLoading || isDeleteLoading}
           items={hosts}
           itemCount={count}
-          pluralizedItemName={i18n._(t`Hosts`)}
+          pluralizedItemName={t`Hosts`}
           qsConfig={QS_CONFIG}
           onRowClick={handleSelect}
           toolbarSearchColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: 'name__icontains',
               isDefault: true,
             },
             {
-              name: i18n._(t`Description`),
+              name: t`Description`,
               key: 'description__icontains',
             },
             {
-              name: i18n._(t`Created By (Username)`),
+              name: t`Created By (Username)`,
               key: 'created_by__username__icontains',
             },
             {
-              name: i18n._(t`Modified By (Username)`),
+              name: t`Modified By (Username)`,
               key: 'modified_by__username__icontains',
             },
           ]}
@@ -165,9 +165,9 @@ function HostList({ i18n }) {
           toolbarRelatedSearchableKeys={relatedSearchableKeys}
           headerRow={
             <HeaderRow qsConfig={QS_CONFIG}>
-              <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
-              <HeaderCell>{i18n._(t`Inventory`)}</HeaderCell>
-              <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
+              <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
+              <HeaderCell>{t`Inventory`}</HeaderCell>
+              <HeaderCell>{t`Actions`}</HeaderCell>
             </HeaderRow>
           }
           renderToolbar={props => (
@@ -185,7 +185,7 @@ function HostList({ i18n }) {
                   key="delete"
                   onDelete={handleHostDelete}
                   itemsToDelete={selected}
-                  pluralizedItemName={i18n._(t`Hosts`)}
+                  pluralizedItemName={t`Hosts`}
                 />,
                 ...(canAdd
                   ? [
@@ -219,10 +219,10 @@ function HostList({ i18n }) {
         <AlertModal
           isOpen={deletionError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={clearDeletionError}
         >
-          {i18n._(t`Failed to delete one or more hosts.`)}
+          {t`Failed to delete one or more hosts.`}
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
@@ -230,4 +230,4 @@ function HostList({ i18n }) {
   );
 }
 
-export default withI18n()(HostList);
+export default HostList;
diff --git a/awx/ui_next/src/screens/Host/HostList/HostListItem.jsx b/awx/ui_next/src/screens/Host/HostList/HostListItem.jsx
index efcd070427..01bd808761 100644
--- a/awx/ui_next/src/screens/Host/HostList/HostListItem.jsx
+++ b/awx/ui_next/src/screens/Host/HostList/HostListItem.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { Tr, Td } from '@patternfly/react-table';
@@ -11,14 +11,7 @@ import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
 import { Host } from '../../../types';
 import HostToggle from '../../../components/HostToggle';
 
-function HostListItem({
-  i18n,
-  host,
-  isSelected,
-  onSelect,
-  detailUrl,
-  rowIndex,
-}) {
+function HostListItem({ host, isSelected, onSelect, detailUrl, rowIndex }) {
   const labelId = `check-action-${host.id}`;
 
   return (
@@ -29,14 +22,14 @@ function HostListItem({
           isSelected,
           onSelect,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
           <b>{host.name}</b>
         </Link>
       </Td>
-      <Td dataLabel={i18n._(t`Inventory`)}>
+      <Td dataLabel={t`Inventory`}>
         {host.summary_fields.inventory && (
           <Link
             to={`/inventories/inventory/${host.summary_fields.inventory.id}/details`}
@@ -45,15 +38,15 @@ function HostListItem({
           </Link>
         )}
       </Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)} gridColumns="auto 40px">
+      <ActionsTd dataLabel={t`Actions`} gridColumns="auto 40px">
         <HostToggle host={host} />
         <ActionItem
           visible={host.summary_fields.user_capabilities.edit}
-          tooltip={i18n._(t`Edit Host`)}
+          tooltip={t`Edit Host`}
         >
           <Button
             ouiaId={`${host.id}-edit-button}`}
-            aria-label={i18n._(t`Edit Host`)}
+            aria-label={t`Edit Host`}
             variant="plain"
             component={Link}
             to={`/hosts/${host.id}/edit`}
@@ -73,4 +66,4 @@ HostListItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(HostListItem);
+export default HostListItem;
diff --git a/awx/ui_next/src/screens/Host/HostList/SmartInventoryButton.jsx b/awx/ui_next/src/screens/Host/HostList/SmartInventoryButton.jsx
index 83d30dece4..fee92e6bc7 100644
--- a/awx/ui_next/src/screens/Host/HostList/SmartInventoryButton.jsx
+++ b/awx/ui_next/src/screens/Host/HostList/SmartInventoryButton.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { func } from 'prop-types';
 import { Button, DropdownItem, Tooltip } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useKebabifiedMenu } from '../../../contexts/Kebabified';
 
-function SmartInventoryButton({ onClick, i18n, isDisabled }) {
+function SmartInventoryButton({ onClick, isDisabled }) {
   const { isKebabified } = useKebabifiedMenu();
 
   if (isKebabified) {
@@ -16,7 +16,7 @@ function SmartInventoryButton({ onClick, i18n, isDisabled }) {
         component="button"
         onClick={onClick}
       >
-        {i18n._(t`Smart Inventory`)}
+        {t`Smart Inventory`}
       </DropdownItem>
     );
   }
@@ -26,10 +26,8 @@ function SmartInventoryButton({ onClick, i18n, isDisabled }) {
       key="smartInventory"
       content={
         !isDisabled
-          ? i18n._(t`Create a new Smart Inventory with the applied filter`)
-          : i18n._(
-              t`Enter at least one search filter to create a new Smart Inventory`
-            )
+          ? t`Create a new Smart Inventory with the applied filter`
+          : t`Enter at least one search filter to create a new Smart Inventory`
       }
       position="top"
     >
@@ -37,11 +35,11 @@ function SmartInventoryButton({ onClick, i18n, isDisabled }) {
         <Button
           ouiaId="smart-inventory-button"
           onClick={onClick}
-          aria-label={i18n._(t`Smart Inventory`)}
+          aria-label={t`Smart Inventory`}
           variant="secondary"
           isDisabled={isDisabled}
         >
-          {i18n._(t`Smart Inventory`)}
+          {t`Smart Inventory`}
         </Button>
       </div>
     </Tooltip>
@@ -51,4 +49,4 @@ SmartInventoryButton.propTypes = {
   onClick: func.isRequired,
 };
 
-export default withI18n()(SmartInventoryButton);
+export default SmartInventoryButton;
diff --git a/awx/ui_next/src/screens/Host/Hosts.jsx b/awx/ui_next/src/screens/Host/Hosts.jsx
index d8769b071e..da48d99e90 100644
--- a/awx/ui_next/src/screens/Host/Hosts.jsx
+++ b/awx/ui_next/src/screens/Host/Hosts.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import { Config } from '../../contexts/Config';
@@ -10,30 +10,27 @@ import HostList from './HostList';
 import HostAdd from './HostAdd';
 import Host from './Host';
 
-function Hosts({ i18n }) {
+function Hosts() {
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/hosts': i18n._(t`Hosts`),
-    '/hosts/add': i18n._(t`Create New Host`),
+    '/hosts': t`Hosts`,
+    '/hosts/add': t`Create New Host`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    host => {
-      if (!host) {
-        return;
-      }
-      setBreadcrumbConfig({
-        '/hosts': i18n._(t`Hosts`),
-        '/hosts/add': i18n._(t`Create New Host`),
-        [`/hosts/${host.id}`]: `${host.name}`,
-        [`/hosts/${host.id}/edit`]: i18n._(t`Edit Details`),
-        [`/hosts/${host.id}/details`]: i18n._(t`Details`),
-        [`/hosts/${host.id}/facts`]: i18n._(t`Facts`),
-        [`/hosts/${host.id}/groups`]: i18n._(t`Groups`),
-        [`/hosts/${host.id}/jobs`]: i18n._(t`Jobs`),
-      });
-    },
-    [i18n]
-  );
+  const buildBreadcrumbConfig = useCallback(host => {
+    if (!host) {
+      return;
+    }
+    setBreadcrumbConfig({
+      '/hosts': t`Hosts`,
+      '/hosts/add': t`Create New Host`,
+      [`/hosts/${host.id}`]: `${host.name}`,
+      [`/hosts/${host.id}/edit`]: t`Edit Details`,
+      [`/hosts/${host.id}/details`]: t`Details`,
+      [`/hosts/${host.id}/facts`]: t`Facts`,
+      [`/hosts/${host.id}/groups`]: t`Groups`,
+      [`/hosts/${host.id}/jobs`]: t`Jobs`,
+    });
+  }, []);
 
   return (
     <>
@@ -58,4 +55,4 @@ function Hosts({ i18n }) {
 }
 
 export { Hosts as _Hosts };
-export default withI18n()(Hosts);
+export default Hosts;
diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.jsx b/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.jsx
index b806e999f7..640380b983 100644
--- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.jsx
@@ -7,7 +7,7 @@ import {
   useLocation,
   useParams,
 } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
@@ -22,7 +22,7 @@ import JobList from '../../components/JobList';
 import ContainerGroupDetails from './ContainerGroupDetails';
 import ContainerGroupEdit from './ContainerGroupEdit';
 
-function ContainerGroup({ i18n, setBreadcrumb }) {
+function ContainerGroup({ setBreadcrumb }) {
   const { id } = useParams();
   const { pathname } = useLocation();
 
@@ -53,19 +53,19 @@ function ContainerGroup({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to instance groups`)}
+          {t`Back to instance groups`}
         </>
       ),
       link: '/instance_groups',
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/instance_groups/container_group/${id}/details`,
       id: 0,
     },
     {
-      name: i18n._(t`Jobs`),
+      name: t`Jobs`,
       link: `/instance_groups/container_group/${id}/jobs`,
       id: 1,
     },
@@ -78,11 +78,9 @@ function ContainerGroup({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response?.status === 404 && (
               <span>
-                {i18n._(t`Container group not found.`)}
+                {t`Container group not found.`}
                 {''}
-                <Link to="/instance_groups">
-                  {i18n._(t`View all instance groups`)}
-                </Link>
+                <Link to="/instance_groups">{t`View all instance groups`}</Link>
               </span>
             )}
           </ContentError>
@@ -131,4 +129,4 @@ function ContainerGroup({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(ContainerGroup);
+export default ContainerGroup;
diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.jsx b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.jsx
index 77b2b31bfb..da25393c0c 100644
--- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link, useHistory } from 'react-router-dom';
 import { Button, Label } from '@patternfly/react-core';
@@ -18,7 +18,7 @@ import { jsonToYaml, isJsonString } from '../../../util/yaml';
 import { InstanceGroupsAPI } from '../../../api';
 import { relatedResourceDeleteRequests } from '../../../util/getRelatedResourceDeleteDetails';
 
-function ContainerGroupDetails({ instanceGroup, i18n }) {
+function ContainerGroupDetails({ instanceGroup }) {
   const { id, name } = instanceGroup;
 
   const history = useHistory();
@@ -42,18 +42,18 @@ function ContainerGroupDetails({ instanceGroup, i18n }) {
     <CardBody>
       <DetailList>
         <Detail
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={instanceGroup.name}
           dataCy="container-group-detail-name"
         />
         <Detail
-          label={i18n._(t`Type`)}
-          value={i18n._(t`Container group`)}
+          label={t`Type`}
+          value={t`Container group`}
           dataCy="container-group-type"
         />
         {instanceGroup.summary_fields.credential && (
           <Detail
-            label={i18n._(t`Credential`)}
+            label={t`Credential`}
             value={
               <Label variant="outline" color="blue">
                 {instanceGroup.summary_fields.credential?.name}
@@ -63,18 +63,18 @@ function ContainerGroupDetails({ instanceGroup, i18n }) {
           />
         )}
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={instanceGroup.created}
           user={instanceGroup.summary_fields.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={instanceGroup.modified}
           user={instanceGroup.summary_fields.modified_by}
         />
         {instanceGroup.pod_spec_override && (
           <VariablesDetail
-            label={i18n._(t`Pod spec override`)}
+            label={t`Pod spec override`}
             value={
               isJsonString(instanceGroup.pod_spec_override)
                 ? jsonToYaml(instanceGroup.pod_spec_override)
@@ -90,26 +90,24 @@ function ContainerGroupDetails({ instanceGroup, i18n }) {
           instanceGroup.summary_fields.user_capabilities.edit && (
             <Button
               ouiaId="container-group-detail-edit-button"
-              aria-label={i18n._(t`edit`)}
+              aria-label={t`edit`}
               component={Link}
               to={`/instance_groups/container_group/${id}/edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
         {instanceGroup.summary_fields.user_capabilities &&
           instanceGroup.summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={name}
-              modalTitle={i18n._(t`Delete instance group`)}
+              modalTitle={t`Delete instance group`}
               onConfirm={deleteInstanceGroup}
               isDisabled={isLoading}
               deleteDetailsRequests={deleteDetailsRequests}
-              deleteMessage={i18n._(
-                t`This container group is currently being by other resources. Are you sure you want to delete it?`
-              )}
+              deleteMessage={t`This container group is currently being by other resources. Are you sure you want to delete it?`}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -117,7 +115,7 @@ function ContainerGroupDetails({ instanceGroup, i18n }) {
         <AlertModal
           isOpen={error}
           onClose={dismissError}
-          title={i18n._(t`Error`)}
+          title={t`Error`}
           variant="error"
         />
       )}
@@ -125,4 +123,4 @@ function ContainerGroupDetails({ instanceGroup, i18n }) {
   );
 }
 
-export default withI18n()(ContainerGroupDetails);
+export default ContainerGroupDetails;
diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroup.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroup.jsx
index 06c348a8b9..5d13650c3f 100644
--- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroup.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroup.jsx
@@ -7,7 +7,7 @@ import {
   useLocation,
   useParams,
 } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
@@ -23,7 +23,7 @@ import InstanceGroupDetails from './InstanceGroupDetails';
 import InstanceGroupEdit from './InstanceGroupEdit';
 import InstanceList from './Instances/InstanceList';
 
-function InstanceGroup({ i18n, setBreadcrumb }) {
+function InstanceGroup({ setBreadcrumb }) {
   const { id } = useParams();
   const { pathname } = useLocation();
 
@@ -54,24 +54,24 @@ function InstanceGroup({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to instance groups`)}
+          {t`Back to instance groups`}
         </>
       ),
       link: '/instance_groups',
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/instance_groups/${id}/details`,
       id: 0,
     },
     {
-      name: i18n._(t`Instances`),
+      name: t`Instances`,
       link: `/instance_groups/${id}/instances`,
       id: 1,
     },
     {
-      name: i18n._(t`Jobs`),
+      name: t`Jobs`,
       link: `/instance_groups/${id}/jobs`,
       id: 2,
     },
@@ -84,11 +84,9 @@ function InstanceGroup({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response?.status === 404 && (
               <span>
-                {i18n._(t`Instance group not found.`)}
+                {t`Instance group not found.`}
                 {''}
-                <Link to="/instance_groups">
-                  {i18n._(t`View all instance groups`)}
-                </Link>
+                <Link to="/instance_groups">{t`View all instance groups`}</Link>
               </span>
             )}
           </ContentError>
@@ -140,4 +138,4 @@ function InstanceGroup({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(InstanceGroup);
+export default InstanceGroup;
diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.jsx
index 414c2effd8..1e9b1bb8c5 100644
--- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link, useHistory } from 'react-router-dom';
 import styled from 'styled-components';
@@ -22,7 +22,7 @@ const Unavailable = styled.span`
   color: var(--pf-global--danger-color--200);
 `;
 
-function InstanceGroupDetails({ instanceGroup, i18n }) {
+function InstanceGroupDetails({ instanceGroup }) {
   const { id, name } = instanceGroup;
 
   const history = useHistory();
@@ -47,32 +47,32 @@ function InstanceGroupDetails({ instanceGroup, i18n }) {
     <CardBody>
       <DetailList>
         <Detail
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={instanceGroup.name}
           dataCy="instance-group-detail-name"
         />
         <Detail
-          label={i18n._(t`Type`)}
+          label={t`Type`}
           value={
             instanceGroup.is_container_group
-              ? i18n._(t`Container group`)
-              : i18n._(t`Instance group`)
+              ? t`Container group`
+              : t`Instance group`
           }
           dataCy="instance-group-type"
         />
         <DetailBadge
-          label={i18n._(t`Policy instance minimum`)}
+          label={t`Policy instance minimum`}
           dataCy="instance-group-policy-instance-minimum"
           content={instanceGroup.policy_instance_minimum}
         />
         <DetailBadge
-          label={i18n._(t`Policy instance percentage`)}
+          label={t`Policy instance percentage`}
           dataCy="instance-group-policy-instance-percentage"
           content={`${instanceGroup.policy_instance_percentage} %`}
         />
         {instanceGroup.capacity ? (
           <DetailBadge
-            label={i18n._(t`Used capacity`)}
+            label={t`Used capacity`}
             content={`${Math.round(
               100 - instanceGroup.percent_capacity_remaining
             )} %`}
@@ -80,19 +80,19 @@ function InstanceGroupDetails({ instanceGroup, i18n }) {
           />
         ) : (
           <Detail
-            label={i18n._(t`Used capacity`)}
-            value={<Unavailable>{i18n._(t`Unavailable`)}</Unavailable>}
+            label={t`Used capacity`}
+            value={<Unavailable>{t`Unavailable`}</Unavailable>}
             dataCy="instance-group-used-capacity"
           />
         )}
 
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={instanceGroup.created}
           user={instanceGroup.summary_fields.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={instanceGroup.modified}
           user={instanceGroup.summary_fields.modified_by}
         />
@@ -103,11 +103,11 @@ function InstanceGroupDetails({ instanceGroup, i18n }) {
           instanceGroup.summary_fields.user_capabilities.edit && (
             <Button
               ouiaId="instance-group-detail-edit-button"
-              aria-label={i18n._(t`edit`)}
+              aria-label={t`edit`}
               component={Link}
               to={`/instance_groups/${id}/edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
         {name !== 'tower' &&
@@ -115,15 +115,13 @@ function InstanceGroupDetails({ instanceGroup, i18n }) {
           instanceGroup.summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={name}
-              modalTitle={i18n._(t`Delete instance group`)}
+              modalTitle={t`Delete instance group`}
               onConfirm={deleteInstanceGroup}
               isDisabled={isLoading}
               deleteDetailsRequests={deleteDetailsRequests}
-              deleteMessage={i18n._(
-                t`This instance group is currently being by other resources. Are you sure you want to delete it?`
-              )}
+              deleteMessage={t`This instance group is currently being by other resources. Are you sure you want to delete it?`}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -131,7 +129,7 @@ function InstanceGroupDetails({ instanceGroup, i18n }) {
         <AlertModal
           isOpen={error}
           onClose={dismissError}
-          title={i18n._(t`Error`)}
+          title={t`Error`}
           variant="error"
         />
       )}
@@ -139,4 +137,4 @@ function InstanceGroupDetails({ instanceGroup, i18n }) {
   );
 }
 
-export default withI18n()(InstanceGroupDetails);
+export default InstanceGroupDetails;
diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupListItem.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupListItem.jsx
index f6d7556a20..8c9ba76eaa 100644
--- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupListItem.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import 'styled-components/macro';
@@ -26,7 +26,6 @@ function InstanceGroupListItem({
   isSelected,
   onSelect,
   rowIndex,
-  i18n,
 }) {
   const labelId = `check-action-${instanceGroup.id}`;
 
@@ -42,11 +41,11 @@ function InstanceGroupListItem({
             value={Math.round(100 - item.percent_capacity_remaining)}
             measureLocation={ProgressMeasureLocation.top}
             size={ProgressSize.sm}
-            title={i18n._(t`Used capacity`)}
+            title={t`Used capacity`}
           />
         );
       }
-      return <Unavailable> {i18n._(t`Unavailable`)}</Unavailable>;
+      return <Unavailable> {t`Unavailable`}</Unavailable>;
     }
     return null;
   }
@@ -59,30 +58,30 @@ function InstanceGroupListItem({
           isSelected,
           onSelect,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
           <b>{instanceGroup.name}</b>
         </Link>
       </Td>
-      <Td dataLabel={i18n._(t`Type`)}>
+      <Td dataLabel={t`Type`}>
         {isContainerGroup(instanceGroup)
-          ? i18n._(t`Container group`)
-          : i18n._(t`Instance group`)}
+          ? t`Container group`
+          : t`Instance group`}
       </Td>
-      <Td dataLabel={i18n._(t`Running jobs`)}>{instanceGroup.jobs_running}</Td>
-      <Td dataLabel={i18n._(t`Total jobs`)}>{instanceGroup.jobs_total}</Td>
-      <Td dataLabel={i18n._(t`Instances`)}>{instanceGroup.instances}</Td>
-      <Td dataLabel={i18n._(t`Capacity`)}>{usedCapacity(instanceGroup)}</Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)}>
+      <Td dataLabel={t`Running jobs`}>{instanceGroup.jobs_running}</Td>
+      <Td dataLabel={t`Total jobs`}>{instanceGroup.jobs_total}</Td>
+      <Td dataLabel={t`Instances`}>{instanceGroup.instances}</Td>
+      <Td dataLabel={t`Capacity`}>{usedCapacity(instanceGroup)}</Td>
+      <ActionsTd dataLabel={t`Actions`}>
         <ActionItem
           visible={instanceGroup.summary_fields.user_capabilities.edit}
-          tooltip={i18n._(t`Edit instance group`)}
+          tooltip={t`Edit instance group`}
         >
           <Button
             ouiaId={`${instanceGroup.id}-edit-button`}
-            aria-label={i18n._(t`Edit instance group`)}
+            aria-label={t`Edit instance group`}
             variant="plain"
             component={Link}
             to={
@@ -105,4 +104,4 @@ InstanceGroupListItem.prototype = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(InstanceGroupListItem);
+export default InstanceGroupListItem;
diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx
index 9a41e18cc2..f76c57c21f 100644
--- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Route, Switch } from 'react-router-dom';
 
@@ -11,49 +11,34 @@ import ContainerGroupAdd from './ContainerGroupAdd';
 import ContainerGroup from './ContainerGroup';
 import ScreenHeader from '../../components/ScreenHeader';
 
-function InstanceGroups({ i18n }) {
+function InstanceGroups() {
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/instance_groups': i18n._(t`Instance Groups`),
-    '/instance_groups/add': i18n._(t`Create new instance group`),
-    '/instance_groups/container_group/add': i18n._(
-      t`Create new container group`
-    ),
+    '/instance_groups': t`Instance Groups`,
+    '/instance_groups/add': t`Create new instance group`,
+    '/instance_groups/container_group/add': t`Create new container group`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    instanceGroups => {
-      if (!instanceGroups) {
-        return;
-      }
-      setBreadcrumbConfig({
-        '/instance_groups': i18n._(t`Instance Groups`),
-        '/instance_groups/add': i18n._(t`Create new instance group`),
-        '/instance_groups/container_group/add': i18n._(
-          t`Create new container group`
-        ),
+  const buildBreadcrumbConfig = useCallback(instanceGroups => {
+    if (!instanceGroups) {
+      return;
+    }
+    setBreadcrumbConfig({
+      '/instance_groups': t`Instance Groups`,
+      '/instance_groups/add': t`Create new instance group`,
+      '/instance_groups/container_group/add': t`Create new container group`,
 
-        [`/instance_groups/${instanceGroups.id}/details`]: i18n._(t`Details`),
-        [`/instance_groups/${instanceGroups.id}/instances`]: i18n._(
-          t`Instances`
-        ),
-        [`/instance_groups/${instanceGroups.id}/jobs`]: i18n._(t`Jobs`),
-        [`/instance_groups/${instanceGroups.id}/edit`]: i18n._(t`Edit details`),
-        [`/instance_groups/${instanceGroups.id}`]: `${instanceGroups.name}`,
+      [`/instance_groups/${instanceGroups.id}/details`]: t`Details`,
+      [`/instance_groups/${instanceGroups.id}/instances`]: t`Instances`,
+      [`/instance_groups/${instanceGroups.id}/jobs`]: t`Jobs`,
+      [`/instance_groups/${instanceGroups.id}/edit`]: t`Edit details`,
+      [`/instance_groups/${instanceGroups.id}`]: `${instanceGroups.name}`,
 
-        [`/instance_groups/container_group/${instanceGroups.id}/details`]: i18n._(
-          t`Details`
-        ),
-        [`/instance_groups/container_group/${instanceGroups.id}/jobs`]: i18n._(
-          t`Jobs`
-        ),
-        [`/instance_groups/container_group/${instanceGroups.id}/edit`]: i18n._(
-          t`Edit details`
-        ),
-        [`/instance_groups/container_group/${instanceGroups.id}`]: `${instanceGroups.name}`,
-      });
-    },
-    [i18n]
-  );
+      [`/instance_groups/container_group/${instanceGroups.id}/details`]: t`Details`,
+      [`/instance_groups/container_group/${instanceGroups.id}/jobs`]: t`Jobs`,
+      [`/instance_groups/container_group/${instanceGroups.id}/edit`]: t`Edit details`,
+      [`/instance_groups/container_group/${instanceGroups.id}`]: `${instanceGroups.name}`,
+    });
+  }, []);
   return (
     <>
       <ScreenHeader
@@ -81,4 +66,4 @@ function InstanceGroups({ i18n }) {
   );
 }
 
-export default withI18n()(InstanceGroups);
+export default InstanceGroups;
diff --git a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceList.jsx b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceList.jsx
index ba89d888f7..ea705e1b93 100644
--- a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceList.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceList.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useLocation, useParams } from 'react-router-dom';
 import 'styled-components/macro';
@@ -29,7 +29,7 @@ const QS_CONFIG = getQSConfig('instance', {
   order_by: 'hostname',
 });
 
-function InstanceList({ i18n }) {
+function InstanceList() {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const location = useLocation();
   const { id: instanceGroupId } = useParams();
@@ -145,21 +145,21 @@ function InstanceList({ i18n }) {
         hasContentLoading={isLoading || isDisassociateLoading}
         items={instances}
         itemCount={count}
-        pluralizedItemName={i18n._(t`Instances`)}
+        pluralizedItemName={t`Instances`}
         qsConfig={QS_CONFIG}
         onRowClick={handleSelect}
         toolbarSearchableKeys={searchableKeys}
         toolbarRelatedSearchableKeys={relatedSearchableKeys}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'hostname',
             isDefault: true,
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'hostname',
           },
         ]}
@@ -178,7 +178,7 @@ function InstanceList({ i18n }) {
                     <ToolbarAddButton
                       key="associate"
                       onClick={() => setIsModalOpen(true)}
-                      defaultLabel={i18n._(t`Associate`)}
+                      defaultLabel={t`Associate`}
                     />,
                   ]
                 : []),
@@ -187,9 +187,7 @@ function InstanceList({ i18n }) {
                 key="disassociate"
                 onDisassociate={handleDisassociate}
                 itemsToDisassociate={selected}
-                modalTitle={i18n._(
-                  t`Disassociate instance from instance group?`
-                )}
+                modalTitle={t`Disassociate instance from instance group?`}
               />,
             ]}
             emptyStateControls={
@@ -215,12 +213,12 @@ function InstanceList({ i18n }) {
       />
       {isModalOpen && (
         <AssociateModal
-          header={i18n._(t`Instances`)}
+          header={t`Instances`}
           fetchRequest={fetchInstancesToAssociate}
           isModalOpen={isModalOpen}
           onAssociate={handleAssociate}
           onClose={() => setIsModalOpen(false)}
-          title={i18n._(t`Select Instances`)}
+          title={t`Select Instances`}
           optionsRequest={readInstancesOptions}
           displayKey="hostname"
         />
@@ -229,12 +227,12 @@ function InstanceList({ i18n }) {
         <AlertModal
           isOpen={error}
           onClose={dismissError}
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           variant="error"
         >
           {associateError
-            ? i18n._(t`Failed to associate.`)
-            : i18n._(t`Failed to disassociate one or more instances.`)}
+            ? t`Failed to associate.`
+            : t`Failed to disassociate one or more instances.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -242,4 +240,4 @@ function InstanceList({ i18n }) {
   );
 }
 
-export default withI18n()(InstanceList);
+export default InstanceList;
diff --git a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.jsx b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.jsx
index d6176b73fa..09465d00e1 100644
--- a/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import 'styled-components/macro';
@@ -40,13 +40,7 @@ const ListGroup = styled.span`
   }
 `;
 
-function InstanceListItem({
-  instance,
-  isSelected,
-  onSelect,
-  fetchInstances,
-  i18n,
-}) {
+function InstanceListItem({ instance, isSelected, onSelect, fetchInstances }) {
   const labelId = `check-action-${instance.id}`;
 
   function usedCapacity(item) {
@@ -56,11 +50,11 @@ function InstanceListItem({
           value={Math.round(100 - item.percent_capacity_remaining)}
           measureLocation={ProgressMeasureLocation.top}
           size={ProgressSize.sm}
-          title={i18n._(t`Used capacity`)}
+          title={t`Used capacity`}
         />
       );
     }
-    return <Unavailable>{i18n._(t`Unavailable`)}</Unavailable>;
+    return <Unavailable>{t`Unavailable`}</Unavailable>;
   }
 
   return (
@@ -79,41 +73,39 @@ function InstanceListItem({
 
         <DataListItemCells
           dataListCells={[
-            <DataListCell key="name" aria-label={i18n._(t`instance host name`)}>
+            <DataListCell key="name" aria-label={t`instance host name`}>
               <b>{instance.hostname}</b>
             </DataListCell>,
-            <DataListCell key="type" aria-label={i18n._(t`instance type`)}>
-              <b css="margin-right: 24px">{i18n._(t`Type`)}</b>
+            <DataListCell key="type" aria-label={t`instance type`}>
+              <b css="margin-right: 24px">{t`Type`}</b>
               <span id={labelId}>
-                {instance.managed_by_policy
-                  ? i18n._(t`Auto`)
-                  : i18n._(t`Manual`)}
+                {instance.managed_by_policy ? t`Auto` : t`Manual`}
               </span>
             </DataListCell>,
             <DataListCell
               key="related-field-counts"
-              aria-label={i18n._(t`instance counts`)}
+              aria-label={t`instance counts`}
               width={2}
             >
               <ListGroup>
-                <b>{i18n._(t`Running jobs`)}</b>
+                <b>{t`Running jobs`}</b>
                 <Badge isRead>{instance.jobs_running}</Badge>
               </ListGroup>
               <ListGroup>
-                <b>{i18n._(t`Total jobs`)}</b>
+                <b>{t`Total jobs`}</b>
                 <Badge isRead>{instance.jobs_total}</Badge>
               </ListGroup>
             </DataListCell>,
             <DataListCell
               key="capacity"
-              aria-label={i18n._(t`instance group used capacity`)}
+              aria-label={t`instance group used capacity`}
             >
               {usedCapacity(instance)}
             </DataListCell>,
           ]}
         />
         <DataListAction
-          aria-label={i18n._(t`actions`)}
+          aria-label={t`actions`}
           aria-labelledby={labelId}
           id={labelId}
         >
@@ -133,4 +125,4 @@ InstanceListItem.prototype = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(InstanceListItem);
+export default InstanceListItem;
diff --git a/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.jsx b/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.jsx
index 719c907d1b..eacb3173b8 100644
--- a/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { func, shape } from 'prop-types';
 import { Formik, useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Form, FormGroup } from '@patternfly/react-core';
 import { jsonToYaml } from '../../../util/yaml';
@@ -21,7 +21,7 @@ import {
 import CredentialLookup from '../../../components/Lookup/CredentialLookup';
 import { VariablesField } from '../../../components/CodeEditor';
 
-function ContainerGroupFormFields({ i18n, instanceGroup }) {
+function ContainerGroupFormFields({ instanceGroup }) {
   const { setFieldValue } = useFormikContext();
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
@@ -41,34 +41,29 @@ function ContainerGroupFormFields({ i18n, instanceGroup }) {
       <FormField
         name="name"
         id="container-group-name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <CredentialLookup
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         credentialTypeKind="kubernetes"
         helperTextInvalid={credentialMeta.error}
         isValid={!credentialMeta.touched || !credentialMeta.error}
         onBlur={() => credentialHelpers.setTouched()}
         onChange={onCredentialChange}
         value={credentialField.value}
-        tooltip={i18n._(
-          t`Credential to authenticate with Kubernetes or OpenShift. Must be of type "Kubernetes/OpenShift API Bearer Token". If left blank, the underlying Pod's service account will be used.`
-        )}
+        tooltip={t`Credential to authenticate with Kubernetes or OpenShift. Must be of type "Kubernetes/OpenShift API Bearer Token". If left blank, the underlying Pod's service account will be used.`}
         autoPopulate={!instanceGroup?.id}
       />
 
-      <FormGroup
-        fieldId="container-groups-option-checkbox"
-        label={i18n._(t`Options`)}
-      >
+      <FormGroup fieldId="container-groups-option-checkbox" label={t`Options`}>
         <FormCheckboxLayout>
           <CheckboxField
             name="override"
-            aria-label={i18n._(t`Customize pod specification`)}
-            label={i18n._(t`Customize pod specification`)}
+            aria-label={t`Customize pod specification`}
+            label={t`Customize pod specification`}
             id="container-groups-override-pod-specification"
           />
         </FormCheckboxLayout>
@@ -78,12 +73,10 @@ function ContainerGroupFormFields({ i18n, instanceGroup }) {
         <SubFormLayout>
           <FormFullWidthLayout>
             <VariablesField
-              tooltip={i18n._(
-                t`Field for passing a custom Kubernetes or OpenShift Pod specification.`
-              )}
+              tooltip={t`Field for passing a custom Kubernetes or OpenShift Pod specification.`}
               id="custom-pod-spec"
               name="pod_spec_override"
-              label={i18n._(t`Custom pod spec`)}
+              label={t`Custom pod spec`}
             />
           </FormFullWidthLayout>
         </SubFormLayout>
@@ -148,4 +141,4 @@ ContainerGroupForm.defaultProps = {
   initialPodSpec: {},
 };
 
-export default withI18n()(ContainerGroupForm);
+export default ContainerGroupForm;
diff --git a/awx/ui_next/src/screens/InstanceGroup/shared/InstanceGroupForm.jsx b/awx/ui_next/src/screens/InstanceGroup/shared/InstanceGroupForm.jsx
index 2f55092394..50f75e1831 100644
--- a/awx/ui_next/src/screens/InstanceGroup/shared/InstanceGroupForm.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/shared/InstanceGroupForm.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { func, shape } from 'prop-types';
 import { Formik, useField } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Form } from '@patternfly/react-core';
 
@@ -10,43 +10,39 @@ import FormActionGroup from '../../../components/FormActionGroup';
 import { required, minMaxValue } from '../../../util/validators';
 import { FormColumnLayout } from '../../../components/FormLayout';
 
-function InstanceGroupFormFields({ i18n }) {
+function InstanceGroupFormFields() {
   const [instanceGroupNameField, ,] = useField('name');
   return (
     <>
       <FormField
         name="name"
         id="instance-group-name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
         isDisabled={instanceGroupNameField.value === 'tower'}
       />
       <FormField
         id="instance-group-policy-instance-minimum"
-        label={i18n._(t`Policy instance minimum`)}
+        label={t`Policy instance minimum`}
         name="policy_instance_minimum"
         type="number"
         min="0"
-        validate={minMaxValue(0, 2147483647, i18n)}
-        tooltip={i18n._(
-          t`Minimum number of instances that will be automatically
-          assigned to this group when new instances come online.`
-        )}
+        validate={minMaxValue(0, 2147483647)}
+        tooltip={t`Minimum number of instances that will be automatically
+          assigned to this group when new instances come online.`}
       />
       <FormField
         id="instance-group-policy-instance-percentage"
-        label={i18n._(t`Policy instance percentage`)}
+        label={t`Policy instance percentage`}
         name="policy_instance_percentage"
         type="number"
         min="0"
         max="100"
-        tooltip={i18n._(
-          t`Minimum percentage of all instances that will be automatically
-          assigned to this group when new instances come online.`
-        )}
-        validate={minMaxValue(0, 100, i18n)}
+        tooltip={t`Minimum percentage of all instances that will be automatically
+          assigned to this group when new instances come online.`}
+        validate={minMaxValue(0, 100)}
       />
     </>
   );
@@ -94,4 +90,4 @@ InstanceGroupForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(InstanceGroupForm);
+export default InstanceGroupForm;
diff --git a/awx/ui_next/src/screens/Inventory/Inventories.jsx b/awx/ui_next/src/screens/Inventory/Inventories.jsx
index 12178f667f..fb548c03f7 100644
--- a/awx/ui_next/src/screens/Inventory/Inventories.jsx
+++ b/awx/ui_next/src/screens/Inventory/Inventories.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useRef } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Route, Switch } from 'react-router-dom';
 
@@ -11,11 +11,11 @@ import SmartInventory from './SmartInventory';
 import InventoryAdd from './InventoryAdd';
 import SmartInventoryAdd from './SmartInventoryAdd';
 
-function Inventories({ i18n }) {
+function Inventories() {
   const initScreenHeader = useRef({
-    '/inventories': i18n._(t`Inventories`),
-    '/inventories/inventory/add': i18n._(t`Create new inventory`),
-    '/inventories/smart_inventory/add': i18n._(t`Create new smart inventory`),
+    '/inventories': t`Inventories`,
+    '/inventories/inventory/add': t`Create new inventory`,
+    '/inventories/smart_inventory/add': t`Create new smart inventory`,
   });
 
   const [breadcrumbConfig, setScreenHeader] = useState(
@@ -55,71 +55,43 @@ function Inventories({ i18n }) {
       setScreenHeader({
         ...initScreenHeader.current,
         [inventoryPath]: `${inventory.name}`,
-        [`${inventoryPath}/access`]: i18n._(t`Access`),
-        [`${inventoryPath}/jobs`]: i18n._(t`Jobs`),
-        [`${inventoryPath}/details`]: i18n._(t`Details`),
-        [`${inventoryPath}/edit`]: i18n._(t`Edit details`),
+        [`${inventoryPath}/access`]: t`Access`,
+        [`${inventoryPath}/jobs`]: t`Jobs`,
+        [`${inventoryPath}/details`]: t`Details`,
+        [`${inventoryPath}/edit`]: t`Edit details`,
 
-        [inventoryHostsPath]: i18n._(t`Hosts`),
-        [`${inventoryHostsPath}/add`]: i18n._(t`Create new host`),
+        [inventoryHostsPath]: t`Hosts`,
+        [`${inventoryHostsPath}/add`]: t`Create new host`,
         [`${inventoryHostsPath}/${nestedObject?.id}`]: `${nestedObject?.name}`,
-        [`${inventoryHostsPath}/${nestedObject?.id}/edit`]: i18n._(
-          t`Edit details`
-        ),
-        [`${inventoryHostsPath}/${nestedObject?.id}/details`]: i18n._(
-          t`Host details`
-        ),
-        [`${inventoryHostsPath}/${nestedObject?.id}/jobs`]: i18n._(t`Jobs`),
-        [`${inventoryHostsPath}/${nestedObject?.id}/facts`]: i18n._(t`Facts`),
-        [`${inventoryHostsPath}/${nestedObject?.id}/groups`]: i18n._(t`Groups`),
+        [`${inventoryHostsPath}/${nestedObject?.id}/edit`]: t`Edit details`,
+        [`${inventoryHostsPath}/${nestedObject?.id}/details`]: t`Host details`,
+        [`${inventoryHostsPath}/${nestedObject?.id}/jobs`]: t`Jobs`,
+        [`${inventoryHostsPath}/${nestedObject?.id}/facts`]: t`Facts`,
+        [`${inventoryHostsPath}/${nestedObject?.id}/groups`]: t`Groups`,
 
-        [inventoryGroupsPath]: i18n._(t`Groups`),
-        [`${inventoryGroupsPath}/add`]: i18n._(t`Create new group`),
+        [inventoryGroupsPath]: t`Groups`,
+        [`${inventoryGroupsPath}/add`]: t`Create new group`,
         [`${inventoryGroupsPath}/${nestedObject?.id}`]: `${nestedObject?.name}`,
-        [`${inventoryGroupsPath}/${nestedObject?.id}/edit`]: i18n._(
-          t`Edit details`
-        ),
-        [`${inventoryGroupsPath}/${nestedObject?.id}/details`]: i18n._(
-          t`Group details`
-        ),
-        [`${inventoryGroupsPath}/${nestedObject?.id}/nested_hosts`]: i18n._(
-          t`Hosts`
-        ),
-        [`${inventoryGroupsPath}/${nestedObject?.id}/nested_hosts/add`]: i18n._(
-          t`Create new host`
-        ),
-        [`${inventoryGroupsPath}/${nestedObject?.id}/nested_groups`]: i18n._(
-          t`Related Groups`
-        ),
-        [`${inventoryGroupsPath}/${nestedObject?.id}/nested_groups/add`]: i18n._(
-          t`Create new group`
-        ),
+        [`${inventoryGroupsPath}/${nestedObject?.id}/edit`]: t`Edit details`,
+        [`${inventoryGroupsPath}/${nestedObject?.id}/details`]: t`Group details`,
+        [`${inventoryGroupsPath}/${nestedObject?.id}/nested_hosts`]: t`Hosts`,
+        [`${inventoryGroupsPath}/${nestedObject?.id}/nested_hosts/add`]: t`Create new host`,
+        [`${inventoryGroupsPath}/${nestedObject?.id}/nested_groups`]: t`Related Groups`,
+        [`${inventoryGroupsPath}/${nestedObject?.id}/nested_groups/add`]: t`Create new group`,
 
-        [`${inventorySourcesPath}`]: i18n._(t`Sources`),
-        [`${inventorySourcesPath}/add`]: i18n._(t`Create new source`),
+        [`${inventorySourcesPath}`]: t`Sources`,
+        [`${inventorySourcesPath}/add`]: t`Create new source`,
         [`${inventorySourcesPath}/${nestedObject?.id}`]: `${nestedObject?.name}`,
-        [`${inventorySourcesPath}/${nestedObject?.id}/details`]: i18n._(
-          t`Details`
-        ),
-        [`${inventorySourcesPath}/${nestedObject?.id}/edit`]: i18n._(
-          t`Edit details`
-        ),
-        [`${inventorySourcesPath}/${nestedObject?.id}/schedules`]: i18n._(
-          t`Schedules`
-        ),
+        [`${inventorySourcesPath}/${nestedObject?.id}/details`]: t`Details`,
+        [`${inventorySourcesPath}/${nestedObject?.id}/edit`]: t`Edit details`,
+        [`${inventorySourcesPath}/${nestedObject?.id}/schedules`]: t`Schedules`,
         [`${inventorySourcesPath}/${nestedObject?.id}/schedules/${schedule?.id}`]: `${schedule?.name}`,
-        [`${inventorySourcesPath}/${nestedObject?.id}/schedules/add`]: i18n._(
-          t`Create New Schedule`
-        ),
-        [`${inventorySourcesPath}/${nestedObject?.id}/schedules/${schedule?.id}/details`]: i18n._(
-          t`Schedule details`
-        ),
-        [`${inventorySourcesPath}/${nestedObject?.id}/notifications`]: i18n._(
-          t`Notifications`
-        ),
+        [`${inventorySourcesPath}/${nestedObject?.id}/schedules/add`]: t`Create New Schedule`,
+        [`${inventorySourcesPath}/${nestedObject?.id}/schedules/${schedule?.id}/details`]: t`Schedule details`,
+        [`${inventorySourcesPath}/${nestedObject?.id}/notifications`]: t`Notifications`,
       });
     },
-    [i18n, inventory, nestedObject, schedule]
+    [inventory, nestedObject, schedule]
   );
 
   return (
@@ -154,4 +126,4 @@ function Inventories({ i18n }) {
 }
 
 export { Inventories as _Inventories };
-export default withI18n()(Inventories);
+export default Inventories;
diff --git a/awx/ui_next/src/screens/Inventory/Inventory.jsx b/awx/ui_next/src/screens/Inventory/Inventory.jsx
index 15059270bc..7c4031c5a6 100644
--- a/awx/ui_next/src/screens/Inventory/Inventory.jsx
+++ b/awx/ui_next/src/screens/Inventory/Inventory.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import {
   Switch,
   Route,
@@ -23,7 +23,7 @@ import InventoryHosts from './InventoryHosts/InventoryHosts';
 import InventorySources from './InventorySources';
 import { InventoriesAPI } from '../../api';
 
-function Inventory({ i18n, setBreadcrumb }) {
+function Inventory({ setBreadcrumb }) {
   const [contentError, setContentError] = useState(null);
   const [hasContentLoading, setHasContentLoading] = useState(true);
   const [inventory, setInventory] = useState(null);
@@ -53,19 +53,19 @@ function Inventory({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Inventories`)}
+          {t`Back to Inventories`}
         </>
       ),
       link: `/inventories`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `${match.url}/details`, id: 0 },
-    { name: i18n._(t`Access`), link: `${match.url}/access`, id: 1 },
-    { name: i18n._(t`Groups`), link: `${match.url}/groups`, id: 2 },
-    { name: i18n._(t`Hosts`), link: `${match.url}/hosts`, id: 3 },
-    { name: i18n._(t`Sources`), link: `${match.url}/sources`, id: 4 },
+    { name: t`Details`, link: `${match.url}/details`, id: 0 },
+    { name: t`Access`, link: `${match.url}/access`, id: 1 },
+    { name: t`Groups`, link: `${match.url}/groups`, id: 2 },
+    { name: t`Hosts`, link: `${match.url}/hosts`, id: 3 },
+    { name: t`Sources`, link: `${match.url}/sources`, id: 4 },
     {
-      name: i18n._(t`Jobs`),
+      name: t`Jobs`,
       link: `${match.url}/jobs`,
       id: 5,
     },
@@ -88,10 +88,8 @@ function Inventory({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response?.status === 404 && (
               <span>
-                {i18n._(t`Inventory not found.`)}{' '}
-                <Link to="/inventories">
-                  {i18n._(t`View all Inventories.`)}
-                </Link>
+                {t`Inventory not found.`}{' '}
+                <Link to="/inventories">{t`View all Inventories.`}</Link>
               </span>
             )}
           </ContentError>
@@ -177,7 +175,7 @@ function Inventory({ i18n, setBreadcrumb }) {
                   <Link
                     to={`/inventories/inventory/${match.params.id}/details`}
                   >
-                    {i18n._(t`View Inventory Details`)}
+                    {t`View Inventory Details`}
                   </Link>
                 )}
               </ContentError>
@@ -190,4 +188,4 @@ function Inventory({ i18n, setBreadcrumb }) {
 }
 
 export { Inventory as _Inventory };
-export default withI18n()(Inventory);
+export default Inventory;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.jsx b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.jsx
index 709fa9d93c..f42c77782d 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryDetail/InventoryDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Chip } from '@patternfly/react-core';
 import AlertModal from '../../../components/AlertModal';
@@ -21,7 +21,7 @@ import useRequest, { useDismissableError } from '../../../util/useRequest';
 import { Inventory } from '../../../types';
 import { relatedResourceDeleteRequests } from '../../../util/getRelatedResourceDeleteDetails';
 
-function InventoryDetail({ inventory, i18n }) {
+function InventoryDetail({ inventory }) {
   const history = useHistory();
 
   const {
@@ -71,14 +71,14 @@ function InventoryDetail({ inventory, i18n }) {
     <CardBody>
       <DetailList>
         <Detail
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={inventory.name}
           dataCy="inventory-detail-name"
         />
-        <Detail label={i18n._(t`Description`)} value={inventory.description} />
-        <Detail label={i18n._(t`Type`)} value={i18n._(t`Inventory`)} />
+        <Detail label={t`Description`} value={inventory.description} />
+        <Detail label={t`Type`} value={t`Inventory`} />
         <Detail
-          label={i18n._(t`Organization`)}
+          label={t`Organization`}
           value={
             <Link to={`/organizations/${organization.id}/details`}>
               {organization.name}
@@ -88,7 +88,7 @@ function InventoryDetail({ inventory, i18n }) {
         {instanceGroups && instanceGroups.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Instance Groups`)}
+            label={t`Instance Groups`}
             value={
               <ChipGroup numChips={5} totalChips={instanceGroups.length}>
                 {instanceGroups.map(ig => (
@@ -101,17 +101,17 @@ function InventoryDetail({ inventory, i18n }) {
           />
         )}
         <VariablesDetail
-          label={i18n._(t`Variables`)}
+          label={t`Variables`}
           value={inventory.variables}
           rows={4}
         />
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={inventory.created}
           user={inventory.summary_fields.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={inventory.modified}
           user={inventory.summary_fields.modified_by}
         />
@@ -123,20 +123,18 @@ function InventoryDetail({ inventory, i18n }) {
             component={Link}
             to={`/inventories/inventory/${inventory.id}/edit`}
           >
-            {i18n._(t`Edit`)}
+            {t`Edit`}
           </Button>
         )}
         {userCapabilities.delete && (
           <DeleteButton
             name={inventory.name}
-            modalTitle={i18n._(t`Delete Inventory`)}
+            modalTitle={t`Delete Inventory`}
             onConfirm={deleteInventory}
             deleteDetailsRequests={deleteDetailsRequests}
-            deleteMessage={i18n._(
-              t`This inventory is currently being used by other resources. Are you sure you want to delete it?`
-            )}
+            deleteMessage={t`This inventory is currently being used by other resources. Are you sure you want to delete it?`}
           >
-            {i18n._(t`Delete`)}
+            {t`Delete`}
           </DeleteButton>
         )}
       </CardActionsRow>
@@ -145,10 +143,10 @@ function InventoryDetail({ inventory, i18n }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete inventory.`)}
+          {t`Failed to delete inventory.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -159,4 +157,4 @@ InventoryDetail.propTypes = {
   inventory: Inventory.isRequired,
 };
 
-export default withI18n()(InventoryDetail);
+export default InventoryDetail;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx
index 0221d3afe7..2d7ed3ecc5 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
 
 import {
   Switch,
@@ -21,7 +20,7 @@ import InventoryRelatedGroups from '../InventoryRelatedGroups';
 
 import { GroupsAPI } from '../../../api';
 
-function InventoryGroup({ i18n, setBreadcrumb, inventory }) {
+function InventoryGroup({ setBreadcrumb, inventory }) {
   const [inventoryGroup, setInventoryGroup] = useState(null);
   const [contentLoading, setContentLoading] = useState(true);
   const [contentError, setContentError] = useState(null);
@@ -48,25 +47,25 @@ function InventoryGroup({ i18n, setBreadcrumb, inventory }) {
     {
       name: (
         <>
-          <CaretLeftIcon aria-label={i18n._(t`Back to Groups`)} />
-          {i18n._(t`Back to Groups`)}
+          <CaretLeftIcon aria-label={t`Back to Groups`} />
+          {t`Back to Groups`}
         </>
       ),
       link: `/inventories/inventory/${inventory.id}/groups`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/inventories/inventory/${inventory.id}/groups/${inventoryGroup?.id}/details`,
       id: 0,
     },
     {
-      name: i18n._(t`Related Groups`),
+      name: t`Related Groups`,
       link: `/inventories/inventory/${inventory.id}/groups/${inventoryGroup?.id}/nested_groups`,
       id: 1,
     },
     {
-      name: i18n._(t`Hosts`),
+      name: t`Hosts`,
       link: `/inventories/inventory/${inventory.id}/groups/${inventoryGroup?.id}/nested_hosts`,
       id: 2,
     },
@@ -91,7 +90,7 @@ function InventoryGroup({ i18n, setBreadcrumb, inventory }) {
     return (
       <ContentError isNotFound>
         <Link to={`/inventories/inventory/${inventory.id}/groups`}>
-          {i18n._(t`View Inventory Groups`)}
+          {t`View Inventory Groups`}
         </Link>
       </ContentError>
     );
@@ -141,7 +140,7 @@ function InventoryGroup({ i18n, setBreadcrumb, inventory }) {
           <ContentError>
             {inventory && (
               <Link to={`/inventories/inventory/${inventory.id}/details`}>
-                {i18n._(t`View Inventory Details`)}
+                {t`View Inventory Details`}
               </Link>
             )}
           </ContentError>
@@ -152,4 +151,4 @@ function InventoryGroup({ i18n, setBreadcrumb, inventory }) {
 }
 
 export { InventoryGroup as _InventoryGroup };
-export default withI18n()(InventoryGroup);
+export default InventoryGroup;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.jsx
index 29bfb016dd..7f7f37f106 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { useHistory, useParams } from 'react-router-dom';
 import { Card } from '@patternfly/react-core';
 import { GroupsAPI } from '../../../api';
@@ -35,5 +35,5 @@ function InventoryGroupsAdd() {
     </Card>
   );
 }
-export default withI18n()(InventoryGroupsAdd);
+export default InventoryGroupsAdd;
 export { InventoryGroupsAdd as _InventoryGroupsAdd };
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.jsx
index ed891f3c53..a6ed796e09 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.jsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { t } from '@lingui/macro';
 
 import { Button } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { useHistory, useParams } from 'react-router-dom';
 import { VariablesDetail } from '../../../components/CodeEditor';
 import { CardBody, CardActionsRow } from '../../../components/Card';
@@ -15,7 +15,7 @@ import {
 } from '../../../components/DetailList';
 import InventoryGroupsDeleteModal from '../shared/InventoryGroupsDeleteModal';
 
-function InventoryGroupDetail({ i18n, inventoryGroup }) {
+function InventoryGroupDetail({ inventoryGroup }) {
   const {
     summary_fields: { created_by, modified_by, user_capabilities },
     created,
@@ -32,23 +32,15 @@ function InventoryGroupDetail({ i18n, inventoryGroup }) {
     <CardBody>
       <DetailList gutter="sm">
         <Detail
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={name}
           dataCy="inventory-group-detail-name"
         />
-        <Detail label={i18n._(t`Description`)} value={description} />
-        <VariablesDetail
-          label={i18n._(t`Variables`)}
-          value={variables}
-          rows={4}
-        />
+        <Detail label={t`Description`} value={description} />
+        <VariablesDetail label={t`Variables`} value={variables} rows={4} />
+        <UserDateDetail label={t`Created`} date={created} user={created_by} />
         <UserDateDetail
-          label={i18n._(t`Created`)}
-          date={created}
-          user={created_by}
-        />
-        <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={modified}
           user={modified_by}
         />
@@ -58,14 +50,14 @@ function InventoryGroupDetail({ i18n, inventoryGroup }) {
           <Button
             ouiaId="inventory-group-detail-edit-button"
             variant="primary"
-            aria-label={i18n._(t`Edit`)}
+            aria-label={t`Edit`}
             onClick={() =>
               history.push(
                 `/inventories/inventory/${params.id}/groups/${params.groupId}/edit`
               )
             }
           >
-            {i18n._(t`Edit`)}
+            {t`Edit`}
           </Button>
         )}
         {user_capabilities?.delete && (
@@ -81,15 +73,15 @@ function InventoryGroupDetail({ i18n, inventoryGroup }) {
       {error && (
         <AlertModal
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           isOpen={error}
           onClose={() => setError(false)}
         >
-          {i18n._(t`Failed to delete group ${inventoryGroup.name}.`)}
+          {t`Failed to delete group ${inventoryGroup.name}.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
     </CardBody>
   );
 }
-export default withI18n()(InventoryGroupDetail);
+export default InventoryGroupDetail;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.jsx
index 1e88b12795..842583d65f 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { useParams, useHistory } from 'react-router-dom';
 import { GroupsAPI } from '../../../api';
 
@@ -32,5 +32,5 @@ function InventoryGroupEdit({ inventoryGroup }) {
     />
   );
 }
-export default withI18n()(InventoryGroupEdit);
+export default InventoryGroupEdit;
 export { InventoryGroupEdit as _InventoryGroupEdit };
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
index 682883f907..f0528e7926 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback, useState } from 'react';
 import { useLocation, useParams, Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { DropdownItem } from '@patternfly/react-core';
 import { getQSConfig, mergeParams, parseQueryString } from '../../../util/qs';
@@ -27,7 +27,7 @@ const QS_CONFIG = getQSConfig('host', {
   order_by: 'name',
 });
 
-function InventoryGroupHostList({ i18n }) {
+function InventoryGroupHostList() {
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const { id: inventoryId, groupId } = useParams();
@@ -144,8 +144,8 @@ function InventoryGroupHostList({ i18n }) {
   const canAdd =
     actions && Object.prototype.hasOwnProperty.call(actions, 'POST');
   const addFormUrl = `/inventories/inventory/${inventoryId}/groups/${groupId}/nested_hosts/add`;
-  const addExistingHost = i18n._(t`Add existing host`);
-  const addNewHost = i18n._(t`Add new host`);
+  const addExistingHost = t`Add existing host`;
+  const addNewHost = t`Add new host`;
 
   const addButton = (
     <AddDropDownButton
@@ -178,27 +178,27 @@ function InventoryGroupHostList({ i18n }) {
         }
         items={hosts}
         itemCount={hostCount}
-        pluralizedItemName={i18n._(t`Hosts`)}
+        pluralizedItemName={t`Hosts`}
         qsConfig={QS_CONFIG}
         onRowClick={handleSelect}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Created By (Username)`),
+            name: t`Created By (Username)`,
             key: 'created_by__username__icontains',
           },
           {
-            name: i18n._(t`Modified By (Username)`),
+            name: t`Modified By (Username)`,
             key: 'modified_by__username__icontains',
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
           },
         ]}
@@ -224,12 +224,12 @@ function InventoryGroupHostList({ i18n }) {
                 key="disassociate"
                 onDisassociate={handleDisassociate}
                 itemsToDisassociate={selected}
-                modalTitle={i18n._(t`Disassociate host from group?`)}
-                modalNote={i18n._(t`
+                modalTitle={t`Disassociate host from group?`}
+                modalNote={t`
                         Note that only hosts directly in this group can
                         be disassociated. Hosts in sub-groups must be disassociated
                         directly from the sub-group level that they belong.
-                      `)}
+                      `}
               />,
             ]}
           />
@@ -248,23 +248,23 @@ function InventoryGroupHostList({ i18n }) {
       />
       {isModalOpen && (
         <AssociateModal
-          header={i18n._(t`Hosts`)}
+          header={t`Hosts`}
           fetchRequest={fetchHostsToAssociate}
           optionsRequest={fetchHostsOptions}
           isModalOpen={isModalOpen}
           onAssociate={handleAssociate}
           onClose={() => setIsModalOpen(false)}
-          title={i18n._(t`Select Hosts`)}
+          title={t`Select Hosts`}
         />
       )}
       {associateError && (
         <AlertModal
           isOpen={associateError}
           onClose={dismissAssociateError}
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           variant="error"
         >
-          {i18n._(t`Failed to associate.`)}
+          {t`Failed to associate.`}
           <ErrorDetail error={associateError} />
         </AlertModal>
       )}
@@ -272,10 +272,10 @@ function InventoryGroupHostList({ i18n }) {
         <AlertModal
           isOpen={disassociateError}
           onClose={dismissDisassociateError}
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           variant="error"
         >
-          {i18n._(t`Failed to disassociate one or more hosts.`)}
+          {t`Failed to disassociate one or more hosts.`}
           <ErrorDetail error={disassociateError} />
         </AlertModal>
       )}
@@ -283,4 +283,4 @@ function InventoryGroupHostList({ i18n }) {
   );
 }
 
-export default withI18n()(InventoryGroupHostList);
+export default InventoryGroupHostList;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostListItem.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostListItem.jsx
index 643b5ae140..e68da5542c 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostListItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostListItem.jsx
@@ -2,7 +2,7 @@ import 'styled-components/macro';
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import {
@@ -30,7 +30,6 @@ const DataListAction = styled(_DataListAction)`
 `;
 
 function InventoryGroupHostListItem({
-  i18n,
   detailUrl,
   editUrl,
   host,
@@ -66,16 +65,16 @@ function InventoryGroupHostListItem({
           ]}
         />
         <DataListAction
-          aria-label={i18n._(t`actions`)}
+          aria-label={t`actions`}
           aria-labelledby={labelId}
           id={labelId}
         >
           <HostToggle css="grid-column: 1" host={host} />
           {host.summary_fields.user_capabilities?.edit && (
-            <Tooltip content={i18n._(t`Edit Host`)} position="top">
+            <Tooltip content={t`Edit Host`} position="top">
               <Button
                 ouiaId={`${host.id}-edit-button`}
-                aria-label={i18n._(t`Edit Host`)}
+                aria-label={t`Edit Host`}
                 css="grid-column: 2"
                 variant="plain"
                 component={Link}
@@ -99,4 +98,4 @@ InventoryGroupHostListItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(InventoryGroupHostListItem);
+export default InventoryGroupHostListItem;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupItem.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupItem.jsx
index 631476517e..8ebe0d604d 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { bool, func, number, oneOfType, string } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import {
@@ -18,13 +18,7 @@ import { PencilAltIcon } from '@patternfly/react-icons';
 import DataListCell from '../../../components/DataListCell';
 import { Group } from '../../../types';
 
-function InventoryGroupItem({
-  i18n,
-  group,
-  inventoryId,
-  isSelected,
-  onSelect,
-}) {
+function InventoryGroupItem({ group, inventoryId, isSelected, onSelect }) {
   const labelId = `check-action-${group.id}`;
   const detailUrl = `/inventories/inventory/${inventoryId}/groups/${group.id}/details`;
   const editUrl = `/inventories/inventory/${inventoryId}/groups/${group.id}/edit`;
@@ -48,15 +42,15 @@ function InventoryGroupItem({
           ]}
         />
         <DataListAction
-          aria-label={i18n._(t`actions`)}
+          aria-label={t`actions`}
           aria-labelledby={labelId}
           id={labelId}
         >
           {group.summary_fields.user_capabilities.edit && (
-            <Tooltip content={i18n._(t`Edit Group`)} position="top">
+            <Tooltip content={t`Edit Group`} position="top">
               <Button
                 ouiaId={`${group.id}-edit-button`}
-                aria-label={i18n._(t`Edit Group`)}
+                aria-label={t`Edit Group`}
                 variant="plain"
                 component={Link}
                 to={editUrl}
@@ -78,4 +72,4 @@ InventoryGroupItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(InventoryGroupItem);
+export default InventoryGroupItem;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroups.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroups.jsx
index 6299578904..ae19f09660 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroups.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroups.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
 
 import { Switch, Route } from 'react-router-dom';
 
@@ -28,4 +27,4 @@ function InventoryGroups({ setBreadcrumb, inventory }) {
 }
 
 export { InventoryGroups as _InventoryGroups };
-export default withI18n()(InventoryGroups);
+export default InventoryGroups;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
index 2a26285089..70dc7ef5c6 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Tooltip } from '@patternfly/react-core';
 import { getQSConfig, parseQueryString } from '../../../util/qs';
@@ -27,7 +27,7 @@ function cannotDelete(item) {
   return !item.summary_fields.user_capabilities.delete;
 }
 
-function InventoryGroupsList({ i18n }) {
+function InventoryGroupsList() {
   const location = useLocation();
   const { id: inventoryId } = useParams();
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
@@ -89,16 +89,14 @@ function InventoryGroupsList({ i18n }) {
     if (selected.some(cannotDelete)) {
       return (
         <div>
-          {i18n._(
-            t`You do not have permission to delete the following Groups: ${itemsUnableToDelete}`
-          )}
+          {t`You do not have permission to delete the following Groups: ${itemsUnableToDelete}`}
         </div>
       );
     }
     if (selected.length) {
-      return i18n._(t`Delete`);
+      return t`Delete`;
     }
-    return i18n._(t`Select a row to delete`);
+    return t`Select a row to delete`;
   };
 
   const canAdd =
@@ -115,31 +113,31 @@ function InventoryGroupsList({ i18n }) {
         onRowClick={handleSelect}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Group type`),
+            name: t`Group type`,
             key: 'parents__isnull',
             isBoolean: true,
             booleanLabels: {
-              true: i18n._(t`Show only root groups`),
-              false: i18n._(t`Show all groups`),
+              true: t`Show only root groups`,
+              false: t`Show all groups`,
             },
           },
           {
-            name: i18n._(t`Created By (Username)`),
+            name: t`Created By (Username)`,
             key: 'created_by__username__icontains',
           },
           {
-            name: i18n._(t`Modified By (Username)`),
+            name: t`Modified By (Username)`,
             key: 'modified_by__username__icontains',
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
           },
         ]}
@@ -204,4 +202,4 @@ function InventoryGroupsList({ i18n }) {
     </>
   );
 }
-export default withI18n()(InventoryGroupsList);
+export default InventoryGroupsList;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHost/InventoryHost.jsx b/awx/ui_next/src/screens/Inventory/InventoryHost/InventoryHost.jsx
index 9514d4dca2..ca97852e83 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHost/InventoryHost.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHost/InventoryHost.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Switch,
@@ -23,7 +23,7 @@ import InventoryHostEdit from '../InventoryHostEdit';
 import InventoryHostFacts from '../InventoryHostFacts';
 import InventoryHostGroups from '../InventoryHostGroups';
 
-function InventoryHost({ i18n, setBreadcrumb, inventory }) {
+function InventoryHost({ setBreadcrumb, inventory }) {
   const location = useLocation();
   const match = useRouteMatch('/inventories/inventory/:id/hosts/:hostId');
   const hostListUrl = `/inventories/inventory/${inventory.id}/hosts`;
@@ -63,29 +63,29 @@ function InventoryHost({ i18n, setBreadcrumb, inventory }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Hosts`)}
+          {t`Back to Hosts`}
         </>
       ),
       link: `${hostListUrl}`,
       id: 0,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `${match.url}/details`,
       id: 1,
     },
     {
-      name: i18n._(t`Facts`),
+      name: t`Facts`,
       link: `${match.url}/facts`,
       id: 2,
     },
     {
-      name: i18n._(t`Groups`),
+      name: t`Groups`,
       link: `${match.url}/groups`,
       id: 3,
     },
     {
-      name: i18n._(t`Jobs`),
+      name: t`Jobs`,
       link: `${match.url}/jobs`,
       id: 4,
     },
@@ -97,10 +97,8 @@ function InventoryHost({ i18n, setBreadcrumb, inventory }) {
         <ContentError error={contentError}>
           {contentError.response && contentError.response.status === 404 && (
             <span>
-              {i18n._(t`Host not found.`)}{' '}
-              <Link to={hostListUrl}>
-                {i18n._(t`View all Inventory Hosts.`)}
-              </Link>
+              {t`Host not found.`}{' '}
+              <Link to={hostListUrl}>{t`View all Inventory Hosts.`}</Link>
             </span>
           )}
         </ContentError>
@@ -159,7 +157,7 @@ function InventoryHost({ i18n, setBreadcrumb, inventory }) {
           <Route key="not-found" path="*">
             <ContentError isNotFound>
               <Link to={`${match.url}/details`}>
-                {i18n._(t`View Inventory Host Details`)}
+                {t`View Inventory Host Details`}
               </Link>
             </ContentError>
           </Route>
@@ -169,4 +167,4 @@ function InventoryHost({ i18n, setBreadcrumb, inventory }) {
   );
 }
 
-export default withI18n()(InventoryHost);
+export default InventoryHost;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostDetail/InventoryHostDetail.jsx b/awx/ui_next/src/screens/Inventory/InventoryHostDetail/InventoryHostDetail.jsx
index e167230c4c..c18f9660ad 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostDetail/InventoryHostDetail.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostDetail/InventoryHostDetail.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { useState } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { Host } from '../../../types';
@@ -19,7 +19,7 @@ import DeleteButton from '../../../components/DeleteButton';
 import { HostsAPI } from '../../../api';
 import HostToggle from '../../../components/HostToggle';
 
-function InventoryHostDetail({ i18n, host }) {
+function InventoryHostDetail({ host }) {
   const {
     created,
     description,
@@ -57,10 +57,10 @@ function InventoryHostDetail({ i18n, host }) {
       <AlertModal
         isOpen={deletionError}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => setDeletionError(false)}
       >
-        {i18n._(t`Failed to delete ${name}.`)}
+        {t`Failed to delete ${name}.`}
         <ErrorDetail error={deletionError} />
       </AlertModal>
     );
@@ -72,45 +72,37 @@ function InventoryHostDetail({ i18n, host }) {
     <CardBody>
       <HostToggle host={host} css="padding-bottom: 40px" />
       <DetailList gutter="sm">
-        <Detail label={i18n._(t`Name`)} value={name} />
+        <Detail label={t`Name`} value={name} />
         {recentPlaybookJobs?.length > 0 && (
           <Detail
-            label={i18n._(t`Activity`)}
+            label={t`Activity`}
             value={<Sparkline jobs={recentPlaybookJobs} />}
           />
         )}
-        <Detail label={i18n._(t`Description`)} value={description} />
-        <UserDateDetail
-          date={created}
-          label={i18n._(t`Created`)}
-          user={created_by}
-        />
+        <Detail label={t`Description`} value={description} />
+        <UserDateDetail date={created} label={t`Created`} user={created_by} />
         <UserDateDetail
           date={modified}
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           user={modified_by}
         />
-        <VariablesDetail
-          label={i18n._(t`Variables`)}
-          rows={4}
-          value={variables}
-        />
+        <VariablesDetail label={t`Variables`} rows={4} value={variables} />
       </DetailList>
       <CardActionsRow>
         {user_capabilities?.edit && (
           <Button
             ouiaId="inventory-host-detail-edit-button"
-            aria-label={i18n._(t`edit`)}
+            aria-label={t`edit`}
             component={Link}
             to={`/inventories/inventory/${inventory.id}/hosts/${id}/edit`}
           >
-            {i18n._(t`Edit`)}
+            {t`Edit`}
           </Button>
         )}
         {user_capabilities?.delete && (
           <DeleteButton
             name={name}
-            modalTitle={i18n._(t`Delete Host`)}
+            modalTitle={t`Delete Host`}
             onConfirm={() => handleHostDelete()}
           />
         )}
@@ -119,10 +111,10 @@ function InventoryHostDetail({ i18n, host }) {
         <AlertModal
           isOpen={deletionError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={() => setDeletionError(null)}
         >
-          {i18n._(t`Failed to delete host.`)}
+          {t`Failed to delete host.`}
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
@@ -134,4 +126,4 @@ InventoryHostDetail.propTypes = {
   host: Host.isRequired,
 };
 
-export default withI18n()(InventoryHostDetail);
+export default InventoryHostDetail;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostFacts/InventoryHostFacts.jsx b/awx/ui_next/src/screens/Inventory/InventoryHostFacts/InventoryHostFacts.jsx
index 4d93ce58c3..2bbc96f55f 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostFacts/InventoryHostFacts.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostFacts/InventoryHostFacts.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Host } from '../../../types';
 import { CardBody } from '../../../components/Card';
@@ -10,7 +10,7 @@ import ContentLoading from '../../../components/ContentLoading';
 import useRequest from '../../../util/useRequest';
 import { HostsAPI } from '../../../api';
 
-function InventoryHostFacts({ i18n, host }) {
+function InventoryHostFacts({ host }) {
   const { request, isLoading, error, result } = useRequest(
     useCallback(async () => {
       const { data } = await HostsAPI.readFacts(host.id);
@@ -35,7 +35,7 @@ function InventoryHostFacts({ i18n, host }) {
   return (
     <CardBody>
       <DetailList gutter="sm">
-        <VariablesDetail label={i18n._(t`Facts`)} rows="auto" value={result} />
+        <VariablesDetail label={t`Facts`} rows="auto" value={result} />
       </DetailList>
     </CardBody>
   );
@@ -45,4 +45,4 @@ InventoryHostFacts.propTypes = {
   host: Host.isRequired,
 };
 
-export default withI18n()(InventoryHostFacts);
+export default InventoryHostFacts;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupItem.jsx b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupItem.jsx
index fa3ed0e12c..b87ab23da0 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { bool, func, number, oneOfType, string } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import {
@@ -18,13 +18,7 @@ import { PencilAltIcon } from '@patternfly/react-icons';
 import DataListCell from '../../../components/DataListCell';
 import { Group } from '../../../types';
 
-function InventoryHostGroupItem({
-  i18n,
-  group,
-  inventoryId,
-  isSelected,
-  onSelect,
-}) {
+function InventoryHostGroupItem({ group, inventoryId, isSelected, onSelect }) {
   const labelId = `check-action-${group.id}`;
   const detailUrl = `/inventories/inventory/${inventoryId}/groups/${group.id}/details`;
   const editUrl = `/inventories/inventory/${inventoryId}/groups/${group.id}/edit`;
@@ -48,12 +42,12 @@ function InventoryHostGroupItem({
           ]}
         />
         <DataListAction
-          aria-label={i18n._(t`actions`)}
+          aria-label={t`actions`}
           aria-labelledby={labelId}
           id={labelId}
         >
           {group.summary_fields.user_capabilities.edit && (
-            <Tooltip content={i18n._(t`Edit Group`)} position="top">
+            <Tooltip content={t`Edit Group`} position="top">
               <Button
                 ouiaId={`${group.id}-edit-button`}
                 variant="plain"
@@ -77,4 +71,4 @@ InventoryHostGroupItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(InventoryHostGroupItem);
+export default InventoryHostGroupItem;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroups.jsx b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroups.jsx
index 55ffbe05cb..c6775eb04f 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroups.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroups.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
 
 import { Switch, Route } from 'react-router-dom';
 
@@ -16,4 +15,4 @@ function InventoryHostGroups() {
 }
 
 export { InventoryHostGroups as _InventoryHostGroups };
-export default withI18n()(InventoryHostGroups);
+export default InventoryHostGroups;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx
index 5fbf9d38ba..4454be3417 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { getQSConfig, parseQueryString, mergeParams } from '../../../util/qs';
 import useRequest, {
@@ -26,7 +26,7 @@ const QS_CONFIG = getQSConfig('group', {
   order_by: 'name',
 });
 
-function InventoryHostGroupsList({ i18n }) {
+function InventoryHostGroupsList() {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
   const { hostId, id: invId } = useParams();
@@ -157,22 +157,22 @@ function InventoryHostGroupsList({ i18n }) {
         onRowClick={handleSelect}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Created By (Username)`),
+            name: t`Created By (Username)`,
             key: 'created_by__username__icontains',
           },
           {
-            name: i18n._(t`Modified By (Username)`),
+            name: t`Modified By (Username)`,
             key: 'modified_by__username__icontains',
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
           },
         ]}
@@ -214,13 +214,13 @@ function InventoryHostGroupsList({ i18n }) {
                 key="disassociate"
                 onDisassociate={handleDisassociate}
                 itemsToDisassociate={selected}
-                modalTitle={i18n._(t`Disassociate group from host?`)}
-                modalNote={i18n._(t`
+                modalTitle={t`Disassociate group from host?`}
+                modalNote={t`
                   Note that you may still see the group in the list after
                   disassociating if the host is also a member of that group’s
                   children.  This list shows all groups the host is associated
                   with directly and indirectly.
-                `)}
+                `}
               />,
             ]}
           />
@@ -233,29 +233,29 @@ function InventoryHostGroupsList({ i18n }) {
       />
       {isModalOpen && (
         <AssociateModal
-          header={i18n._(t`Groups`)}
+          header={t`Groups`}
           fetchRequest={fetchGroupsToAssociate}
           optionsRequest={fetchGroupsOptions}
           isModalOpen={isModalOpen}
           onAssociate={handleAssociate}
           onClose={() => setIsModalOpen(false)}
-          title={i18n._(t`Select Groups`)}
+          title={t`Select Groups`}
         />
       )}
       {error && (
         <AlertModal
           isOpen={error}
           onClose={dismissError}
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           variant="error"
         >
           {associateError
-            ? i18n._(t`Failed to associate.`)
-            : i18n._(t`Failed to disassociate one or more groups.`)}
+            ? t`Failed to associate.`
+            : t`Failed to disassociate one or more groups.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
     </>
   );
 }
-export default withI18n()(InventoryHostGroupsList);
+export default InventoryHostGroupsList;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostItem.jsx b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostItem.jsx
index 61b9242a0b..ee75b8cf1c 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Button,
@@ -28,7 +28,7 @@ const DataListAction = styled(_DataListAction)`
 `;
 
 function InventoryHostItem(props) {
-  const { detailUrl, editUrl, host, i18n, isSelected, onSelect } = props;
+  const { detailUrl, editUrl, host, isSelected, onSelect } = props;
 
   const recentPlaybookJobs = host.summary_fields.recent_jobs.map(job => ({
     ...job,
@@ -59,13 +59,13 @@ function InventoryHostItem(props) {
           ]}
         />
         <DataListAction
-          aria-label={i18n._(t`actions`)}
+          aria-label={t`actions`}
           aria-labelledby={labelId}
           id={labelId}
         >
           <HostToggle host={host} />
           {host.summary_fields.user_capabilities?.edit && (
-            <Tooltip content={i18n._(t`Edit Host`)} position="top">
+            <Tooltip content={t`Edit Host`} position="top">
               <Button
                 ouiaId={`${host.id}-edit-button`}
                 variant="plain"
@@ -89,4 +89,4 @@ InventoryHostItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(InventoryHostItem);
+export default InventoryHostItem;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx
index 592fb56984..da1ccef87b 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useCallback } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { getQSConfig, parseQueryString } from '../../../util/qs';
 import { InventoriesAPI, HostsAPI } from '../../../api';
@@ -21,7 +21,7 @@ const QS_CONFIG = getQSConfig('host', {
   order_by: 'name',
 });
 
-function InventoryHostList({ i18n }) {
+function InventoryHostList() {
   const [selected, setSelected] = useState([]);
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
   const { id } = useParams();
@@ -110,23 +110,23 @@ function InventoryHostList({ i18n }) {
         hasContentLoading={isLoading || isDeleteLoading || isAdHocLaunchLoading}
         items={hosts}
         itemCount={hostCount}
-        pluralizedItemName={i18n._(t`Hosts`)}
+        pluralizedItemName={t`Hosts`}
         qsConfig={QS_CONFIG}
         toolbarColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
             isSortable: true,
             isSearchable: true,
           },
           {
-            name: i18n._(t`Modified`),
+            name: t`Modified`,
             key: 'modified',
             isSortable: true,
             isNumeric: true,
           },
           {
-            name: i18n._(t`Created`),
+            name: t`Created`,
             key: 'created',
             isSortable: true,
             isNumeric: true,
@@ -159,7 +159,7 @@ function InventoryHostList({ i18n }) {
                 key="delete"
                 onDelete={handleDeleteHosts}
                 itemsToDelete={selected}
-                pluralizedItemName={i18n._(t`Hosts`)}
+                pluralizedItemName={t`Hosts`}
               />,
             ]}
           />
@@ -187,10 +187,10 @@ function InventoryHostList({ i18n }) {
         <AlertModal
           isOpen={deletionError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={clearDeletionError}
         >
-          {i18n._(t`Failed to delete one or more hosts.`)}
+          {t`Failed to delete one or more hosts.`}
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
@@ -198,4 +198,4 @@ function InventoryHostList({ i18n }) {
   );
 }
 
-export default withI18n()(InventoryHostList);
+export default InventoryHostList;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
index 5d3275b6e8..6f7da3443c 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryListItem.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { Button, Label } from '@patternfly/react-core';
 import { Tr, Td } from '@patternfly/react-table';
 import { PencilAltIcon } from '@patternfly/react-icons';
@@ -19,7 +19,7 @@ function InventoryListItem({
   isSelected,
   onSelect,
   detailUrl,
-  i18n,
+
   fetchInventories,
 }) {
   InventoryListItem.propTypes = {
@@ -58,14 +58,12 @@ function InventoryListItem({
   let tooltipContent = '';
   if (inventory.has_inventory_sources) {
     if (inventory.inventory_sources_with_failures > 0) {
-      tooltipContent = i18n._(
-        t`${inventory.inventory_sources_with_failures} sources with sync failures.`
-      );
+      tooltipContent = t`${inventory.inventory_sources_with_failures} sources with sync failures.`;
     } else {
-      tooltipContent = i18n._(t`No inventory sync failures.`);
+      tooltipContent = t`No inventory sync failures.`;
     }
   } else {
-    tooltipContent = i18n._(t`Not configured for inventory sync.`);
+    tooltipContent = t`Not configured for inventory sync.`;
   }
 
   return (
@@ -76,9 +74,9 @@ function InventoryListItem({
           isSelected,
           onSelect,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         {inventory.pending_deletion ? (
           <b>{inventory.name}</b>
         ) : (
@@ -87,17 +85,15 @@ function InventoryListItem({
           </Link>
         )}
       </Td>
-      <Td dataLabel={i18n._(t`Status`)}>
+      <Td dataLabel={t`Status`}>
         {inventory.kind !== 'smart' && (
           <StatusLabel status={syncStatus} tooltipContent={tooltipContent} />
         )}
       </Td>
-      <Td dataLabel={i18n._(t`Type`)}>
-        {inventory.kind === 'smart'
-          ? i18n._(t`Smart Inventory`)
-          : i18n._(t`Inventory`)}
+      <Td dataLabel={t`Type`}>
+        {inventory.kind === 'smart' ? t`Smart Inventory` : t`Inventory`}
       </Td>
-      <Td key="organization" dataLabel={i18n._(t`Organization`)}>
+      <Td key="organization" dataLabel={t`Organization`}>
         <Link
           to={`/organizations/${inventory?.summary_fields?.organization?.id}/details`}
         >
@@ -105,19 +101,19 @@ function InventoryListItem({
         </Link>
       </Td>
       {inventory.pending_deletion ? (
-        <Td dataLabel={i18n._(t`Groups`)}>
-          <Label color="red">{i18n._(t`Pending delete`)}</Label>
+        <Td dataLabel={t`Groups`}>
+          <Label color="red">{t`Pending delete`}</Label>
         </Td>
       ) : (
-        <ActionsTd dataLabel={i18n._(t`Actions`)}>
+        <ActionsTd dataLabel={t`Actions`}>
           <ActionItem
             visible={inventory.summary_fields.user_capabilities.edit}
-            tooltip={i18n._(t`Edit Inventory`)}
+            tooltip={t`Edit Inventory`}
           >
             <Button
               ouiaId={`${inventory.id}-edit-button`}
               isDisabled={isCopying}
-              aria-label={i18n._(t`Edit Inventory`)}
+              aria-label={t`Edit Inventory`}
               variant="plain"
               component={Link}
               to={`/inventories/${
@@ -131,8 +127,8 @@ function InventoryListItem({
             visible={inventory.summary_fields.user_capabilities.copy}
             tooltip={
               inventory.has_inventory_sources
-                ? i18n._(t`Inventories with sources cannot be copied`)
-                : i18n._(t`Copy Inventory`)
+                ? t`Inventories with sources cannot be copied`
+                : t`Copy Inventory`
             }
           >
             <CopyButton
@@ -140,7 +136,7 @@ function InventoryListItem({
               isDisabled={isCopying || inventory.has_inventory_sources}
               onCopyStart={handleCopyStart}
               onCopyFinish={handleCopyFinish}
-              errorMessage={i18n._(t`Failed to copy inventory.`)}
+              errorMessage={t`Failed to copy inventory.`}
             />
           </ActionItem>
         </ActionsTd>
@@ -148,4 +144,4 @@ function InventoryListItem({
     </Tr>
   );
 }
-export default withI18n()(InventoryListItem);
+export default InventoryListItem;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.jsx b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.jsx
index 4697a3517f..1074e616fc 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useParams, useLocation, Link } from 'react-router-dom';
 
@@ -24,7 +24,7 @@ const QS_CONFIG = getQSConfig('group', {
   page_size: 20,
   order_by: 'name',
 });
-function InventoryRelatedGroupList({ i18n }) {
+function InventoryRelatedGroupList() {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
   const [associateError, setAssociateError] = useState(null);
@@ -126,8 +126,8 @@ function InventoryRelatedGroupList({ i18n }) {
 
   const addFormUrl = `/inventories/inventory/${inventoryId}/groups/${groupId}/nested_groups/add`;
 
-  const addExistingGroup = i18n._(t`Add existing group`);
-  const addNewGroup = i18n._(t`Add new group`);
+  const addExistingGroup = t`Add existing group`;
+  const addNewGroup = t`Add new group`;
   const addButton = (
     <AddDropDownButton
       key="add"
@@ -158,27 +158,27 @@ function InventoryRelatedGroupList({ i18n }) {
         hasContentLoading={isLoading || isAdHocLaunchLoading}
         items={groups}
         itemCount={itemCount}
-        pluralizedItemName={i18n._(t`Related Groups`)}
+        pluralizedItemName={t`Related Groups`}
         qsConfig={QS_CONFIG}
         onRowClick={handleSelect}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Created By (Username)`),
+            name: t`Created By (Username)`,
             key: 'created_by__username__icontains',
           },
           {
-            name: i18n._(t`Modified By (Username)`),
+            name: t`Modified By (Username)`,
             key: 'modified_by__username__icontains',
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
           },
         ]}
@@ -204,7 +204,7 @@ function InventoryRelatedGroupList({ i18n }) {
                 key="disassociate"
                 onDisassociate={disassociateGroups}
                 itemsToDisassociate={selected}
-                modalTitle={i18n._(t`Disassociate related group(s)?`)}
+                modalTitle={t`Disassociate related group(s)?`}
               />,
             ]}
           />
@@ -223,29 +223,29 @@ function InventoryRelatedGroupList({ i18n }) {
       />
       {isModalOpen && (
         <AssociateModal
-          header={i18n._(t`Groups`)}
+          header={t`Groups`}
           fetchRequest={fetchGroupsToAssociate}
           optionsRequest={fetchGroupsOptions}
           isModalOpen={isModalOpen}
           onAssociate={associateGroup}
           onClose={() => setIsModalOpen(false)}
-          title={i18n._(t`Select Groups`)}
+          title={t`Select Groups`}
         />
       )}
       {error && (
         <AlertModal
           isOpen={error}
           onClose={dismissError}
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           variant="error"
         >
           {associateError
-            ? i18n._(t`Failed to associate.`)
-            : i18n._(t`Failed to disassociate one or more groups.`)}
+            ? t`Failed to associate.`
+            : t`Failed to disassociate one or more groups.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
     </>
   );
 }
-export default withI18n()(InventoryRelatedGroupList);
+export default InventoryRelatedGroupList;
diff --git a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupListItem.jsx b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupListItem.jsx
index 2e3514d4ea..3c3c03a3d0 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupListItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupListItem.jsx
@@ -2,7 +2,7 @@ import 'styled-components/macro';
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import {
@@ -28,7 +28,6 @@ const DataListAction = styled(_DataListAction)`
 `;
 
 function InventoryRelatedGroupListItem({
-  i18n,
   detailUrl,
   editUrl,
   group,
@@ -56,15 +55,15 @@ function InventoryRelatedGroupListItem({
           ]}
         />
         <DataListAction
-          aria-label={i18n._(t`actions`)}
+          aria-label={t`actions`}
           aria-labelledby={labelId}
           id={labelId}
         >
           {group.summary_fields.user_capabilities?.edit && (
-            <Tooltip content={i18n._(t`Edit Group`)} position="top">
+            <Tooltip content={t`Edit Group`} position="top">
               <Button
                 ouiaId={`${group.id}-edit-button`}
-                aria-label={i18n._(t`Edit Group`)}
+                aria-label={t`Edit Group`}
                 css="grid-column: 2"
                 variant="plain"
                 component={Link}
@@ -88,4 +87,4 @@ InventoryRelatedGroupListItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(InventoryRelatedGroupListItem);
+export default InventoryRelatedGroupListItem;
diff --git a/awx/ui_next/src/screens/Inventory/InventorySource/InventorySource.jsx b/awx/ui_next/src/screens/Inventory/InventorySource/InventorySource.jsx
index a8f56e2aa8..9fd7fe93d2 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySource/InventorySource.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventorySource/InventorySource.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Link,
@@ -25,7 +25,7 @@ import InventorySourceDetail from '../InventorySourceDetail';
 import InventorySourceEdit from '../InventorySourceEdit';
 import NotificationList from '../../../components/NotificationList/NotificationList';
 
-function InventorySource({ i18n, inventory, setBreadcrumb, me }) {
+function InventorySource({ inventory, setBreadcrumb, me }) {
   const location = useLocation();
   const match = useRouteMatch('/inventories/inventory/:id/sources/:sourceId');
   const sourceListUrl = `/inventories/inventory/${inventory.id}/sources`;
@@ -78,19 +78,19 @@ function InventorySource({ i18n, inventory, setBreadcrumb, me }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Sources`)}
+          {t`Back to Sources`}
         </>
       ),
       link: `${sourceListUrl}`,
       id: 0,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `${match.url}/details`,
       id: 1,
     },
     {
-      name: i18n._(t`Schedules`),
+      name: t`Schedules`,
       link: `${match.url}/schedules`,
       id: 2,
     },
@@ -101,7 +101,7 @@ function InventorySource({ i18n, inventory, setBreadcrumb, me }) {
 
   if (canSeeNotificationsTab) {
     tabsArray.push({
-      name: i18n._(t`Notifications`),
+      name: t`Notifications`,
       link: `${match.url}/notifications`,
       id: 3,
     });
@@ -169,7 +169,7 @@ function InventorySource({ i18n, inventory, setBreadcrumb, me }) {
           <Route key="not-found" path="*">
             <ContentError isNotFound>
               <Link to={`${match.url}/details`}>
-                {i18n._(t`View inventory source details`)}
+                {t`View inventory source details`}
               </Link>
             </ContentError>
           </Route>
@@ -179,4 +179,4 @@ function InventorySource({ i18n, inventory, setBreadcrumb, me }) {
   );
 }
 
-export default withI18n()(InventorySource);
+export default InventorySource;
diff --git a/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx b/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx
index e2e0712547..d69f2eb5d4 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import { Button, List, ListItem } from '@patternfly/react-core';
@@ -25,7 +25,7 @@ import { InventorySourcesAPI } from '../../../api';
 import { relatedResourceDeleteRequests } from '../../../util/getRelatedResourceDeleteDetails';
 import useIsMounted from '../../../util/useIsMounted';
 
-function InventorySourceDetail({ inventorySource, i18n }) {
+function InventorySourceDetail({ inventorySource }) {
   const {
     created,
     custom_virtualenv,
@@ -99,9 +99,9 @@ function InventorySourceDetail({ inventorySource, i18n }) {
   );
 
   const VERBOSITY = {
-    0: i18n._(t`0 (Warning)`),
-    1: i18n._(t`1 (Info)`),
-    2: i18n._(t`2 (Debug)`),
+    0: t`0 (Warning)`,
+    1: t`1 (Info)`,
+    2: t`2 (Debug)`,
   };
 
   let optionsList = '';
@@ -115,22 +115,22 @@ function InventorySourceDetail({ inventorySource, i18n }) {
       <List>
         {overwrite && (
           <ListItem>
-            {i18n._(t`Overwrite`)}
+            {t`Overwrite`}
             <Popover
               content={
                 <>
-                  {i18n._(t`If checked, any hosts and groups that were
+                  {t`If checked, any hosts and groups that were
           previously present on the external source but are now removed
           will be removed from the inventory. Hosts and groups
           that were not managed by the inventory source will be promoted
           to the next manually created group or if there is no manually
           created group to promote them into, they will be left in the "all"
-          default group for the inventory.`)}
+          default group for the inventory.`}
                   <br />
                   <br />
-                  {i18n._(t`When not checked, local child
+                  {t`When not checked, local child
           hosts and groups not found on the external source will remain
-          untouched by the inventory update process.`)}
+          untouched by the inventory update process.`}
                 </>
               }
             />
@@ -138,18 +138,18 @@ function InventorySourceDetail({ inventorySource, i18n }) {
         )}
         {overwrite_vars && (
           <ListItem>
-            {i18n._(t`Overwrite variables`)}
+            {t`Overwrite variables`}
             <Popover
               content={
                 <>
-                  {i18n._(t`If checked, all variables for child groups
+                  {t`If checked, all variables for child groups
                   and hosts will be removed and replaced by those found
-                  on the external source.`)}
+                  on the external source.`}
                   <br />
                   <br />
-                  {i18n._(t`When not checked, a merge will be performed,
+                  {t`When not checked, a merge will be performed,
                   combining local variables with those found on the
-                  external source.`)}
+                  external source.`}
                 </>
               }
             />
@@ -157,22 +157,22 @@ function InventorySourceDetail({ inventorySource, i18n }) {
         )}
         {update_on_launch && (
           <ListItem>
-            {i18n._(t`Update on launch`)}
+            {t`Update on launch`}
             <Popover
-              content={i18n._(t`Each time a job runs using this inventory,
+              content={t`Each time a job runs using this inventory,
         refresh the inventory from the selected source before
-        executing job tasks.`)}
+        executing job tasks.`}
             />
           </ListItem>
         )}
         {update_on_project_update && (
           <ListItem>
-            {i18n._(t`Update on project update`)}
+            {t`Update on project update`}
             <Popover
-              content={i18n._(t`After every project update where the SCM revision
+              content={t`After every project update where the SCM revision
         changes, refresh the inventory from the selected source
         before executing job tasks. This is intended for static content,
-        like the Ansible inventory .ini file format.`)}
+        like the Ansible inventory .ini file format.`}
             />
           </ListItem>
         )}
@@ -191,12 +191,12 @@ function InventorySourceDetail({ inventorySource, i18n }) {
   return (
     <CardBody>
       <DetailList>
-        <Detail label={i18n._(t`Name`)} value={name} />
-        <Detail label={i18n._(t`Description`)} value={description} />
-        <Detail label={i18n._(t`Source`)} value={sourceChoices[source]} />
+        <Detail label={t`Name`} value={name} />
+        <Detail label={t`Description`} value={description} />
+        <Detail label={t`Source`} value={sourceChoices[source]} />
         {organization && (
           <Detail
-            label={i18n._(t`Organization`)}
+            label={t`Organization`}
             value={
               <Link to={`/organizations/${organization.id}/details`}>
                 {organization.name}
@@ -210,7 +210,7 @@ function InventorySourceDetail({ inventorySource, i18n }) {
         />
         {source_project && (
           <Detail
-            label={i18n._(t`Project`)}
+            label={t`Project`}
             value={
               <Link to={`/projects/${source_project.id}/details`}>
                 {source_project.name}
@@ -220,47 +220,41 @@ function InventorySourceDetail({ inventorySource, i18n }) {
         )}
         {source === 'scm' ? (
           <Detail
-            label={i18n._(t`Inventory file`)}
-            value={
-              source_path === '' ? i18n._(t`/ (project root)`) : source_path
-            }
+            label={t`Inventory file`}
+            value={source_path === '' ? t`/ (project root)` : source_path}
           />
         ) : null}
-        <Detail label={i18n._(t`Verbosity`)} value={VERBOSITY[verbosity]} />
+        <Detail label={t`Verbosity`} value={VERBOSITY[verbosity]} />
         <Detail
-          label={i18n._(t`Cache timeout`)}
-          value={`${update_cache_timeout} ${i18n._(t`seconds`)}`}
+          label={t`Cache timeout`}
+          value={`${update_cache_timeout} ${t`seconds`}`}
         />
-        <Detail label={i18n._(t`Host Filter`)} value={host_filter} />
-        <Detail label={i18n._(t`Enabled Variable`)} value={enabled_var} />
-        <Detail label={i18n._(t`Enabled Value`)} value={enabled_value} />
+        <Detail label={t`Host Filter`} value={host_filter} />
+        <Detail label={t`Enabled Variable`} value={enabled_var} />
+        <Detail label={t`Enabled Value`} value={enabled_value} />
         {credentials?.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Credential`)}
+            label={t`Credential`}
             value={credentials.map(cred => (
               <CredentialChip key={cred?.id} credential={cred} isReadOnly />
             ))}
           />
         )}
         {optionsList && (
-          <Detail fullWidth label={i18n._(t`Options`)} value={optionsList} />
+          <Detail fullWidth label={t`Options`} value={optionsList} />
         )}
         {source_vars && (
           <VariablesDetail
-            label={i18n._(t`Source variables`)}
+            label={t`Source variables`}
             rows={4}
             value={source_vars}
           />
         )}
-        <UserDateDetail
-          date={created}
-          label={i18n._(t`Created`)}
-          user={created_by}
-        />
+        <UserDateDetail date={created} label={t`Created`} user={created_by} />
         <UserDateDetail
           date={modified}
-          label={i18n._(t`Last modified`)}
+          label={t`Last modified`}
           user={modified_by}
         />
       </DetailList>
@@ -269,10 +263,10 @@ function InventorySourceDetail({ inventorySource, i18n }) {
           <Button
             ouiaId="inventory-source-detail-edit-button"
             component={Link}
-            aria-label={i18n._(t`edit`)}
+            aria-label={t`edit`}
             to={`/inventories/inventory/${inventory.id}/sources/${id}/edit`}
           >
-            {i18n._(t`Edit`)}
+            {t`Edit`}
           </Button>
         )}
         {user_capabilities?.start && (
@@ -281,29 +275,27 @@ function InventorySourceDetail({ inventorySource, i18n }) {
         {user_capabilities?.delete && (
           <DeleteButton
             name={name}
-            modalTitle={i18n._(t`Delete inventory source`)}
+            modalTitle={t`Delete inventory source`}
             onConfirm={handleDelete}
             deleteDetailsRequests={deleteDetailsRequests}
-            deleteMessage={i18n._(
-              t`This inventory source is currently being used by other resources that rely on it. Are you sure you want to delete it?`
-            )}
+            deleteMessage={t`This inventory source is currently being used by other resources that rely on it. Are you sure you want to delete it?`}
           >
-            {i18n._(t`Delete`)}
+            {t`Delete`}
           </DeleteButton>
         )}
       </CardActionsRow>
       {deletionError && (
         <AlertModal
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           isOpen={deletionError}
           onClose={() => setDeletionError(false)}
         >
-          {i18n._(t`Failed to delete inventory source ${name}.`)}
+          {t`Failed to delete inventory source ${name}.`}
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
     </CardBody>
   );
 }
-export default withI18n()(InventorySourceDetail);
+export default InventorySourceDetail;
diff --git a/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceListItem.jsx b/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceListItem.jsx
index a09320db3e..2ac1f21fc3 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceListItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceListItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { Link } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import {
@@ -30,23 +30,23 @@ function InventorySourceListItem({
   source,
   isSelected,
   onSelect,
-  i18n,
+
   detailUrl,
   label,
 }) {
   const generateLastJobTooltip = job => {
     return (
       <>
-        <div>{i18n._(t`MOST RECENT SYNC`)}</div>
+        <div>{t`MOST RECENT SYNC`}</div>
         <div>
-          {i18n._(t`JOB ID:`)} {job.id}
+          {t`JOB ID:`} {job.id}
         </div>
         <div>
-          {i18n._(t`STATUS:`)} {job.status.toUpperCase()}
+          {t`STATUS:`} {job.status.toUpperCase()}
         </div>
         {job.finished && (
           <div>
-            {i18n._(t`FINISHED:`)} {job.finished}
+            {t`FINISHED:`} {job.finished}
           </div>
         )}
       </>
@@ -87,7 +87,7 @@ function InventorySourceListItem({
                   </Tooltip>
                 )}
               </DataListCell>,
-              <DataListCell aria-label={i18n._(t`name`)} key="name">
+              <DataListCell aria-label={t`name`} key="name">
                 <span>
                   <Link to={`${detailUrl}/details`}>
                     <b>{source.name}</b>
@@ -97,9 +97,7 @@ function InventorySourceListItem({
                   <span>
                     <Tooltip
                       className="missing-execution-environment"
-                      content={i18n._(
-                        t`Custom virtual environment ${source.custom_virtualenv} must be replaced by an execution environment.`
-                      )}
+                      content={t`Custom virtual environment ${source.custom_virtualenv} must be replaced by an execution environment.`}
                       position="right"
                     >
                       <ExclamationTriangleIcon />
@@ -107,7 +105,7 @@ function InventorySourceListItem({
                   </span>
                 )}
               </DataListCell>,
-              <DataListCell aria-label={i18n._(t`type`)} key="type">
+              <DataListCell aria-label={t`type`} key="type">
                 {label}
               </DataListCell>,
             ]}
@@ -115,7 +113,7 @@ function InventorySourceListItem({
           <DataListAction
             id="actions"
             aria-labelledby="actions"
-            aria-label={i18n._(t`actions`)}
+            aria-label={t`actions`}
           >
             {source.summary_fields.user_capabilities.start && (
               <InventorySourceSyncButton source={source} />
@@ -123,7 +121,7 @@ function InventorySourceListItem({
             {source.summary_fields.user_capabilities.edit && (
               <Button
                 ouiaId={`${source.id}-edit-button`}
-                aria-label={i18n._(t`Edit Source`)}
+                aria-label={t`Edit Source`}
                 variant="plain"
                 component={Link}
                 to={`${detailUrl}/edit`}
@@ -137,4 +135,4 @@ function InventorySourceListItem({
     </>
   );
 }
-export default withI18n()(InventorySourceListItem);
+export default InventorySourceListItem;
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventory.jsx b/awx/ui_next/src/screens/Inventory/SmartInventory.jsx
index 0be4cf6740..f3600ce95b 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventory.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventory.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Link,
@@ -24,7 +24,7 @@ import SmartInventoryDetail from './SmartInventoryDetail';
 import SmartInventoryEdit from './SmartInventoryEdit';
 import SmartInventoryHosts from './SmartInventoryHosts';
 
-function SmartInventory({ i18n, setBreadcrumb }) {
+function SmartInventory({ setBreadcrumb }) {
   const location = useLocation();
   const match = useRouteMatch('/inventories/smart_inventory/:id');
 
@@ -60,17 +60,17 @@ function SmartInventory({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Inventories`)}
+          {t`Back to Inventories`}
         </>
       ),
       link: `/inventories`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `${match.url}/details`, id: 0 },
-    { name: i18n._(t`Access`), link: `${match.url}/access`, id: 1 },
-    { name: i18n._(t`Hosts`), link: `${match.url}/hosts`, id: 2 },
+    { name: t`Details`, link: `${match.url}/details`, id: 0 },
+    { name: t`Access`, link: `${match.url}/access`, id: 1 },
+    { name: t`Hosts`, link: `${match.url}/hosts`, id: 2 },
     {
-      name: i18n._(t`Jobs`),
+      name: t`Jobs`,
       link: `${match.url}/jobs`,
       id: 3,
     },
@@ -93,10 +93,8 @@ function SmartInventory({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError?.response?.status === 404 && (
               <span>
-                {i18n._(t`Smart Inventory not found.`)}{' '}
-                <Link to="/inventories">
-                  {i18n._(t`View all Inventories.`)}
-                </Link>
+                {t`Smart Inventory not found.`}{' '}
+                <Link to="/inventories">{t`View all Inventories.`}</Link>
               </span>
             )}
           </ContentError>
@@ -168,7 +166,7 @@ function SmartInventory({ i18n, setBreadcrumb }) {
                     <Link
                       to={`/inventories/smart_inventory/${match.params.id}/details`}
                     >
-                      {i18n._(t`View Inventory Details`)}
+                      {t`View Inventory Details`}
                     </Link>
                   )}
                 </ContentError>
@@ -182,4 +180,4 @@ function SmartInventory({ i18n, setBreadcrumb }) {
 }
 
 export { SmartInventory as _SmartInventory };
-export default withI18n()(SmartInventory);
+export default SmartInventory;
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryDetail/SmartInventoryDetail.jsx b/awx/ui_next/src/screens/Inventory/SmartInventoryDetail/SmartInventoryDetail.jsx
index 3ae34e52c6..6b140678c5 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryDetail/SmartInventoryDetail.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryDetail/SmartInventoryDetail.jsx
@@ -1,8 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
-import { shape } from 'prop-types';
 import { Button, Chip, Label } from '@patternfly/react-core';
 
 import { Inventory } from '../../../types';
@@ -24,7 +23,7 @@ import {
 import ErrorDetail from '../../../components/ErrorDetail';
 import Sparkline from '../../../components/Sparkline';
 
-function SmartInventoryDetail({ inventory, i18n }) {
+function SmartInventoryDetail({ inventory }) {
   const history = useHistory();
   const {
     created,
@@ -95,17 +94,17 @@ function SmartInventoryDetail({ inventory, i18n }) {
     <>
       <CardBody>
         <DetailList>
-          <Detail label={i18n._(t`Name`)} value={name} />
+          <Detail label={t`Name`} value={name} />
           {recentJobs.length > 0 && (
             <Detail
-              label={i18n._(t`Activity`)}
+              label={t`Activity`}
               value={<Sparkline jobs={recentJobs} />}
             />
           )}
-          <Detail label={i18n._(t`Description`)} value={description} />
-          <Detail label={i18n._(t`Type`)} value={i18n._(t`Smart inventory`)} />
+          <Detail label={t`Description`} value={description} />
+          <Detail label={t`Type`} value={t`Smart inventory`} />
           <Detail
-            label={i18n._(t`Organization`)}
+            label={t`Organization`}
             value={
               <Link to={`/organizations/${organization.id}/details`}>
                 {organization.name}
@@ -114,13 +113,13 @@ function SmartInventoryDetail({ inventory, i18n }) {
           />
           <Detail
             fullWidth
-            label={i18n._(t`Smart host filter`)}
+            label={t`Smart host filter`}
             value={<Label variant="outline">{host_filter}</Label>}
           />
           {instanceGroups.length > 0 && (
             <Detail
               fullWidth
-              label={i18n._(t`Instance groups`)}
+              label={t`Instance groups`}
               value={
                 <ChipGroup numChips={5} totalChips={instanceGroups.length}>
                   {instanceGroups.map(ig => (
@@ -132,18 +131,10 @@ function SmartInventoryDetail({ inventory, i18n }) {
               }
             />
           )}
-          <VariablesDetail
-            label={i18n._(t`Variables`)}
-            value={variables}
-            rows={4}
-          />
+          <VariablesDetail label={t`Variables`} value={variables} rows={4} />
+          <UserDateDetail label={t`Created`} date={created} user={created_by} />
           <UserDateDetail
-            label={i18n._(t`Created`)}
-            date={created}
-            user={created_by}
-          />
-          <UserDateDetail
-            label={i18n._(t`Last modified`)}
+            label={t`Last modified`}
             date={modified}
             user={modified_by}
           />
@@ -153,20 +144,20 @@ function SmartInventoryDetail({ inventory, i18n }) {
             <Button
               ouiaId="smart-inventory-detail-edit-button"
               component={Link}
-              aria-label={i18n._(t`edit`)}
+              aria-label={t`edit`}
               to={`/inventories/smart_inventory/${id}/edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
           {user_capabilities?.delete && (
             <DeleteButton
               name={name}
-              modalTitle={i18n._(t`Delete smart inventory`)}
+              modalTitle={t`Delete smart inventory`}
               onConfirm={handleDelete}
               isDisabled={isLoading}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
         </CardActionsRow>
@@ -175,10 +166,10 @@ function SmartInventoryDetail({ inventory, i18n }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete smart inventory.`)}
+          {t`Failed to delete smart inventory.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -188,7 +179,6 @@ function SmartInventoryDetail({ inventory, i18n }) {
 
 SmartInventoryDetail.propTypes = {
   inventory: Inventory.isRequired,
-  i18n: shape({}).isRequired,
 };
 
-export default withI18n()(SmartInventoryDetail);
+export default SmartInventoryDetail;
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.jsx b/awx/ui_next/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.jsx
index 048bf88419..4775321c46 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link, Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -10,7 +10,7 @@ import SmartInventoryHostDetail from '../SmartInventoryHostDetail';
 import useRequest from '../../../util/useRequest';
 import { InventoriesAPI } from '../../../api';
 
-function SmartInventoryHost({ i18n, inventory, setBreadcrumb }) {
+function SmartInventoryHost({ inventory, setBreadcrumb }) {
   const { params, path, url } = useRouteMatch(
     '/inventories/smart_inventory/:id/hosts/:hostId'
   );
@@ -45,14 +45,14 @@ function SmartInventoryHost({ i18n, inventory, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Hosts`)}
+          {t`Back to Hosts`}
         </>
       ),
       link: `/inventories/smart_inventory/${inventory.id}/hosts`,
       id: 0,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `${url}/details`,
       id: 1,
     },
@@ -77,7 +77,7 @@ function SmartInventoryHost({ i18n, inventory, setBreadcrumb }) {
           <Route key="not-found" path="*">
             <ContentError isNotFound>
               <Link to={`${url}/details`}>
-                {i18n._(t`View smart inventory host details`)}
+                {t`View smart inventory host details`}
               </Link>
             </ContentError>
           </Route>
@@ -87,4 +87,4 @@ function SmartInventoryHost({ i18n, inventory, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(SmartInventoryHost);
+export default SmartInventoryHost;
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHostDetail/SmartInventoryHostDetail.jsx b/awx/ui_next/src/screens/Inventory/SmartInventoryHostDetail/SmartInventoryHostDetail.jsx
index 3abb48d0ca..7f8e78d9c1 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHostDetail/SmartInventoryHostDetail.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHostDetail/SmartInventoryHostDetail.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Host } from '../../../types';
 import { CardBody } from '../../../components/Card';
@@ -12,7 +12,7 @@ import {
 import Sparkline from '../../../components/Sparkline';
 import { VariablesDetail } from '../../../components/CodeEditor';
 
-function SmartInventoryHostDetail({ host, i18n }) {
+function SmartInventoryHostDetail({ host }) {
   const {
     created,
     description,
@@ -28,41 +28,30 @@ function SmartInventoryHostDetail({ host, i18n }) {
   return (
     <CardBody>
       <DetailList gutter="sm">
-        <Detail label={i18n._(t`Name`)} value={name} />
+        <Detail label={t`Name`} value={name} />
         {recentPlaybookJobs?.length > 0 && (
           <Detail
-            label={i18n._(t`Activity`)}
+            label={t`Activity`}
             value={<Sparkline jobs={recentPlaybookJobs} />}
           />
         )}
-        <Detail label={i18n._(t`Description`)} value={description} />
+        <Detail label={t`Description`} value={description} />
         <Detail
-          label={i18n._(t`Inventory`)}
+          label={t`Inventory`}
           value={
             <Link to={`/inventories/inventory/${inventory?.id}/details`}>
               {inventory?.name}
             </Link>
           }
         />
-        <Detail
-          label={i18n._(t`Enabled`)}
-          value={enabled ? i18n._(t`On`) : i18n._(t`Off`)}
-        />
-        <UserDateDetail
-          date={created}
-          label={i18n._(t`Created`)}
-          user={created_by}
-        />
+        <Detail label={t`Enabled`} value={enabled ? t`On` : t`Off`} />
+        <UserDateDetail date={created} label={t`Created`} user={created_by} />
         <UserDateDetail
           date={modified}
-          label={i18n._(t`Last modified`)}
+          label={t`Last modified`}
           user={modified_by}
         />
-        <VariablesDetail
-          label={i18n._(t`Variables`)}
-          rows={4}
-          value={variables}
-        />
+        <VariablesDetail label={t`Variables`} rows={4} value={variables} />
       </DetailList>
     </CardBody>
   );
@@ -72,4 +61,4 @@ SmartInventoryHostDetail.propTypes = {
   host: Host.isRequired,
 };
 
-export default withI18n()(SmartInventoryHostDetail);
+export default SmartInventoryHostDetail;
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.jsx b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.jsx
index aa9477326b..eb50309366 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback, useState } from 'react';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import DataListToolbar from '../../../components/DataListToolbar';
 import PaginatedDataList from '../../../components/PaginatedDataList';
@@ -18,7 +18,7 @@ const QS_CONFIG = getQSConfig('host', {
   order_by: 'name',
 });
 
-function SmartInventoryHostList({ i18n, inventory }) {
+function SmartInventoryHostList({ inventory }) {
   const location = useLocation();
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
   const {
@@ -59,27 +59,27 @@ function SmartInventoryHostList({ i18n, inventory }) {
         hasContentLoading={isLoading || isAdHocLaunchLoading}
         items={hosts}
         itemCount={count}
-        pluralizedItemName={i18n._(t`Hosts`)}
+        pluralizedItemName={t`Hosts`}
         qsConfig={QS_CONFIG}
         onRowClick={handleSelect}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
             isDefault: true,
           },
           {
-            name: i18n._(t`Created by (username)`),
+            name: t`Created by (username)`,
             key: 'created_by__username',
           },
           {
-            name: i18n._(t`Modified by (username)`),
+            name: t`Modified by (username)`,
             key: 'modified_by__username',
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name',
           },
         ]}
@@ -123,4 +123,4 @@ SmartInventoryHostList.propTypes = {
   inventory: Inventory.isRequired,
 };
 
-export default withI18n()(SmartInventoryHostList);
+export default SmartInventoryHostList;
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.jsx b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.jsx
index 30a807c459..66ce6aeefd 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import 'styled-components/macro';
 
@@ -15,13 +15,7 @@ import DataListCell from '../../../components/DataListCell';
 import Sparkline from '../../../components/Sparkline';
 import { Host } from '../../../types';
 
-function SmartInventoryHostListItem({
-  i18n,
-  detailUrl,
-  host,
-  isSelected,
-  onSelect,
-}) {
+function SmartInventoryHostListItem({ detailUrl, host, isSelected, onSelect }) {
   const recentPlaybookJobs = host.summary_fields.recent_jobs.map(job => ({
     ...job,
     type: 'job',
@@ -50,7 +44,7 @@ function SmartInventoryHostListItem({
             </DataListCell>,
             <DataListCell key="inventory">
               <>
-                <b css="margin-right: 24px">{i18n._(t`Inventory`)}</b>
+                <b css="margin-right: 24px">{t`Inventory`}</b>
                 <Link
                   to={`/inventories/inventory/${host.summary_fields.inventory.id}/details`}
                 >
@@ -72,4 +66,4 @@ SmartInventoryHostListItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(SmartInventoryHostListItem);
+export default SmartInventoryHostListItem;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventoryForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventoryForm.jsx
index ac79968a05..b7922841df 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventoryForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventoryForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { Formik, useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { func, number, shape } from 'prop-types';
 
@@ -17,11 +17,11 @@ import {
   FormFullWidthLayout,
 } from '../../../components/FormLayout';
 
-function InventoryFormFields({ i18n, credentialTypeId, inventory }) {
+function InventoryFormFields({ credentialTypeId, inventory }) {
   const { setFieldValue } = useFormikContext();
   const [organizationField, organizationMeta, organizationHelpers] = useField({
     name: 'organization',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const [instanceGroupsField, , instanceGroupsHelpers] = useField(
     'instanceGroups'
@@ -44,15 +44,15 @@ function InventoryFormFields({ i18n, credentialTypeId, inventory }) {
     <>
       <FormField
         id="inventory-name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="inventory-description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
@@ -68,7 +68,7 @@ function InventoryFormFields({ i18n, credentialTypeId, inventory }) {
         autoPopulate={!inventory?.id}
       />
       <CredentialLookup
-        label={i18n._(t`Insights Credential`)}
+        label={t`Insights Credential`}
         credentialTypeId={credentialTypeId}
         onChange={onCredentialChange}
         value={insightsCredentialField.value}
@@ -81,12 +81,10 @@ function InventoryFormFields({ i18n, credentialTypeId, inventory }) {
       />
       <FormFullWidthLayout>
         <VariablesField
-          tooltip={i18n._(
-            t`Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the documentation for example syntax`
-          )}
+          tooltip={t`Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax`}
           id="inventory-variables"
           name="variables"
-          label={i18n._(t`Variables`)}
+          label={t`Variables`}
         />
       </FormFullWidthLayout>
     </>
@@ -153,4 +151,4 @@ InventoryForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(InventoryForm);
+export default InventoryForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventoryGroupForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventoryGroupForm.jsx
index ac894d918b..899a2d3c80 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventoryGroupForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventoryGroupForm.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { Formik } from 'formik';
 import { Form, Card } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
@@ -14,13 +14,7 @@ import {
   FormFullWidthLayout,
 } from '../../../components/FormLayout';
 
-function InventoryGroupForm({
-  i18n,
-  error,
-  group = {},
-  handleSubmit,
-  handleCancel,
-}) {
+function InventoryGroupForm({ error, group = {}, handleSubmit, handleCancel }) {
   const initialValues = {
     name: group.name || '',
     description: group.description || '',
@@ -38,21 +32,21 @@ function InventoryGroupForm({
                   id="inventoryGroup-name"
                   name="name"
                   type="text"
-                  label={i18n._(t`Name`)}
-                  validate={required(null, i18n)}
+                  label={t`Name`}
+                  validate={required(null)}
                   isRequired
                 />
                 <FormField
                   id="inventoryGroup-description"
                   name="description"
                   type="text"
-                  label={i18n._(t`Description`)}
+                  label={t`Description`}
                 />
                 <FormFullWidthLayout>
                   <VariablesField
                     id="host-variables"
                     name="variables"
-                    label={i18n._(t`Variables`)}
+                    label={t`Variables`}
                   />
                 </FormFullWidthLayout>
                 <FormActionGroup
@@ -69,4 +63,4 @@ function InventoryGroupForm({
   );
 }
 
-export default withI18n()(InventoryGroupForm);
+export default InventoryGroupForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventoryGroupsDeleteModal.jsx b/awx/ui_next/src/screens/Inventory/shared/InventoryGroupsDeleteModal.jsx
index 548a7e78e8..adea51905f 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventoryGroupsDeleteModal.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventoryGroupsDeleteModal.jsx
@@ -2,7 +2,6 @@ import 'styled-components/macro';
 import React, { useState, useContext, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { func, bool, arrayOf } from 'prop-types';
-import { useLingui } from '@lingui/react';
 import { t, Plural } from '@lingui/macro';
 import { Button, Radio, DropdownItem } from '@patternfly/react-core';
 import styled from 'styled-components';
@@ -19,7 +18,6 @@ const ListItem = styled.li`
 `;
 
 const InventoryGroupsDeleteModal = ({ onAfterDelete, isDisabled, groups }) => {
-  const { i18n } = useLingui();
   const [radioOption, setRadioOption] = useState(null);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
@@ -63,19 +61,19 @@ const InventoryGroupsDeleteModal = ({ onAfterDelete, isDisabled, groups }) => {
           key="delete"
           isDisabled={isDisabled || isDeleteLoading}
           component="button"
-          aria-label={i18n._(t`Delete`)}
+          aria-label={t`Delete`}
           onClick={() => setIsModalOpen(true)}
         >
-          {i18n._(t`Delete`)}
+          {t`Delete`}
         </DropdownItem>
       ) : (
         <Button
           variant="secondary"
-          aria-label={i18n._(t`Delete`)}
+          aria-label={t`Delete`}
           onClick={() => setIsModalOpen(true)}
           isDisabled={isDisabled || isDeleteLoading}
         >
-          {i18n._(t`Delete`)}
+          {t`Delete`}
         </Button>
       )}
       {isModalOpen && (
@@ -92,21 +90,21 @@ const InventoryGroupsDeleteModal = ({ onAfterDelete, isDisabled, groups }) => {
           onClose={() => setIsModalOpen(false)}
           actions={[
             <Button
-              aria-label={i18n._(t`Confirm Delete`)}
+              aria-label={t`Confirm Delete`}
               onClick={() => handleDelete(radioOption)}
               variant="danger"
               key="delete"
               isDisabled={radioOption === null}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </Button>,
             <Button
-              aria-label={i18n._(t`Close`)}
+              aria-label={t`Close`}
               onClick={() => setIsModalOpen(false)}
               variant="link"
               key="cancel"
             >
-              {i18n._(t`Cancel`)}
+              {t`Cancel`}
             </Button>,
           ]}
         >
@@ -125,7 +123,7 @@ const InventoryGroupsDeleteModal = ({ onAfterDelete, isDisabled, groups }) => {
             <Radio
               id="radio-delete"
               key="radio-delete"
-              label={i18n._(t`Delete All Groups and Hosts`)}
+              label={t`Delete All Groups and Hosts`}
               name="option"
               onChange={() => setRadioOption('delete')}
             />
@@ -133,7 +131,7 @@ const InventoryGroupsDeleteModal = ({ onAfterDelete, isDisabled, groups }) => {
               css="margin-top: 5px;"
               id="radio-promote"
               key="radio-promote"
-              label={i18n._(t`Promote Child Groups and Hosts`)}
+              label={t`Promote Child Groups and Hosts`}
               name="option"
               onChange={() => setRadioOption('promote')}
             />
@@ -144,11 +142,11 @@ const InventoryGroupsDeleteModal = ({ onAfterDelete, isDisabled, groups }) => {
         <AlertModal
           isOpen={deletionError}
           variant="error"
-          aria-label={i18n._(t`deletion error`)}
-          title={i18n._(t`Error!`)}
+          aria-label={t`deletion error`}
+          title={t`Error!`}
           onClose={() => setDeletionError(null)}
         >
-          {i18n._(t`Failed to delete one or more groups.`)}
+          {t`Failed to delete one or more groups.`}
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx
index 3049d2ccb4..a0f33a6a12 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useCallback } from 'react';
 import { Formik, useField, useFormikContext } from 'formik';
 import { func, shape } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Form, FormGroup, Title } from '@patternfly/react-core';
 import { InventorySourcesAPI } from '../../../api';
@@ -42,7 +42,6 @@ const InventorySourceFormFields = ({
   source,
   sourceOptions,
   organizationId,
-  i18n,
 }) => {
   const {
     values,
@@ -53,7 +52,7 @@ const InventorySourceFormFields = ({
   } = useFormikContext();
   const [sourceField, sourceMeta] = useField({
     name: 'source',
-    validate: required(i18n._(t`Set a value for this field`), i18n),
+    validate: required(t`Set a value for this field`),
   });
   const [
     executionEnvironmentField,
@@ -102,15 +101,15 @@ const InventorySourceFormFields = ({
     <>
       <FormField
         id="name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
@@ -132,7 +131,7 @@ const InventorySourceFormFields = ({
         validated={
           !sourceMeta.touched || !sourceMeta.error ? 'default' : 'error'
         }
-        label={i18n._(t`Source`)}
+        label={t`Source`}
       >
         <AnsibleSelect
           {...sourceField}
@@ -141,7 +140,7 @@ const InventorySourceFormFields = ({
             {
               value: '',
               key: '',
-              label: i18n._(t`Choose a source`),
+              label: t`Choose a source`,
               isDisabled: true,
             },
             ...buildSourceChoiceOptions(sourceOptions),
@@ -154,7 +153,7 @@ const InventorySourceFormFields = ({
       {!['', 'custom'].includes(sourceField.value) && (
         <SubFormLayout>
           <Title size="md" headingLevel="h4">
-            {i18n._(t`Source details`)}
+            {t`Source details`}
           </Title>
           <FormColumnLayout>
             {
@@ -229,7 +228,6 @@ const InventorySourceFormFields = ({
 };
 
 const InventorySourceForm = ({
-  i18n,
   onCancel,
   onSubmit,
   source,
@@ -295,7 +293,6 @@ const InventorySourceForm = ({
           <FormColumnLayout>
             <InventorySourceFormFields
               formik={formik}
-              i18n={i18n}
               source={source}
               sourceOptions={sourceOptions}
               organizationId={organizationId}
@@ -322,4 +319,4 @@ InventorySourceForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(InventorySourceForm);
+export default InventorySourceForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/AzureSubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/AzureSubForm.jsx
index 8729445851..60ed35a6a7 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/AzureSubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/AzureSubForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import CredentialLookup from '../../../../components/Lookup/CredentialLookup';
 import {
@@ -15,11 +15,11 @@ import { required } from '../../../../util/validators';
 import getDocsBaseUrl from '../../../../util/getDocsBaseUrl';
 import { useConfig } from '../../../../contexts/Config';
 
-const AzureSubForm = ({ autoPopulateCredential, i18n }) => {
+const AzureSubForm = ({ autoPopulateCredential }) => {
   const { setFieldValue } = useFormikContext();
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const config = useConfig();
 
@@ -40,7 +40,7 @@ const AzureSubForm = ({ autoPopulateCredential, i18n }) => {
     <>
       <CredentialLookup
         credentialTypeNamespace="azure_rm"
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         helperTextInvalid={credentialMeta.error}
         isValid={!credentialMeta.touched || !credentialMeta.error}
         onBlur={() => credentialHelpers.setTouched()}
@@ -78,4 +78,4 @@ const AzureSubForm = ({ autoPopulateCredential, i18n }) => {
   );
 };
 
-export default withI18n()(AzureSubForm);
+export default AzureSubForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/EC2SubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/EC2SubForm.jsx
index c5a988fa3d..e28abc6ef8 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/EC2SubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/EC2SubForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import CredentialLookup from '../../../../components/Lookup/CredentialLookup';
 import {
@@ -14,7 +14,7 @@ import {
 import getDocsBaseUrl from '../../../../util/getDocsBaseUrl';
 import { useConfig } from '../../../../contexts/Config';
 
-const EC2SubForm = ({ i18n }) => {
+const EC2SubForm = () => {
   const { setFieldValue } = useFormikContext();
   const [credentialField] = useField('credential');
   const config = useConfig();
@@ -36,7 +36,7 @@ const EC2SubForm = ({ i18n }) => {
     <>
       <CredentialLookup
         credentialTypeNamespace="aws"
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         value={credentialField.value}
         onChange={handleCredentialUpdate}
       />
@@ -69,4 +69,4 @@ const EC2SubForm = ({ i18n }) => {
   );
 };
 
-export default withI18n()(EC2SubForm);
+export default EC2SubForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/GCESubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/GCESubForm.jsx
index 793211107a..813ace1e8e 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/GCESubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/GCESubForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import CredentialLookup from '../../../../components/Lookup/CredentialLookup';
 import {
@@ -15,11 +15,11 @@ import { required } from '../../../../util/validators';
 import getDocsBaseUrl from '../../../../util/getDocsBaseUrl';
 import { useConfig } from '../../../../contexts/Config';
 
-const GCESubForm = ({ autoPopulateCredential, i18n }) => {
+const GCESubForm = ({ autoPopulateCredential }) => {
   const { setFieldValue } = useFormikContext();
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const config = useConfig();
 
@@ -40,7 +40,7 @@ const GCESubForm = ({ autoPopulateCredential, i18n }) => {
     <>
       <CredentialLookup
         credentialTypeNamespace="gce"
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         helperTextInvalid={credentialMeta.error}
         isValid={!credentialMeta.touched || !credentialMeta.error}
         onBlur={() => credentialHelpers.setTouched()}
@@ -78,4 +78,4 @@ const GCESubForm = ({ autoPopulateCredential, i18n }) => {
   );
 };
 
-export default withI18n()(GCESubForm);
+export default GCESubForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/OpenStackSubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/OpenStackSubForm.jsx
index 3d85189b10..f52f50ffa0 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/OpenStackSubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/OpenStackSubForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import CredentialLookup from '../../../../components/Lookup/CredentialLookup';
 import {
@@ -15,11 +15,11 @@ import { required } from '../../../../util/validators';
 import getDocsBaseUrl from '../../../../util/getDocsBaseUrl';
 import { useConfig } from '../../../../contexts/Config';
 
-const OpenStackSubForm = ({ autoPopulateCredential, i18n }) => {
+const OpenStackSubForm = ({ autoPopulateCredential }) => {
   const { setFieldValue } = useFormikContext();
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const config = useConfig();
 
@@ -40,7 +40,7 @@ const OpenStackSubForm = ({ autoPopulateCredential, i18n }) => {
     <>
       <CredentialLookup
         credentialTypeNamespace="openstack"
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         helperTextInvalid={credentialMeta.error}
         isValid={!credentialMeta.touched || !credentialMeta.error}
         onBlur={() => credentialHelpers.setTouched()}
@@ -78,4 +78,4 @@ const OpenStackSubForm = ({ autoPopulateCredential, i18n }) => {
   );
 };
 
-export default withI18n()(OpenStackSubForm);
+export default OpenStackSubForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx
index c04f471f32..d3be7a3fcb 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   FormGroup,
@@ -24,18 +24,18 @@ import {
   HostFilterField,
 } from './SharedFields';
 
-const SCMSubForm = ({ autoPopulateProject, i18n }) => {
+const SCMSubForm = ({ autoPopulateProject }) => {
   const [isOpen, setIsOpen] = useState(false);
   const [sourcePath, setSourcePath] = useState([]);
   const { setFieldValue, setFieldTouched } = useFormikContext();
   const [credentialField] = useField('credential');
   const [projectField, projectMeta, projectHelpers] = useField({
     name: 'source_project',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const [sourcePathField, sourcePathMeta, sourcePathHelpers] = useField({
     name: 'source_path',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   const { error: sourcePathError, request: fetchSourcePath } = useRequest(
@@ -76,7 +76,7 @@ const SCMSubForm = ({ autoPopulateProject, i18n }) => {
     <>
       <CredentialLookup
         credentialTypeKind="cloud"
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         value={credentialField.value}
         onChange={handleCredentialUpdate}
       />
@@ -99,12 +99,12 @@ const SCMSubForm = ({ autoPopulateProject, i18n }) => {
             : 'error'
         }
         isRequired
-        label={i18n._(t`Inventory file`)}
+        label={t`Inventory file`}
         labelIcon={
           <Popover
-            content={i18n._(t`Select the inventory file
+            content={t`Select the inventory file
           to be synced by this source. You can select from
-          the dropdown or enter a file within the input.`)}
+          the dropdown or enter a file within the input.`}
           />
         }
       >
@@ -124,10 +124,10 @@ const SCMSubForm = ({ autoPopulateProject, i18n }) => {
             value = value.trim();
             sourcePathHelpers.setValue(value);
           }}
-          aria-label={i18n._(t`Select source path`)}
-          typeAheadAriaLabel={i18n._(t`Select source path`)}
-          placeholder={i18n._(t`Select source path`)}
-          createText={i18n._(t`Set source path to`)}
+          aria-label={t`Select source path`}
+          typeAheadAriaLabel={t`Select source path`}
+          placeholder={t`Select source path`}
+          createText={t`Set source path to`}
           isCreatable
           onCreateOption={value => {
             value.trim();
@@ -149,4 +149,4 @@ const SCMSubForm = ({ autoPopulateProject, i18n }) => {
   );
 };
 
-export default withI18n()(SCMSubForm);
+export default SCMSubForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SatelliteSubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SatelliteSubForm.jsx
index 0d27c3b298..6df0d3b9c2 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SatelliteSubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SatelliteSubForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import CredentialLookup from '../../../../components/Lookup/CredentialLookup';
 import {
@@ -15,11 +15,11 @@ import { required } from '../../../../util/validators';
 import getDocsBaseUrl from '../../../../util/getDocsBaseUrl';
 import { useConfig } from '../../../../contexts/Config';
 
-const SatelliteSubForm = ({ autoPopulateCredential, i18n }) => {
+const SatelliteSubForm = ({ autoPopulateCredential }) => {
   const { setFieldValue } = useFormikContext();
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const config = useConfig();
 
@@ -40,7 +40,7 @@ const SatelliteSubForm = ({ autoPopulateCredential, i18n }) => {
     <>
       <CredentialLookup
         credentialTypeNamespace="satellite6"
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         helperTextInvalid={credentialMeta.error}
         isValid={!credentialMeta.touched || !credentialMeta.error}
         onBlur={() => credentialHelpers.setTouched()}
@@ -78,4 +78,4 @@ const SatelliteSubForm = ({ autoPopulateCredential, i18n }) => {
   );
 };
 
-export default withI18n()(SatelliteSubForm);
+export default SatelliteSubForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx
index cb03c36af0..a0063a2fc7 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import { useField } from 'formik';
 import { Link } from 'react-router-dom';
@@ -14,7 +14,7 @@ import {
 } from '../../../../components/FormLayout';
 import Popover from '../../../../components/Popover';
 
-export const SourceVarsField = withI18n()(({ i18n, popoverContent }) => {
+export const SourceVarsField = ({ popoverContent }) => {
   const jsonExample = `
   {
     "somevar": "somevalue"
@@ -31,7 +31,7 @@ export const SourceVarsField = withI18n()(({ i18n, popoverContent }) => {
       <VariablesField
         id="source_vars"
         name="source_vars"
-        label={i18n._(t`Source variables`)}
+        label={t`Source variables`}
         tooltip={
           <div>
             {popoverContent}
@@ -73,25 +73,25 @@ export const SourceVarsField = withI18n()(({ i18n, popoverContent }) => {
       />
     </FormFullWidthLayout>
   );
-});
+};
 
-export const VerbosityField = withI18n()(({ i18n }) => {
+export const VerbosityField = () => {
   const [field, meta, helpers] = useField('verbosity');
   const isValid = !(meta.touched && meta.error);
   const options = [
-    { value: '0', key: '0', label: i18n._(t`0 (Warning)`) },
-    { value: '1', key: '1', label: i18n._(t`1 (Info)`) },
-    { value: '2', key: '2', label: i18n._(t`2 (Debug)`) },
+    { value: '0', key: '0', label: t`0 (Warning)` },
+    { value: '1', key: '1', label: t`1 (Info)` },
+    { value: '2', key: '2', label: t`2 (Debug)` },
   ];
   return (
     <FormGroup
       fieldId="verbosity"
       validated={isValid ? 'default' : 'error'}
-      label={i18n._(t`Verbosity`)}
+      label={t`Verbosity`}
       labelIcon={
         <Popover
-          content={i18n._(t`Control the level of output Ansible
-        will produce for inventory source update jobs.`)}
+          content={t`Control the level of output Ansible
+        will produce for inventory source update jobs.`}
         />
       }
     >
@@ -103,188 +103,177 @@ export const VerbosityField = withI18n()(({ i18n }) => {
       />
     </FormGroup>
   );
-});
+};
 
-export const OptionsField = withI18n()(
-  ({ i18n, showProjectUpdate = false }) => {
-    const [updateOnLaunchField] = useField('update_on_launch');
-    const [, , updateCacheTimeoutHelper] = useField('update_cache_timeout');
-    const [updatedOnProjectUpdateField] = useField('update_on_project_update');
-    const [projectField] = useField('source_project');
+export const OptionsField = ({ showProjectUpdate = false }) => {
+  const [updateOnLaunchField] = useField('update_on_launch');
+  const [, , updateCacheTimeoutHelper] = useField('update_cache_timeout');
+  const [updatedOnProjectUpdateField] = useField('update_on_project_update');
+  const [projectField] = useField('source_project');
 
-    useEffect(() => {
-      if (!updateOnLaunchField.value) {
-        updateCacheTimeoutHelper.setValue(0);
-      }
-    }, [updateOnLaunchField.value]); // eslint-disable-line react-hooks/exhaustive-deps
+  useEffect(() => {
+    if (!updateOnLaunchField.value) {
+      updateCacheTimeoutHelper.setValue(0);
+    }
+  }, [updateOnLaunchField.value]); // eslint-disable-line react-hooks/exhaustive-deps
 
-    return (
-      <>
-        <FormFullWidthLayout>
-          <FormGroup
-            fieldId="option-checkboxes"
-            label={i18n._(t`Update options`)}
-          >
-            <FormCheckboxLayout>
-              <CheckboxField
-                id="overwrite"
-                name="overwrite"
-                label={i18n._(t`Overwrite`)}
-                tooltip={
-                  <>
-                    {i18n._(t`If checked, any hosts and groups that were
+  return (
+    <>
+      <FormFullWidthLayout>
+        <FormGroup fieldId="option-checkboxes" label={t`Update options`}>
+          <FormCheckboxLayout>
+            <CheckboxField
+              id="overwrite"
+              name="overwrite"
+              label={t`Overwrite`}
+              tooltip={
+                <>
+                  {t`If checked, any hosts and groups that were
                   previously present on the external source but are now removed
                   will be removed from the inventory. Hosts and groups
                   that were not managed by the inventory source will be promoted
                   to the next manually created group or if there is no manually
                   created group to promote them into, they will be left in the "all"
-                  default group for the inventory.`)}
-                    <br />
-                    <br />
-                    {i18n._(t`When not checked, local child
+                  default group for the inventory.`}
+                  <br />
+                  <br />
+                  {t`When not checked, local child
                   hosts and groups not found on the external source will remain
-                  untouched by the inventory update process.`)}
-                  </>
-                }
-              />
-              <CheckboxField
-                id="overwrite_vars"
-                name="overwrite_vars"
-                label={i18n._(t`Overwrite variables`)}
-                tooltip={
-                  <>
-                    {i18n._(t`If checked, all variables for child groups
+                  untouched by the inventory update process.`}
+                </>
+              }
+            />
+            <CheckboxField
+              id="overwrite_vars"
+              name="overwrite_vars"
+              label={t`Overwrite variables`}
+              tooltip={
+                <>
+                  {t`If checked, all variables for child groups
                   and hosts will be removed and replaced by those found
-                  on the external source.`)}
-                    <br />
-                    <br />
-                    {i18n._(t`When not checked, a merge will be performed,
+                  on the external source.`}
+                  <br />
+                  <br />
+                  {t`When not checked, a merge will be performed,
                   combining local variables with those found on the
-                  external source.`)}
-                  </>
-                }
-              />
+                  external source.`}
+                </>
+              }
+            />
+            <CheckboxField
+              isDisabled={updatedOnProjectUpdateField.value}
+              id="update_on_launch"
+              name="update_on_launch"
+              label={t`Update on launch`}
+              tooltip={
+                <>
+                  <div>
+                    {t`Each time a job runs using this inventory,
+            refresh the inventory from the selected source before
+            executing job tasks.`}
+                  </div>
+                  <br />
+                  {projectField?.value && (
+                    <div>
+                      {t`If you want the Inventory Source to update on
+                      launch and on project update, click on Update on launch, and also go to`}
+                      <Link to={`/projects/${projectField.value.id}/details`}>
+                        {' '}
+                        {projectField.value.name}{' '}
+                      </Link>
+                      {t`and click on Update Revision on Launch`}
+                    </div>
+                  )}
+                </>
+              }
+            />
+            {showProjectUpdate && (
               <CheckboxField
-                isDisabled={updatedOnProjectUpdateField.value}
-                id="update_on_launch"
-                name="update_on_launch"
-                label={i18n._(t`Update on launch`)}
+                isDisabled={updateOnLaunchField.value}
+                id="update_on_project_update"
+                name="update_on_project_update"
+                label={t`Update on project update`}
                 tooltip={
                   <>
                     <div>
-                      {i18n._(t`Each time a job runs using this inventory,
-            refresh the inventory from the selected source before
-            executing job tasks.`)}
+                      {t`After every project update where the SCM revision
+              changes, refresh the inventory from the selected source
+              before executing job tasks. This is intended for static content,
+              like the Ansible inventory .ini file format.`}
                     </div>
                     <br />
                     {projectField?.value && (
                       <div>
-                        {i18n._(t`If you want the Inventory Source to update on
-                      launch and on project update, click on Update on launch, and also go to`)}
+                        {t`If you want the Inventory Source to update on
+                      launch and on project update, click on Update on launch, and also go to`}
                         <Link to={`/projects/${projectField.value.id}/details`}>
                           {' '}
                           {projectField.value.name}{' '}
                         </Link>
-                        {i18n._(t`and click on Update Revision on Launch`)}
+                        {t`and click on Update Revision on Launch`}
                       </div>
                     )}
                   </>
                 }
               />
-              {showProjectUpdate && (
-                <CheckboxField
-                  isDisabled={updateOnLaunchField.value}
-                  id="update_on_project_update"
-                  name="update_on_project_update"
-                  label={i18n._(t`Update on project update`)}
-                  tooltip={
-                    <>
-                      <div>
-                        {i18n._(t`After every project update where the SCM revision
-              changes, refresh the inventory from the selected source
-              before executing job tasks. This is intended for static content,
-              like the Ansible inventory .ini file format.`)}
-                      </div>
-                      <br />
-                      {projectField?.value && (
-                        <div>
-                          {i18n._(t`If you want the Inventory Source to update on
-                      launch and on project update, click on Update on launch, and also go to`)}
-                          <Link
-                            to={`/projects/${projectField.value.id}/details`}
-                          >
-                            {' '}
-                            {projectField.value.name}{' '}
-                          </Link>
-                          {i18n._(t`and click on Update Revision on Launch`)}
-                        </div>
-                      )}
-                    </>
-                  }
-                />
-              )}
-            </FormCheckboxLayout>
-          </FormGroup>
-        </FormFullWidthLayout>
-        {updateOnLaunchField.value && (
-          <FormField
-            id="cache-timeout"
-            name="update_cache_timeout"
-            type="number"
-            min="0"
-            max="2147483647"
-            validate={minMaxValue(0, 2147483647, i18n)}
-            label={i18n._(t`Cache timeout (seconds)`)}
-            tooltip={i18n._(t`Time in seconds to consider an inventory sync
+            )}
+          </FormCheckboxLayout>
+        </FormGroup>
+      </FormFullWidthLayout>
+      {updateOnLaunchField.value && (
+        <FormField
+          id="cache-timeout"
+          name="update_cache_timeout"
+          type="number"
+          min="0"
+          max="2147483647"
+          validate={minMaxValue(0, 2147483647)}
+          label={t`Cache timeout (seconds)`}
+          tooltip={t`Time in seconds to consider an inventory sync
               to be current. During job runs and callbacks the task system will
               evaluate the timestamp of the latest sync. If it is older than
               Cache Timeout, it is not considered current, and a new
-              inventory sync will be performed.`)}
-          />
-        )}
-      </>
-    );
-  }
-);
+              inventory sync will be performed.`}
+        />
+      )}
+    </>
+  );
+};
 
-export const EnabledVarField = withI18n()(({ i18n }) => {
+export const EnabledVarField = () => {
   return (
     <FormField
       id="inventory-enabled-var"
-      label={i18n._(t`Enabled Variable`)}
-      tooltip={i18n._(t`Retrieve the enabled state from the given dict of host variables.
-        The enabled variable may be specified using dot notation, e.g: 'foo.bar'`)}
+      label={t`Enabled Variable`}
+      tooltip={t`Retrieve the enabled state from the given dict of host variables.
+        The enabled variable may be specified using dot notation, e.g: 'foo.bar'`}
       name="enabled_var"
       type="text"
     />
   );
-});
+};
 
-export const EnabledValueField = withI18n()(({ i18n }) => {
+export const EnabledValueField = () => {
   return (
     <FormField
       id="inventory-enabled-value"
-      label={i18n._(t`Enabled Value`)}
-      tooltip={i18n._(
-        t`This field is ignored unless an Enabled Variable is set. If the enabled variable matches this value, the host will be enabled on import.`
-      )}
+      label={t`Enabled Value`}
+      tooltip={t`This field is ignored unless an Enabled Variable is set. If the enabled variable matches this value, the host will be enabled on import.`}
       name="enabled_value"
       type="text"
     />
   );
-});
+};
 
-export const HostFilterField = withI18n()(({ i18n }) => {
+export const HostFilterField = () => {
   return (
     <FormField
       id="host-filter"
-      label={i18n._(t`Host Filter`)}
-      tooltip={i18n._(
-        t`Regular expression where only matching host names will be imported. The filter is applied as a post-processing step after any inventory plugin filters are applied.`
-      )}
+      label={t`Host Filter`}
+      tooltip={t`Regular expression where only matching host names will be imported. The filter is applied as a post-processing step after any inventory plugin filters are applied.`}
       name="host_filter"
       type="text"
-      validate={regExp(i18n)}
+      validate={regExp()}
     />
   );
-});
+};
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/TowerSubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/TowerSubForm.jsx
index dd3f57df41..a6f92ad81c 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/TowerSubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/TowerSubForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import CredentialLookup from '../../../../components/Lookup/CredentialLookup';
 import {
@@ -15,11 +15,11 @@ import { required } from '../../../../util/validators';
 import getDocsBaseUrl from '../../../../util/getDocsBaseUrl';
 import { useConfig } from '../../../../contexts/Config';
 
-const TowerSubForm = ({ autoPopulateCredential, i18n }) => {
+const TowerSubForm = ({ autoPopulateCredential }) => {
   const { setFieldValue } = useFormikContext();
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const config = useConfig();
 
@@ -40,7 +40,7 @@ const TowerSubForm = ({ autoPopulateCredential, i18n }) => {
     <>
       <CredentialLookup
         credentialTypeNamespace="tower"
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         helperTextInvalid={credentialMeta.error}
         isValid={!credentialMeta.touched || !credentialMeta.error}
         onBlur={() => credentialHelpers.setTouched()}
@@ -78,4 +78,4 @@ const TowerSubForm = ({ autoPopulateCredential, i18n }) => {
   );
 };
 
-export default withI18n()(TowerSubForm);
+export default TowerSubForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/VMwareSubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/VMwareSubForm.jsx
index f9b0b16eb4..349c36ccf3 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/VMwareSubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/VMwareSubForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import CredentialLookup from '../../../../components/Lookup/CredentialLookup';
 import {
@@ -15,11 +15,11 @@ import { required } from '../../../../util/validators';
 import getDocsBaseUrl from '../../../../util/getDocsBaseUrl';
 import { useConfig } from '../../../../contexts/Config';
 
-const VMwareSubForm = ({ autoPopulateCredential, i18n }) => {
+const VMwareSubForm = ({ autoPopulateCredential }) => {
   const { setFieldValue } = useFormikContext();
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const config = useConfig();
 
@@ -40,7 +40,7 @@ const VMwareSubForm = ({ autoPopulateCredential, i18n }) => {
     <>
       <CredentialLookup
         credentialTypeNamespace="vmware"
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         helperTextInvalid={credentialMeta.error}
         isValid={!credentialMeta.touched || !credentialMeta.error}
         onBlur={() => credentialHelpers.setTouched()}
@@ -78,4 +78,4 @@ const VMwareSubForm = ({ autoPopulateCredential, i18n }) => {
   );
 };
 
-export default withI18n()(VMwareSubForm);
+export default VMwareSubForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/VirtualizationSubForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/VirtualizationSubForm.jsx
index e081d9f629..b507101d17 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/VirtualizationSubForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/VirtualizationSubForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import CredentialLookup from '../../../../components/Lookup/CredentialLookup';
 import {
@@ -15,11 +15,11 @@ import { required } from '../../../../util/validators';
 import getDocsBaseUrl from '../../../../util/getDocsBaseUrl';
 import { useConfig } from '../../../../contexts/Config';
 
-const VirtualizationSubForm = ({ autoPopulateCredential, i18n }) => {
+const VirtualizationSubForm = ({ autoPopulateCredential }) => {
   const { setFieldValue } = useFormikContext();
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const config = useConfig();
 
@@ -40,7 +40,7 @@ const VirtualizationSubForm = ({ autoPopulateCredential, i18n }) => {
     <>
       <CredentialLookup
         credentialTypeNamespace="rhv"
-        label={i18n._(t`Credential`)}
+        label={t`Credential`}
         helperTextInvalid={credentialMeta.error}
         isValid={!credentialMeta.touched || !credentialMeta.error}
         onBlur={() => credentialHelpers.setTouched()}
@@ -78,4 +78,4 @@ const VirtualizationSubForm = ({ autoPopulateCredential, i18n }) => {
   );
 };
 
-export default withI18n()(VirtualizationSubForm);
+export default VirtualizationSubForm;
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSyncButton.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSyncButton.jsx
index d6b8f02058..07272a5d7a 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceSyncButton.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceSyncButton.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Button, Tooltip } from '@patternfly/react-core';
@@ -9,7 +9,7 @@ import AlertModal from '../../../components/AlertModal/AlertModal';
 import ErrorDetail from '../../../components/ErrorDetail/ErrorDetail';
 import { InventoryUpdatesAPI, InventorySourcesAPI } from '../../../api';
 
-function InventorySourceSyncButton({ source, icon, i18n }) {
+function InventorySourceSyncButton({ source, icon }) {
   const {
     isLoading: startSyncLoading,
     error: startSyncError,
@@ -55,27 +55,27 @@ function InventorySourceSyncButton({ source, icon, i18n }) {
   return (
     <>
       {['running', 'pending', 'updating'].includes(source.status) ? (
-        <Tooltip content={i18n._(t`Cancel sync process`)} position="top">
+        <Tooltip content={t`Cancel sync process`} position="top">
           <Button
             ouiaId={`${source}-cancel-sync-button`}
             isDisabled={cancelSyncLoading || startSyncLoading}
-            aria-label={i18n._(t`Cancel sync source`)}
+            aria-label={t`Cancel sync source`}
             variant={icon ? 'plain' : 'secondary'}
             onClick={cancelSyncProcess}
           >
-            {icon ? <MinusCircleIcon /> : i18n._(t`Cancel sync`)}
+            {icon ? <MinusCircleIcon /> : t`Cancel sync`}
           </Button>
         </Tooltip>
       ) : (
-        <Tooltip content={i18n._(t`Start sync process`)} position="top">
+        <Tooltip content={t`Start sync process`} position="top">
           <Button
             ouiaId={`${source}-sync-button`}
             isDisabled={cancelSyncLoading || startSyncLoading}
-            aria-label={i18n._(t`Start sync source`)}
+            aria-label={t`Start sync source`}
             variant={icon ? 'plain' : 'secondary'}
             onClick={startSyncProcess}
           >
-            {icon ? <SyncIcon /> : i18n._(t`Sync`)}
+            {icon ? <SyncIcon /> : t`Sync`}
           </Button>
         </Tooltip>
       )}
@@ -83,10 +83,10 @@ function InventorySourceSyncButton({ source, icon, i18n }) {
         <AlertModal
           isOpen={startError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissStartError}
         >
-          {i18n._(t`Failed to sync inventory source.`)}
+          {t`Failed to sync inventory source.`}
           <ErrorDetail error={startError} />
         </AlertModal>
       )}
@@ -94,10 +94,10 @@ function InventorySourceSyncButton({ source, icon, i18n }) {
         <AlertModal
           isOpen={cancelError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissCancelError}
         >
-          {i18n._(t`Failed to cancel inventory source sync.`)}
+          {t`Failed to cancel inventory source sync.`}
           <ErrorDetail error={cancelError} />
         </AlertModal>
       )}
@@ -115,4 +115,4 @@ InventorySourceSyncButton.propTypes = {
   icon: PropTypes.bool,
 };
 
-export default withI18n()(InventorySourceSyncButton);
+export default InventorySourceSyncButton;
diff --git a/awx/ui_next/src/screens/Inventory/shared/SmartInventoryForm.jsx b/awx/ui_next/src/screens/Inventory/shared/SmartInventoryForm.jsx
index 71a54592a7..f4182086fe 100644
--- a/awx/ui_next/src/screens/Inventory/shared/SmartInventoryForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/SmartInventoryForm.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Formik, useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useLocation } from 'react-router-dom';
 import { func, shape, arrayOf } from 'prop-types';
@@ -26,18 +26,18 @@ import useRequest from '../../../util/useRequest';
 import { required } from '../../../util/validators';
 import { InventoriesAPI } from '../../../api';
 
-const SmartInventoryFormFields = withI18n()(({ i18n, inventory }) => {
+const SmartInventoryFormFields = ({ inventory }) => {
   const { setFieldValue } = useFormikContext();
   const [organizationField, organizationMeta, organizationHelpers] = useField({
     name: 'organization',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const [instanceGroupsField, , instanceGroupsHelpers] = useField({
     name: 'instance_groups',
   });
   const [hostFilterField, hostFilterMeta, hostFilterHelpers] = useField({
     name: 'host_filter',
-    validate: required(null, i18n),
+    validate: required(null),
   });
   const onOrganizationChange = useCallback(
     value => {
@@ -50,15 +50,15 @@ const SmartInventoryFormFields = withI18n()(({ i18n, inventory }) => {
     <>
       <FormField
         id="name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
@@ -87,25 +87,21 @@ const SmartInventoryFormFields = withI18n()(({ i18n, inventory }) => {
         onChange={value => {
           instanceGroupsHelpers.setValue(value);
         }}
-        tooltip={i18n._(
-          t`Select the Instance Groups for this Inventory to run on.`
-        )}
+        tooltip={t`Select the Instance Groups for this Inventory to run on.`}
       />
       <FormFullWidthLayout>
         <VariablesField
           id="variables"
           name="variables"
-          label={i18n._(t`Variables`)}
-          tooltip={i18n._(
-            t`Enter inventory variables using either JSON or YAML syntax.
+          label={t`Variables`}
+          tooltip={t`Enter inventory variables using either JSON or YAML syntax.
             Use the radio button to toggle between the two. Refer to the
-            documentation for example syntax.`
-          )}
+            Ansible Tower documentation for example syntax.`}
         />
       </FormFullWidthLayout>
     </>
   );
-});
+};
 
 function SmartInventoryForm({
   inventory,
@@ -195,4 +191,4 @@ SmartInventoryForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(SmartInventoryForm);
+export default SmartInventoryForm;
diff --git a/awx/ui_next/src/screens/Job/Job.jsx b/awx/ui_next/src/screens/Job/Job.jsx
index a46315c397..056f71a72f 100644
--- a/awx/ui_next/src/screens/Job/Job.jsx
+++ b/awx/ui_next/src/screens/Job/Job.jsx
@@ -8,7 +8,7 @@ import {
   useParams,
   useRouteMatch,
 } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
@@ -32,7 +32,7 @@ export const JOB_URL_SEGMENT_MAP = {
   workflow: 'workflow_job',
 };
 
-function Job({ i18n, setBreadcrumb }) {
+function Job({ setBreadcrumb }) {
   const { id, typeSegment } = useParams();
   const match = useRouteMatch();
 
@@ -94,14 +94,14 @@ function Job({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Jobs`)}
+          {t`Back to Jobs`}
         </>
       ),
       link: `/jobs`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `${match.url}/details`, id: 0 },
-    { name: i18n._(t`Output`), link: `${match.url}/output`, id: 1 },
+    { name: t`Details`, link: `${match.url}/details`, id: 0 },
+    { name: t`Output`, link: `${match.url}/output`, id: 1 },
   ];
 
   if (isLoading) {
@@ -121,8 +121,8 @@ function Job({ i18n, setBreadcrumb }) {
           <ContentError error={error}>
             {error.response.status === 404 && (
               <span>
-                {i18n._(t`The page you requested could not be found.`)}{' '}
-                <Link to="/jobs">{i18n._(t`View all Jobs.`)}</Link>
+                {t`The page you requested could not be found.`}{' '}
+                <Link to="/jobs">{t`View all Jobs.`}</Link>
               </span>
             )}
           </ContentError>
@@ -162,7 +162,7 @@ function Job({ i18n, setBreadcrumb }) {
             <Route key="not-found" path="*">
               <ContentError isNotFound>
                 <Link to={`/jobs/${typeSegment}/${id}/details`}>
-                  {i18n._(t`View Job Details`)}
+                  {t`View Job Details`}
                 </Link>
               </ContentError>
             </Route>,
@@ -173,5 +173,5 @@ function Job({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(withRouter(Job));
+export default withRouter(Job);
 export { Job as _Job };
diff --git a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
index aa471f407b..768aa135d4 100644
--- a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
+++ b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { useCallback, useState } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Chip } from '@patternfly/react-core';
 import styled from 'styled-components';
@@ -52,7 +52,7 @@ const VERBOSITY = {
   4: '4 (Connection Debug)',
 };
 
-function JobDetail({ job, i18n }) {
+function JobDetail({ job }) {
   const {
     created_by,
     credential,
@@ -90,15 +90,12 @@ function JobDetail({ job, i18n }) {
   } = useDismissableError(cancelError);
 
   const jobTypes = {
-    project_update: i18n._(t`Source Control Update`),
-    inventory_update: i18n._(t`Inventory Sync`),
-    job:
-      job.job_type === 'check'
-        ? i18n._(t`Playbook Check`)
-        : i18n._(t`Playbook Run`),
-    ad_hoc_command: i18n._(t`Command`),
-    management_job: i18n._(t`Management Job`),
-    workflow_job: i18n._(t`Workflow Job`),
+    project_update: t`Source Control Update`,
+    inventory_update: t`Inventory Sync`,
+    job: job.job_type === 'check' ? t`Playbook Check` : t`Playbook Run`,
+    ad_hoc_command: t`Command`,
+    management_job: t`Management Job`,
+    workflow_job: t`Workflow Job`,
   };
 
   const deleteJob = async () => {
@@ -127,7 +124,7 @@ function JobDetail({ job, i18n }) {
       <DetailList>
         <Detail
           fullWidth={Boolean(job.job_explanation)}
-          label={i18n._(t`Status`)}
+          label={t`Status`}
           value={
             <StatusDetailValue>
               {job.status && <StatusIcon status={job.status} />}
@@ -137,17 +134,11 @@ function JobDetail({ job, i18n }) {
             </StatusDetailValue>
           }
         />
-        <Detail
-          label={i18n._(t`Started`)}
-          value={formatDateString(job.started)}
-        />
-        <Detail
-          label={i18n._(t`Finished`)}
-          value={formatDateString(job.finished)}
-        />
+        <Detail label={t`Started`} value={formatDateString(job.started)} />
+        <Detail label={t`Finished`} value={formatDateString(job.finished)} />
         {jobTemplate && (
           <Detail
-            label={i18n._(t`Job Template`)}
+            label={t`Job Template`}
             value={
               <Link to={`/templates/job_template/${jobTemplate.id}`}>
                 {jobTemplate.name}
@@ -157,7 +148,7 @@ function JobDetail({ job, i18n }) {
         )}
         {workflowJobTemplate && (
           <Detail
-            label={i18n._(t`Workflow Job Template`)}
+            label={t`Workflow Job Template`}
             value={
               <Link
                 to={`/templates/workflow_job_template/${workflowJobTemplate.id}`}
@@ -169,7 +160,7 @@ function JobDetail({ job, i18n }) {
         )}
         {source_workflow_job && (
           <Detail
-            label={i18n._(t`Source Workflow Job`)}
+            label={t`Source Workflow Job`}
             value={
               <Link to={`/jobs/workflow/${source_workflow_job.id}`}>
                 {source_workflow_job.id} - {source_workflow_job.name}
@@ -177,11 +168,11 @@ function JobDetail({ job, i18n }) {
             }
           />
         )}
-        <Detail label={i18n._(t`Job Type`)} value={jobTypes[job.type]} />
-        <LaunchedByDetail job={job} i18n={i18n} />
+        <Detail label={t`Job Type`} value={jobTypes[job.type]} />
+        <LaunchedByDetail job={job} />
         {inventory && (
           <Detail
-            label={i18n._(t`Inventory`)}
+            label={t`Inventory`}
             value={
               <Link
                 to={
@@ -197,7 +188,7 @@ function JobDetail({ job, i18n }) {
         )}
         {inventory_source && (
           <Detail
-            label={i18n._(t`Inventory Source`)}
+            label={t`Inventory Source`}
             value={
               <Link
                 to={`/inventories/inventory/${inventory.id}/sources/${inventory_source.id}`}
@@ -209,7 +200,7 @@ function JobDetail({ job, i18n }) {
         )}
         {inventory_source && inventory_source.source === 'scm' && (
           <Detail
-            label={i18n._(t`Project`)}
+            label={t`Project`}
             value={
               <StatusDetailValue>
                 {source_project.status && (
@@ -224,7 +215,7 @@ function JobDetail({ job, i18n }) {
         )}
         {project && (
           <Detail
-            label={i18n._(t`Project`)}
+            label={t`Project`}
             value={
               <StatusDetailValue>
                 {project.status && <StatusIcon status={project.status} />}
@@ -233,37 +224,37 @@ function JobDetail({ job, i18n }) {
             }
           />
         )}
-        <Detail label={i18n._(t`Revision`)} value={job.scm_revision} />
-        <Detail label={i18n._(t`Playbook`)} value={job.playbook} />
-        <Detail label={i18n._(t`Limit`)} value={job.limit} />
-        <Detail label={i18n._(t`Verbosity`)} value={VERBOSITY[job.verbosity]} />
+        <Detail label={t`Revision`} value={job.scm_revision} />
+        <Detail label={t`Playbook`} value={job.playbook} />
+        <Detail label={t`Limit`} value={job.limit} />
+        <Detail label={t`Verbosity`} value={VERBOSITY[job.verbosity]} />
         <ExecutionEnvironmentDetail
           virtualEnvironment={job.custom_virtualenv}
           executionEnvironment={executionEnvironment}
         />
-        <Detail label={i18n._(t`Execution Node`)} value={job.execution_node} />
+        <Detail label={t`Execution Node`} value={job.execution_node} />
         {instanceGroup && !instanceGroup?.is_container_group && (
           <Detail
-            label={i18n._(t`Instance Group`)}
+            label={t`Instance Group`}
             value={buildInstanceGroupLink(instanceGroup)}
           />
         )}
         {instanceGroup && instanceGroup?.is_container_group && (
           <Detail
-            label={i18n._(t`Container Group`)}
+            label={t`Container Group`}
             value={buildContainerGroupLink(instanceGroup)}
           />
         )}
         {typeof job.job_slice_number === 'number' &&
           typeof job.job_slice_count === 'number' && (
             <Detail
-              label={i18n._(t`Job Slice`)}
+              label={t`Job Slice`}
               value={`${job.job_slice_number}/${job.job_slice_count}`}
             />
           )}
         {credential && (
           <Detail
-            label={i18n._(t`Machine Credential`)}
+            label={t`Machine Credential`}
             value={
               <ChipGroup numChips={5} totalChips={1}>
                 <CredentialChip
@@ -278,7 +269,7 @@ function JobDetail({ job, i18n }) {
         {credentials && credentials.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Credentials`)}
+            label={t`Credentials`}
             value={
               <ChipGroup numChips={5} totalChips={credentials.length}>
                 {credentials.map(c => (
@@ -291,7 +282,7 @@ function JobDetail({ job, i18n }) {
         {labels && labels.count > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Labels`)}
+            label={t`Labels`}
             value={
               <ChipGroup numChips={5} totalChips={labels.results.length}>
                 {labels.results.map(l => (
@@ -306,7 +297,7 @@ function JobDetail({ job, i18n }) {
         {job.job_tags && job.job_tags.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Job Tags`)}
+            label={t`Job Tags`}
             value={
               <ChipGroup
                 numChips={5}
@@ -324,7 +315,7 @@ function JobDetail({ job, i18n }) {
         {job.skip_tags && job.skip_tags.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Skip Tags`)}
+            label={t`Skip Tags`}
             value={
               <ChipGroup
                 numChips={5}
@@ -340,11 +331,11 @@ function JobDetail({ job, i18n }) {
           />
         )}
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={job.created}
           user={created_by}
         />
-        <UserDateDetail label={i18n._(t`Last Modified`)} date={job.modified} />
+        <UserDateDetail label={t`Last Modified`} date={job.modified} />
       </DetailList>
       {job.extra_vars && (
         <VariablesInput
@@ -353,7 +344,7 @@ function JobDetail({ job, i18n }) {
           readOnly
           value={job.extra_vars}
           rows={4}
-          label={i18n._(t`Variables`)}
+          label={t`Variables`}
         />
       )}
       {job.artifacts && (
@@ -363,7 +354,7 @@ function JobDetail({ job, i18n }) {
           readOnly
           value={JSON.stringify(job.artifacts)}
           rows={4}
-          label={i18n._(t`Artifacts`)}
+          label={t`Artifacts`}
         />
       )}
       <CardActionsRow>
@@ -381,7 +372,7 @@ function JobDetail({ job, i18n }) {
               )}
             </LaunchButton>
           ) : (
-            <LaunchButton resource={job} aria-label={i18n._(t`Relaunch`)}>
+            <LaunchButton resource={job} aria-label={t`Relaunch`}>
               {({ handleRelaunch, isLaunching }) => (
                 <Button
                   ouiaId="job-detail-relaunch-button"
@@ -389,7 +380,7 @@ function JobDetail({ job, i18n }) {
                   onClick={handleRelaunch}
                   isDisabled={isLaunching}
                 >
-                  {i18n._(t`Relaunch`)}
+                  {t`Relaunch`}
                 </Button>
               )}
             </LaunchButton>
@@ -398,23 +389,23 @@ function JobDetail({ job, i18n }) {
           job?.summary_fields?.user_capabilities?.start && (
             <Button
               variant="secondary"
-              aria-label={i18n._(t`Cancel`)}
+              aria-label={t`Cancel`}
               isDisabled={isCancelling}
               onClick={() => setShowCancelModal(true)}
               ouiaId="job-detail-cancel-button"
             >
-              {i18n._(t`Cancel`)}
+              {t`Cancel`}
             </Button>
           )}
         {!isJobRunning(job.status) &&
           job?.summary_fields?.user_capabilities?.delete && (
             <DeleteButton
               name={job.name}
-              modalTitle={i18n._(t`Delete Job`)}
+              modalTitle={t`Delete Job`}
               onConfirm={deleteJob}
               ouiaId="job-detail-delete-button"
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -423,33 +414,31 @@ function JobDetail({ job, i18n }) {
           isOpen={showCancelModal}
           variant="danger"
           onClose={() => setShowCancelModal(false)}
-          title={i18n._(t`Cancel Job`)}
-          label={i18n._(t`Cancel Job`)}
+          title={t`Cancel Job`}
+          label={t`Cancel Job`}
           actions={[
             <Button
               id="cancel-job-confirm-button"
               key="delete"
               variant="danger"
               isDisabled={isCancelling}
-              aria-label={i18n._(t`Cancel job`)}
+              aria-label={t`Cancel job`}
               onClick={cancelJob}
             >
-              {i18n._(t`Cancel job`)}
+              {t`Cancel job`}
             </Button>,
             <Button
               id="cancel-job-return-button"
               key="cancel"
               variant="secondary"
-              aria-label={i18n._(t`Return`)}
+              aria-label={t`Return`}
               onClick={() => setShowCancelModal(false)}
             >
-              {i18n._(t`Return`)}
+              {t`Return`}
             </Button>,
           ]}
         >
-          {i18n._(
-            t`Are you sure you want to submit the request to cancel this job?`
-          )}
+          {t`Are you sure you want to submit the request to cancel this job?`}
         </AlertModal>
       )}
       {dismissableCancelError && (
@@ -457,8 +446,8 @@ function JobDetail({ job, i18n }) {
           isOpen={dismissableCancelError}
           variant="danger"
           onClose={dismissCancelError}
-          title={i18n._(t`Job Cancel Error`)}
-          label={i18n._(t`Job Cancel Error`)}
+          title={t`Job Cancel Error`}
+          label={t`Job Cancel Error`}
         >
           <ErrorDetail error={dismissableCancelError} />
         </AlertModal>
@@ -468,7 +457,7 @@ function JobDetail({ job, i18n }) {
           isOpen={errorMsg}
           variant="error"
           onClose={() => setErrorMsg()}
-          title={i18n._(t`Job Delete Error`)}
+          title={t`Job Delete Error`}
         >
           <ErrorDetail error={errorMsg} />
         </AlertModal>
@@ -480,4 +469,4 @@ JobDetail.propTypes = {
   job: Job.isRequired,
 };
 
-export default withI18n()(JobDetail);
+export default JobDetail;
diff --git a/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx b/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx
index 20f363a849..5994e63827 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Modal, Tab, Tabs, TabTitleText } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import { AllHtmlEntities } from 'html-entities';
@@ -78,7 +78,7 @@ const processStdOutValue = hostEvent => {
   return stdOut;
 };
 
-function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
+function HostEventModal({ onClose, hostEvent = {}, isOpen = false }) {
   const [hostStatus, setHostStatus] = useState(null);
   const [activeTabKey, setActiveTabKey] = useState(0);
 
@@ -98,26 +98,26 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
     <Modal
       isOpen={isOpen}
       onClose={onClose}
-      title={i18n._(t`Host Details`)}
-      aria-label={i18n._(t`Host details modal`)}
+      title={t`Host Details`}
+      aria-label={t`Host details modal`}
       width="75%"
     >
       <Tabs
-        aria-label={i18n._(t`Tabs`)}
+        aria-label={t`Tabs`}
         activeKey={activeTabKey}
         onSelect={handleTabClick}
       >
         <Tab
-          aria-label={i18n._(t`Details tab`)}
+          aria-label={t`Details tab`}
           eventKey={0}
-          title={<TabTitleText>{i18n._(t`Details`)}</TabTitleText>}
+          title={<TabTitleText>{t`Details`}</TabTitleText>}
         >
           <DetailList
             style={{ alignItems: 'center', marginTop: '20px' }}
             gutter="sm"
           >
             <Detail
-              label={i18n._(t`Host Name`)}
+              label={t`Host Name`}
               value={
                 <HostNameDetailValue>
                   {hostStatus ? <StatusIcon status={hostStatus} /> : null}
@@ -125,24 +125,22 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
                 </HostNameDetailValue>
               }
             />
-            <Detail label={i18n._(t`Play`)} value={hostEvent.play} />
-            <Detail label={i18n._(t`Task`)} value={hostEvent.task} />
+            <Detail label={t`Play`} value={hostEvent.play} />
+            <Detail label={t`Task`} value={hostEvent.task} />
             <Detail
-              label={i18n._(t`Module`)}
-              value={
-                hostEvent.event_data.task_action || i18n._(t`No result found`)
-              }
+              label={t`Module`}
+              value={hostEvent.event_data.task_action || t`No result found`}
             />
             <Detail
-              label={i18n._(t`Command`)}
+              label={t`Command`}
               value={hostEvent?.event_data?.res?.cmd}
             />
           </DetailList>
         </Tab>
         <Tab
           eventKey={1}
-          title={<TabTitleText>{i18n._(t`JSON`)}</TabTitleText>}
-          aria-label={i18n._(t`JSON tab`)}
+          title={<TabTitleText>{t`JSON`}</TabTitleText>}
+          aria-label={t`JSON tab`}
         >
           {activeTabKey === 1 && jsonObj ? (
             <CodeEditor
@@ -154,13 +152,13 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
               hasErrors={false}
             />
           ) : (
-            <ContentEmpty title={i18n._(t`No JSON Available`)} />
+            <ContentEmpty title={t`No JSON Available`} />
           )}
         </Tab>
         <Tab
           eventKey={2}
-          title={<TabTitleText>{i18n._(t`Standard Out`)}</TabTitleText>}
-          aria-label={i18n._(t`Standard out tab`)}
+          title={<TabTitleText>{t`Standard Out`}</TabTitleText>}
+          aria-label={t`Standard out tab`}
         >
           {activeTabKey === 2 && stdOut ? (
             <CodeEditor
@@ -172,13 +170,13 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
               hasErrors={false}
             />
           ) : (
-            <ContentEmpty title={i18n._(t`No Standard Out Available`)} />
+            <ContentEmpty title={t`No Standard Out Available`} />
           )}
         </Tab>
         <Tab
           eventKey={3}
-          title={<TabTitleText>{i18n._(t`Standard Error`)}</TabTitleText>}
-          aria-label={i18n._(t`Standard error tab`)}
+          title={<TabTitleText>{t`Standard Error`}</TabTitleText>}
+          aria-label={t`Standard error tab`}
         >
           {activeTabKey === 3 && stdErr ? (
             <CodeEditor
@@ -190,7 +188,7 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
               rows={20}
             />
           ) : (
-            <ContentEmpty title={i18n._(t`No Standard Error Available`)} />
+            <ContentEmpty title={t`No Standard Error Available`} />
           )}
         </Tab>
       </Tabs>
@@ -198,7 +196,7 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) {
   );
 }
 
-export default withI18n()(HostEventModal);
+export default HostEventModal;
 
 HostEventModal.propTypes = {
   onClose: PropTypes.func.isRequired,
diff --git a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
index 9a58be1055..19f1b0f751 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useHistory, useLocation, withRouter } from 'react-router-dom';
-import { i18n } from '@lingui/core';
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import {
@@ -626,48 +625,48 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
       qsConfig={QS_CONFIG}
       columns={[
         {
-          name: i18n._(t`Stdout`),
+          name: t`Stdout`,
           key: 'stdout__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Event`),
+          name: t`Event`,
           key: 'event',
           options: [
-            ['runner_on_failed', i18n._(t`Host Failed`)],
-            ['runner_on_start', i18n._(t`Host Started`)],
-            ['runner_on_ok', i18n._(t`Host OK`)],
-            ['runner_on_error', i18n._(t`Host Failure`)],
-            ['runner_on_skipped', i18n._(t`Host Skipped`)],
-            ['runner_on_unreachable', i18n._(t`Host Unreachable`)],
-            ['runner_on_no_hosts', i18n._(t`No Hosts Remaining`)],
-            ['runner_on_async_poll', i18n._(t`Host Polling`)],
-            ['runner_on_async_ok', i18n._(t`Host Async OK`)],
-            ['runner_on_async_failed', i18n._(t`Host Async Failure`)],
-            ['runner_item_on_ok', i18n._(t`Item OK`)],
-            ['runner_item_on_failed', i18n._(t`Item Failed`)],
-            ['runner_item_on_skipped', i18n._(t`Item Skipped`)],
-            ['runner_retry', i18n._(t`Host Retry`)],
-            ['runner_on_file_diff', i18n._(t`File Difference`)],
-            ['playbook_on_start', i18n._(t`Playbook Started`)],
-            ['playbook_on_notify', i18n._(t`Running Handlers`)],
-            ['playbook_on_include', i18n._(t`Including File`)],
-            ['playbook_on_no_hosts_matched', i18n._(t`No Hosts Matched`)],
-            ['playbook_on_no_hosts_remaining', i18n._(t`No Hosts Remaining`)],
-            ['playbook_on_task_start', i18n._(t`Task Started`)],
-            ['playbook_on_vars_prompt', i18n._(t`Variables Prompted`)],
-            ['playbook_on_setup', i18n._(t`Gathering Facts`)],
-            ['playbook_on_play_start', i18n._(t`Play Started`)],
-            ['playbook_on_stats', i18n._(t`Playbook Complete`)],
-            ['debug', i18n._(t`Debug`)],
-            ['verbose', i18n._(t`Verbose`)],
-            ['deprecated', i18n._(t`Deprecated`)],
-            ['warning', i18n._(t`Warning`)],
-            ['system_warning', i18n._(t`System Warning`)],
-            ['error', i18n._(t`Error`)],
+            ['runner_on_failed', t`Host Failed`],
+            ['runner_on_start', t`Host Started`],
+            ['runner_on_ok', t`Host OK`],
+            ['runner_on_error', t`Host Failure`],
+            ['runner_on_skipped', t`Host Skipped`],
+            ['runner_on_unreachable', t`Host Unreachable`],
+            ['runner_on_no_hosts', t`No Hosts Remaining`],
+            ['runner_on_async_poll', t`Host Polling`],
+            ['runner_on_async_ok', t`Host Async OK`],
+            ['runner_on_async_failed', t`Host Async Failure`],
+            ['runner_item_on_ok', t`Item OK`],
+            ['runner_item_on_failed', t`Item Failed`],
+            ['runner_item_on_skipped', t`Item Skipped`],
+            ['runner_retry', t`Host Retry`],
+            ['runner_on_file_diff', t`File Difference`],
+            ['playbook_on_start', t`Playbook Started`],
+            ['playbook_on_notify', t`Running Handlers`],
+            ['playbook_on_include', t`Including File`],
+            ['playbook_on_no_hosts_matched', t`No Hosts Matched`],
+            ['playbook_on_no_hosts_remaining', t`No Hosts Remaining`],
+            ['playbook_on_task_start', t`Task Started`],
+            ['playbook_on_vars_prompt', t`Variables Prompted`],
+            ['playbook_on_setup', t`Gathering Facts`],
+            ['playbook_on_play_start', t`Play Started`],
+            ['playbook_on_stats', t`Playbook Complete`],
+            ['debug', t`Debug`],
+            ['verbose', t`Verbose`],
+            ['deprecated', t`Deprecated`],
+            ['warning', t`Warning`],
+            ['system_warning', t`System Warning`],
+            ['error', t`Error`],
           ],
         },
-        { name: i18n._(t`Advanced`), key: 'advanced' },
+        { name: t`Advanced`, key: 'advanced' },
       ]}
       searchableKeys={eventSearchableKeys}
       relatedSearchableKeys={eventRelatedSearchableKeys}
@@ -711,21 +710,19 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
           id="job_output-toolbar"
           clearAllFilters={handleRemoveAllSearchTerms}
           collapseListedFiltersBreakpoint="lg"
-          clearFiltersButtonText={i18n._(t`Clear all filters`)}
+          clearFiltersButtonText={t`Clear all filters`}
         >
           <SearchToolbarContent>
             <ToolbarToggleGroup toggleIcon={<SearchIcon />} breakpoint="lg">
               <ToolbarItem variant="search-filter">
                 {isJobRunning(job.status) ? (
                   <Tooltip
-                    content={i18n._(
-                      t`Search is disabled while the job is running`
-                    )}
+                    content={t`Search is disabled while the job is running`}
                   >
-                    {renderSearchComponent(i18n)}
+                    {renderSearchComponent()}
                   </Tooltip>
                 ) : (
-                  renderSearchComponent(i18n)
+                  renderSearchComponent()
                 )}
               </ToolbarItem>
             </ToolbarToggleGroup>
@@ -783,33 +780,31 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
           isOpen={showCancelModal}
           variant="danger"
           onClose={() => setShowCancelModal(false)}
-          title={i18n._(t`Cancel Job`)}
-          label={i18n._(t`Cancel Job`)}
+          title={t`Cancel Job`}
+          label={t`Cancel Job`}
           actions={[
             <Button
               id="cancel-job-confirm-button"
               key="delete"
               variant="danger"
               isDisabled={isCancelling}
-              aria-label={i18n._(t`Cancel job`)}
+              aria-label={t`Cancel job`}
               onClick={cancelJob}
             >
-              {i18n._(t`Cancel job`)}
+              {t`Cancel job`}
             </Button>,
             <Button
               id="cancel-job-return-button"
               key="cancel"
               variant="secondary"
-              aria-label={i18n._(t`Return`)}
+              aria-label={t`Return`}
               onClick={() => setShowCancelModal(false)}
             >
-              {i18n._(t`Return`)}
+              {t`Return`}
             </Button>,
           ]}
         >
-          {i18n._(
-            t`Are you sure you want to submit the request to cancel this job?`
-          )}
+          {t`Are you sure you want to submit the request to cancel this job?`}
         </AlertModal>
       )}
       {dismissableDeleteError && (
@@ -817,8 +812,8 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
           isOpen={dismissableDeleteError}
           variant="danger"
           onClose={dismissDeleteError}
-          title={i18n._(t`Job Delete Error`)}
-          label={i18n._(t`Job Delete Error`)}
+          title={t`Job Delete Error`}
+          label={t`Job Delete Error`}
         >
           <ErrorDetail error={dismissableDeleteError} />
         </AlertModal>
@@ -828,8 +823,8 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
           isOpen={dismissableCancelError}
           variant="danger"
           onClose={dismissCancelError}
-          title={i18n._(t`Job Cancel Error`)}
-          label={i18n._(t`Job Cancel Error`)}
+          title={t`Job Cancel Error`}
+          label={t`Job Cancel Error`}
         >
           <ErrorDetail error={dismissableCancelError} />
         </AlertModal>
diff --git a/awx/ui_next/src/screens/Job/JobOutput/PageControls.jsx b/awx/ui_next/src/screens/Job/JobOutput/PageControls.jsx
index a7d8e6fd86..9749e83748 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/PageControls.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/PageControls.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button as PFButton } from '@patternfly/react-core';
 import {
@@ -25,7 +25,6 @@ const Button = styled(PFButton)`
 `;
 
 const PageControls = ({
-  i18n,
   onScrollFirst,
   onScrollLast,
   onScrollNext,
@@ -34,7 +33,7 @@ const PageControls = ({
   <Wrapper>
     <Button
       ouiaId="job-output-expand-collapse-lines-button"
-      aria-label={i18n._(t`Toggle expand/collapse event lines`)}
+      aria-label={t`Toggle expand/collapse event lines`}
       variant="plain"
       css="margin-right: auto"
     >
@@ -42,7 +41,7 @@ const PageControls = ({
     </Button>
     <Button
       ouiaId="job-output-scroll-previous-button"
-      aria-label={i18n._(t`Scroll previous`)}
+      aria-label={t`Scroll previous`}
       onClick={onScrollPrevious}
       variant="plain"
     >
@@ -50,7 +49,7 @@ const PageControls = ({
     </Button>
     <Button
       ouiaId="job-output-scroll-next-button"
-      aria-label={i18n._(t`Scroll next`)}
+      aria-label={t`Scroll next`}
       onClick={onScrollNext}
       variant="plain"
     >
@@ -58,7 +57,7 @@ const PageControls = ({
     </Button>
     <Button
       ouiaId="job-output-scroll-first-button"
-      aria-label={i18n._(t`Scroll first`)}
+      aria-label={t`Scroll first`}
       onClick={onScrollFirst}
       variant="plain"
     >
@@ -66,7 +65,7 @@ const PageControls = ({
     </Button>
     <Button
       ouiaId="job-output-scroll-last-button"
-      aria-label={i18n._(t`Scroll last`)}
+      aria-label={t`Scroll last`}
       onClick={onScrollLast}
       variant="plain"
     >
@@ -75,4 +74,4 @@ const PageControls = ({
   </Wrapper>
 );
 
-export default withI18n()(PageControls);
+export default PageControls;
diff --git a/awx/ui_next/src/screens/Job/JobOutput/shared/HostStatusBar.jsx b/awx/ui_next/src/screens/Job/JobOutput/shared/HostStatusBar.jsx
index 7f08bd30a0..43fa0d83bf 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/shared/HostStatusBar.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/shared/HostStatusBar.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Badge, Tooltip } from '@patternfly/react-core';
 
@@ -27,28 +27,28 @@ const TooltipContent = styled.div`
   }
 `;
 
-const HostStatusBar = ({ i18n, counts = {} }) => {
+const HostStatusBar = ({ counts = {} }) => {
   const noData = Object.keys(counts).length === 0;
   const hostStatus = {
     ok: {
       color: '#4CB140',
-      label: i18n._(t`OK`),
+      label: t`OK`,
     },
     skipped: {
       color: '#73BCF7',
-      label: i18n._(t`Skipped`),
+      label: t`Skipped`,
     },
     changed: {
       color: '#F0AB00',
-      label: i18n._(t`Changed`),
+      label: t`Changed`,
     },
     failures: {
       color: '#C9190B',
-      label: i18n._(t`Failed`),
+      label: t`Failed`,
     },
     dark: {
       color: '#8F4700',
-      label: i18n._(t`Unreachable`),
+      label: t`Unreachable`,
     },
   };
 
@@ -73,9 +73,7 @@ const HostStatusBar = ({ i18n, counts = {} }) => {
     return (
       <BarWrapper>
         <Tooltip
-          content={i18n._(
-            t`Host status information for this job is unavailable.`
-          )}
+          content={t`Host status information for this job is unavailable.`}
         >
           <BarSegment count={1} />
         </Tooltip>
@@ -86,4 +84,4 @@ const HostStatusBar = ({ i18n, counts = {} }) => {
   return <BarWrapper>{barSegments}</BarWrapper>;
 };
 
-export default withI18n()(HostStatusBar);
+export default HostStatusBar;
diff --git a/awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx b/awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx
index 73d667d1a6..c46d5547a2 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx
+++ b/awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { bool, shape, func } from 'prop-types';
 import {
@@ -63,7 +63,6 @@ const OUTPUT_NO_COUNT_JOB_TYPES = [
 ];
 
 const OutputToolbar = ({
-  i18n,
   job,
   onDelete,
   onCancel,
@@ -86,27 +85,27 @@ const OutputToolbar = ({
       {!hideCounts && (
         <>
           {playCount > 0 && (
-            <BadgeGroup aria-label={i18n._(t`Play Count`)}>
-              <div>{i18n._(t`Plays`)}</div>
+            <BadgeGroup aria-label={t`Play Count`}>
+              <div>{t`Plays`}</div>
               <Badge isRead>{playCount}</Badge>
             </BadgeGroup>
           )}
           {taskCount > 0 && (
-            <BadgeGroup aria-label={i18n._(t`Task Count`)}>
-              <div>{i18n._(t`Tasks`)}</div>
+            <BadgeGroup aria-label={t`Task Count`}>
+              <div>{t`Tasks`}</div>
               <Badge isRead>{taskCount}</Badge>
             </BadgeGroup>
           )}
           {totalHostCount > 0 && (
-            <BadgeGroup aria-label={i18n._(t`Host Count`)}>
-              <div>{i18n._(t`Hosts`)}</div>
+            <BadgeGroup aria-label={t`Host Count`}>
+              <div>{t`Hosts`}</div>
               <Badge isRead>{totalHostCount}</Badge>
             </BadgeGroup>
           )}
           {darkCount > 0 && (
-            <BadgeGroup aria-label={i18n._(t`Unreachable Host Count`)}>
-              <div>{i18n._(t`Unreachable`)}</div>
-              <Tooltip content={i18n._(t`Unreachable Hosts`)}>
+            <BadgeGroup aria-label={t`Unreachable Host Count`}>
+              <div>{t`Unreachable`}</div>
+              <Tooltip content={t`Unreachable Hosts`}>
                 <Badge color="#470000" isRead>
                   {darkCount}
                 </Badge>
@@ -114,9 +113,9 @@ const OutputToolbar = ({
             </BadgeGroup>
           )}
           {failureCount > 0 && (
-            <BadgeGroup aria-label={i18n._(t`Failed Host Count`)}>
-              <div>{i18n._(t`Failed`)}</div>
-              <Tooltip content={i18n._(t`Failed Hosts`)}>
+            <BadgeGroup aria-label={t`Failed Host Count`}>
+              <div>{t`Failed`}</div>
+              <Tooltip content={t`Failed Hosts`}>
                 <Badge color="#C9190B" isRead>
                   {failureCount}
                 </Badge>
@@ -126,9 +125,9 @@ const OutputToolbar = ({
         </>
       )}
 
-      <BadgeGroup aria-label={i18n._(t`Elapsed Time`)}>
-        <div>{i18n._(t`Elapsed`)}</div>
-        <Tooltip content={i18n._(t`Elapsed time that the job ran`)}>
+      <BadgeGroup aria-label={t`Elapsed Time`}>
+        <div>{t`Elapsed`}</div>
+        <Tooltip content={t`Elapsed time that the job ran`}>
           <Badge isRead>{toHHMMSS(job.elapsed)}</Badge>
         </Tooltip>
       </BadgeGroup>
@@ -138,8 +137,8 @@ const OutputToolbar = ({
           <Tooltip
             content={
               job.status === 'failed' && job.type === 'job'
-                ? i18n._(t`Relaunch using host parameters`)
-                : i18n._(t`Relaunch Job`)
+                ? t`Relaunch using host parameters`
+                : t`Relaunch Job`
             }
           >
             {job.status === 'failed' && job.type === 'job' ? (
@@ -159,7 +158,7 @@ const OutputToolbar = ({
                     ouiaId="job-output-relaunch-button"
                     variant="plain"
                     onClick={handleRelaunch}
-                    aria-label={i18n._(t`Relaunch`)}
+                    aria-label={t`Relaunch`}
                     isDisabled={isLaunching}
                   >
                     <RocketIcon />
@@ -171,12 +170,12 @@ const OutputToolbar = ({
         )}
 
       {job.related?.stdout && (
-        <Tooltip content={i18n._(t`Download Output`)}>
+        <Tooltip content={t`Download Output`}>
           <a href={`${job.related.stdout}?format=txt_download`}>
             <Button
               ouiaId="job-output-download-button"
               variant="plain"
-              aria-label={i18n._(t`Download Output`)}
+              aria-label={t`Download Output`}
             >
               <DownloadIcon />
             </Button>
@@ -185,11 +184,11 @@ const OutputToolbar = ({
       )}
       {job.summary_fields.user_capabilities.start &&
         ['pending', 'waiting', 'running'].includes(jobStatus) && (
-          <Tooltip content={i18n._(t`Cancel Job`)}>
+          <Tooltip content={t`Cancel Job`}>
             <Button
               ouiaId="job-output-cancel-button"
               variant="plain"
-              aria-label={i18n._(t`Cancel Job`)}
+              aria-label={t`Cancel Job`}
               onClick={onCancel}
             >
               <MinusCircleIcon />
@@ -200,11 +199,11 @@ const OutputToolbar = ({
         ['new', 'successful', 'failed', 'error', 'canceled'].includes(
           jobStatus
         ) && (
-          <Tooltip content={i18n._(t`Delete Job`)}>
+          <Tooltip content={t`Delete Job`}>
             <DeleteButton
               ouiaId="job-output-delete-button"
               name={job.name}
-              modalTitle={i18n._(t`Delete Job`)}
+              modalTitle={t`Delete Job`}
               onConfirm={onDelete}
               variant="plain"
               isDisabled={isDeleteDisabled}
@@ -227,4 +226,4 @@ OutputToolbar.defaultProps = {
   isDeleteDisabled: false,
 };
 
-export default withI18n()(OutputToolbar);
+export default OutputToolbar;
diff --git a/awx/ui_next/src/screens/Job/JobTypeRedirect.jsx b/awx/ui_next/src/screens/Job/JobTypeRedirect.jsx
index 22b70c7f17..c2e4b670ff 100644
--- a/awx/ui_next/src/screens/Job/JobTypeRedirect.jsx
+++ b/awx/ui_next/src/screens/Job/JobTypeRedirect.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { Redirect, Link } from 'react-router-dom';
 import { PageSection, Card } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import useRequest from '../../util/useRequest';
 import { UnifiedJobsAPI } from '../../api';
@@ -11,7 +11,7 @@ import { JOB_TYPE_URL_SEGMENTS } from '../../constants';
 
 const NOT_FOUND = 'not found';
 
-function JobTypeRedirect({ id, path, view, i18n }) {
+function JobTypeRedirect({ id, path, view }) {
   const {
     isLoading,
     error,
@@ -37,7 +37,7 @@ function JobTypeRedirect({ id, path, view, i18n }) {
         <Card>
           {error === NOT_FOUND ? (
             <ContentError isNotFound>
-              <Link to="/jobs">{i18n._(t`View all Jobs`)}</Link>
+              <Link to="/jobs">{t`View all Jobs`}</Link>
             </ContentError>
           ) : (
             <ContentError error={error} />
@@ -62,4 +62,4 @@ function JobTypeRedirect({ id, path, view, i18n }) {
 JobTypeRedirect.defaultProps = {
   view: 'output',
 };
-export default withI18n()(JobTypeRedirect);
+export default JobTypeRedirect;
diff --git a/awx/ui_next/src/screens/Job/Jobs.jsx b/awx/ui_next/src/screens/Job/Jobs.jsx
index f75d560d70..f937b53ecc 100644
--- a/awx/ui_next/src/screens/Job/Jobs.jsx
+++ b/awx/ui_next/src/screens/Job/Jobs.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { Route, Switch, useParams, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection } from '@patternfly/react-core';
 import ScreenHeader from '../../components/ScreenHeader/ScreenHeader';
@@ -9,28 +9,25 @@ import JobTypeRedirect from './JobTypeRedirect';
 import JobList from '../../components/JobList';
 import { JOB_TYPE_URL_SEGMENTS } from '../../constants';
 
-function Jobs({ i18n }) {
+function Jobs() {
   const match = useRouteMatch();
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/jobs': i18n._(t`Jobs`),
+    '/jobs': t`Jobs`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    job => {
-      if (!job) {
-        return;
-      }
+  const buildBreadcrumbConfig = useCallback(job => {
+    if (!job) {
+      return;
+    }
 
-      const typeSegment = JOB_TYPE_URL_SEGMENTS[job.type];
-      setBreadcrumbConfig({
-        '/jobs': i18n._(t`Jobs`),
-        [`/jobs/${typeSegment}/${job.id}`]: `${job.name}`,
-        [`/jobs/${typeSegment}/${job.id}/output`]: i18n._(t`Output`),
-        [`/jobs/${typeSegment}/${job.id}/details`]: i18n._(t`Details`),
-      });
-    },
-    [i18n]
-  );
+    const typeSegment = JOB_TYPE_URL_SEGMENTS[job.type];
+    setBreadcrumbConfig({
+      '/jobs': t`Jobs`,
+      [`/jobs/${typeSegment}/${job.id}`]: `${job.name}`,
+      [`/jobs/${typeSegment}/${job.id}/output`]: t`Output`,
+      [`/jobs/${typeSegment}/${job.id}/details`]: t`Details`,
+    });
+  }, []);
 
   function TypeRedirect({ view }) {
     const { id } = useParams();
@@ -65,4 +62,4 @@ function Jobs({ i18n }) {
 }
 
 export { Jobs as _Jobs };
-export default withI18n()(Jobs);
+export default Jobs;
diff --git a/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutput.jsx b/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutput.jsx
index 8c50bab16c..2b22f69ed5 100644
--- a/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutput.jsx
+++ b/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutput.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useReducer } from 'react';
-import { withI18n } from '@lingui/react';
+
 import styled from 'styled-components';
 import { shape } from 'prop-types';
 import { CardBody as PFCardBody } from '@patternfly/react-core';
@@ -43,7 +43,7 @@ const fetchWorkflowNodes = async (jobId, pageNo = 1, nodes = []) => {
   return nodes.concat(data.results);
 };
 
-function WorkflowOutput({ job, i18n }) {
+function WorkflowOutput({ job }) {
   const [state, dispatch] = useReducer(workflowReducer, {}, initReducer);
   const { contentError, isLoading, links, nodePositions, nodes } = state;
 
@@ -54,7 +54,6 @@ function WorkflowOutput({ job, i18n }) {
         dispatch({
           type: 'GENERATE_NODES_AND_LINKS',
           nodes: workflowNodes,
-          i18n,
         });
       } catch (error) {
         dispatch({ type: 'SET_CONTENT_ERROR', value: error });
@@ -64,7 +63,7 @@ function WorkflowOutput({ job, i18n }) {
     }
     dispatch({ type: 'RESET' });
     fetchData();
-  }, [job.id, i18n]);
+  }, [job.id]);
 
   // Update positions of nodes/links
   useEffect(() => {
@@ -120,4 +119,4 @@ WorkflowOutput.propTypes = {
   job: shape().isRequired,
 };
 
-export default withI18n()(WorkflowOutput);
+export default WorkflowOutput;
diff --git a/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutputNode.jsx b/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutputNode.jsx
index 85c1603493..24b4307ee6 100644
--- a/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutputNode.jsx
+++ b/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutputNode.jsx
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import { func, shape } from 'prop-types';
@@ -66,7 +66,7 @@ const ConvergenceLabel = styled.p`
 
 Elapsed.displayName = 'Elapsed';
 
-function WorkflowOutputNode({ i18n, mouseEnter, mouseLeave, node }) {
+function WorkflowOutputNode({ mouseEnter, mouseLeave, node }) {
   const history = useHistory();
   const { nodePositions } = useContext(WorkflowStateContext);
   const job = node?.originalNodeObject?.summary_fields?.job;
@@ -125,7 +125,7 @@ function WorkflowOutputNode({ i18n, mouseEnter, mouseLeave, node }) {
             x={wfConstants.nodeW / 2 - wfConstants.nodeW / 10 + 7}
             y={-wfConstants.nodeH / 4 - 1}
           >
-            <ConvergenceLabel>{i18n._(t`ALL`)}</ConvergenceLabel>
+            <ConvergenceLabel>{t`ALL`}</ConvergenceLabel>
           </foreignObject>
         </>
       )}
@@ -151,7 +151,7 @@ function WorkflowOutputNode({ i18n, mouseEnter, mouseLeave, node }) {
               )}
             </>
           ) : (
-            <NodeDefaultLabel>{jobName || i18n._(t`DELETED`)}</NodeDefaultLabel>
+            <NodeDefaultLabel>{jobName || t`DELETED`}</NodeDefaultLabel>
           )}
         </NodeContents>
       </foreignObject>
@@ -168,4 +168,4 @@ WorkflowOutputNode.propTypes = {
   node: shape().isRequired,
 };
 
-export default withI18n()(WorkflowOutputNode);
+export default WorkflowOutputNode;
diff --git a/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutputToolbar.jsx b/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutputToolbar.jsx
index f70b17930f..bcfe7fcc6c 100644
--- a/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutputToolbar.jsx
+++ b/awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutputToolbar.jsx
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { shape } from 'prop-types';
 import { Badge as PFBadge, Button, Tooltip } from '@patternfly/react-core';
@@ -56,7 +56,7 @@ const StatusIconWithMargin = styled(StatusIcon)`
   margin-right: 20px;
 `;
 
-function WorkflowOutputToolbar({ i18n, job }) {
+function WorkflowOutputToolbar({ job }) {
   const dispatch = useContext(WorkflowDispatchContext);
 
   const { nodes, showLegend, showTools } = useContext(WorkflowStateContext);
@@ -70,9 +70,9 @@ function WorkflowOutputToolbar({ i18n, job }) {
         <b>{job.name}</b>
       </ToolbarJob>
       <ToolbarActions>
-        <div>{i18n._(t`Total Nodes`)}</div>
+        <div>{t`Total Nodes`}</div>
         <Badge isRead>{totalNodes}</Badge>
-        <Tooltip content={i18n._(t`Toggle Legend`)} position="bottom">
+        <Tooltip content={t`Toggle Legend`} position="bottom">
           <ActionButton
             id="workflow-output-toggle-legend"
             isActive={showLegend}
@@ -82,7 +82,7 @@ function WorkflowOutputToolbar({ i18n, job }) {
             <CompassIcon />
           </ActionButton>
         </Tooltip>
-        <Tooltip content={i18n._(t`Toggle Tools`)} position="bottom">
+        <Tooltip content={t`Toggle Tools`} position="bottom">
           <ActionButton
             id="workflow-output-toggle-tools"
             isActive={showTools}
@@ -101,4 +101,4 @@ WorkflowOutputToolbar.propTypes = {
   job: shape().isRequired,
 };
 
-export default withI18n()(WorkflowOutputToolbar);
+export default WorkflowOutputToolbar;
diff --git a/awx/ui_next/src/screens/Login/Login.jsx b/awx/ui_next/src/screens/Login/Login.jsx
index 7448eccfd0..e15a8e14d0 100644
--- a/awx/ui_next/src/screens/Login/Login.jsx
+++ b/awx/ui_next/src/screens/Login/Login.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { Redirect, withRouter } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik } from 'formik';
 import styled from 'styled-components';
@@ -37,7 +37,7 @@ const Login = styled(PFLogin)`
   }
 `;
 
-function AWXLogin({ alt, i18n, isAuthenticated }) {
+function AWXLogin({ alt, isAuthenticated }) {
   const {
     isLoading: isCustomLoginInfoLoading,
     error: customLoginInfoError,
@@ -125,9 +125,9 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
 
   let helperText;
   if (authError?.response?.status === 401) {
-    helperText = i18n._(t`Invalid username or password. Please try again.`);
+    helperText = t`Invalid username or password. Please try again.`;
   } else {
-    helperText = i18n._(t`There was a problem signing in. Please try again.`);
+    helperText = t`There was a problem signing in. Please try again.`;
   }
 
   const HeaderBrand = (
@@ -148,9 +148,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
       <LoginMainHeader
         data-cy="login-header"
         title={
-          brandName
-            ? i18n._(t`Welcome to Ansible ${brandName}! Please Sign In.`)
-            : ''
+          brandName ? t`Welcome to Ansible ${brandName}! Please Sign In.` : ''
         }
       />
       <LoginMainBody>
@@ -169,7 +167,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
               isLoginButtonDisabled={isAuthenticating}
               isValidPassword={!authError}
               isValidUsername={!authError}
-              loginButtonLabel={i18n._(t`Log In`)}
+              loginButtonLabel={t`Log In`}
               onChangePassword={val => {
                 formik.setFieldValue('password', val);
                 dismissAuthError();
@@ -179,10 +177,10 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                 dismissAuthError();
               }}
               onLoginButtonClick={formik.handleSubmit}
-              passwordLabel={i18n._(t`Password`)}
+              passwordLabel={t`Password`}
               passwordValue={formik.values.password}
               showHelperText={authError}
-              usernameLabel={i18n._(t`Username`)}
+              usernameLabel={t`Username`}
               usernameValue={formik.values.username}
             />
           )}
@@ -191,13 +189,11 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
           <AlertModal
             isOpen={loginInfoError}
             variant="error"
-            title={i18n._(t`Error!`)}
+            title={t`Error!`}
             onClose={dismissLoginInfoError}
             data-cy="login-info-error"
           >
-            {i18n._(
-              t`Failed to fetch custom login configuration settings.  System defaults will be shown instead.`
-            )}
+            {t`Failed to fetch custom login configuration settings.  System defaults will be shown instead.`}
             <ErrorDetail error={loginInfoError} />
           </AlertModal>
         )}
@@ -215,7 +211,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                       href={loginUrl}
                       key={authKey}
                     >
-                      <Tooltip content={i18n._(t`Sign in with Azure AD`)}>
+                      <Tooltip content={t`Sign in with Azure AD`}>
                         <AzureIcon />
                       </Tooltip>
                     </LoginMainFooterLinksItem>
@@ -228,7 +224,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                       href={loginUrl}
                       key={authKey}
                     >
-                      <Tooltip content={i18n._(t`Sign in with GitHub`)}>
+                      <Tooltip content={t`Sign in with GitHub`}>
                         <GithubIcon />
                       </Tooltip>
                     </LoginMainFooterLinksItem>
@@ -241,9 +237,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                       href={loginUrl}
                       key={authKey}
                     >
-                      <Tooltip
-                        content={i18n._(t`Sign in with GitHub Organizations`)}
-                      >
+                      <Tooltip content={t`Sign in with GitHub Organizations`}>
                         <GithubIcon />
                       </Tooltip>
                     </LoginMainFooterLinksItem>
@@ -256,7 +250,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                       href={loginUrl}
                       key={authKey}
                     >
-                      <Tooltip content={i18n._(t`Sign in with GitHub Teams`)}>
+                      <Tooltip content={t`Sign in with GitHub Teams`}>
                         <GithubIcon />
                       </Tooltip>
                     </LoginMainFooterLinksItem>
@@ -269,9 +263,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                       href={loginUrl}
                       key={authKey}
                     >
-                      <Tooltip
-                        content={i18n._(t`Sign in with GitHub Enterprise`)}
-                      >
+                      <Tooltip content={t`Sign in with GitHub Enterprise`}>
                         <GithubIcon />
                       </Tooltip>
                     </LoginMainFooterLinksItem>
@@ -285,9 +277,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                       key={authKey}
                     >
                       <Tooltip
-                        content={i18n._(
-                          t`Sign in with GitHub Enterprise Organizations`
-                        )}
+                        content={t`Sign in with GitHub Enterprise Organizations`}
                       >
                         <GithubIcon />
                       </Tooltip>
@@ -302,9 +292,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                       key={authKey}
                     >
                       <Tooltip
-                        content={i18n._(
-                          t`Sign in with GitHub Enterprise Teams`
-                        )}
+                        content={t`Sign in with GitHub Enterprise Teams`}
                       >
                         <GithubIcon />
                       </Tooltip>
@@ -318,7 +306,7 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                       href={loginUrl}
                       key={authKey}
                     >
-                      <Tooltip content={i18n._(t`Sign in with Google`)}>
+                      <Tooltip content={t`Sign in with Google`}>
                         <GoogleIcon />
                       </Tooltip>
                     </LoginMainFooterLinksItem>
@@ -335,8 +323,8 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
                       <Tooltip
                         content={
                           samlIDP
-                            ? i18n._(t`Sign in with SAML ${samlIDP}`)
-                            : i18n._(t`Sign in with SAML`)
+                            ? t`Sign in with SAML ${samlIDP}`
+                            : t`Sign in with SAML`
                         }
                       >
                         <UserCircleIcon />
@@ -354,5 +342,5 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
   );
 }
 
-export default withI18n()(withRouter(AWXLogin));
+export default withRouter(AWXLogin);
 export { AWXLogin as _AWXLogin };
diff --git a/awx/ui_next/src/screens/ManagementJob/ManagementJob.jsx b/awx/ui_next/src/screens/ManagementJob/ManagementJob.jsx
index 99d3ddac3e..b3cda283c4 100644
--- a/awx/ui_next/src/screens/ManagementJob/ManagementJob.jsx
+++ b/awx/ui_next/src/screens/ManagementJob/ManagementJob.jsx
@@ -8,7 +8,7 @@ import {
   useParams,
   useRouteMatch,
 } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
@@ -22,7 +22,7 @@ import { Schedules } from '../../components/Schedule';
 import { useConfig } from '../../contexts/Config';
 import useRequest from '../../util/useRequest';
 
-function ManagementJob({ i18n, setBreadcrumb }) {
+function ManagementJob({ setBreadcrumb }) {
   const basePath = '/management_jobs';
 
   const match = useRouteMatch();
@@ -95,7 +95,7 @@ function ManagementJob({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to management jobs`)}
+          {t`Back to management jobs`}
         </>
       ),
     },
@@ -104,7 +104,7 @@ function ManagementJob({ i18n, setBreadcrumb }) {
   if (shouldShowSchedules) {
     tabsArray.push({
       id: 0,
-      name: i18n._(t`Schedules`),
+      name: t`Schedules`,
       link: `${match.url}/schedules`,
     });
   }
@@ -112,7 +112,7 @@ function ManagementJob({ i18n, setBreadcrumb }) {
   if (shouldShowNotifications) {
     tabsArray.push({
       id: 1,
-      name: i18n._(t`Notifications`),
+      name: t`Notifications`,
       link: `${match.url}/notifications`,
     });
   }
@@ -129,9 +129,9 @@ function ManagementJob({ i18n, setBreadcrumb }) {
           <ContentError error={error}>
             {error?.response?.status === 404 && (
               <span>
-                {i18n._(t`Management job not found.`)}
+                {t`Management job not found.`}
                 {''}
-                <Link to={basePath}>{i18n._(t`View all management jobs`)}</Link>
+                <Link to={basePath}>{t`View all management jobs`}</Link>
               </span>
             )}
           </ContentError>
@@ -190,4 +190,4 @@ function ManagementJob({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(ManagementJob);
+export default ManagementJob;
diff --git a/awx/ui_next/src/screens/ManagementJob/ManagementJobList/LaunchManagementPrompt.jsx b/awx/ui_next/src/screens/ManagementJob/ManagementJobList/LaunchManagementPrompt.jsx
index 1eba707195..c7889f9779 100644
--- a/awx/ui_next/src/screens/ManagementJob/ManagementJobList/LaunchManagementPrompt.jsx
+++ b/awx/ui_next/src/screens/ManagementJob/ManagementJobList/LaunchManagementPrompt.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, TextInput, Tooltip } from '@patternfly/react-core';
 import { RocketIcon } from '@patternfly/react-icons';
@@ -19,7 +19,6 @@ const clamp = (val, min, max) => {
 };
 
 function LaunchManagementPrompt({
-  i18n,
   isOpen,
   isLoading,
   onClick,
@@ -30,9 +29,9 @@ function LaunchManagementPrompt({
   const [dataRetention, setDataRetention] = useState(defaultDays);
   return (
     <>
-      <Tooltip content={i18n._(t`Launch management job`)} position="top">
+      <Tooltip content={t`Launch management job`} position="top">
         <Button
-          aria-label={i18n._(t`Launch management job`)}
+          aria-label={t`Launch management job`}
           variant="plain"
           onClick={onClick}
           isDisabled={isLoading}
@@ -44,40 +43,40 @@ function LaunchManagementPrompt({
         isOpen={isOpen}
         variant="info"
         onClose={onClose}
-        title={i18n._(t`Launch management job`)}
-        label={i18n._(t`Launch management job`)}
+        title={t`Launch management job`}
+        label={t`Launch management job`}
         actions={[
           <Button
             id="launch-job-confirm-button"
             key="delete"
             variant="primary"
             isDisabled={isLoading}
-            aria-label={i18n._(t`Launch`)}
+            aria-label={t`Launch`}
             onClick={() => onConfirm(dataRetention)}
           >
-            {i18n._(t`Launch`)}
+            {t`Launch`}
           </Button>,
           <Button
             id="launch-job-cancel-button"
             key="cancel"
             variant="link"
-            aria-label={i18n._(t`Cancel`)}
+            aria-label={t`Cancel`}
             onClick={onClose}
           >
-            {i18n._(t`Cancel`)}
+            {t`Cancel`}
           </Button>,
         ]}
       >
-        {i18n._(t`Set how many days of data should be retained.`)}
+        {t`Set how many days of data should be retained.`}
         <TextInput
           value={dataRetention}
           type="number"
           onChange={value => setDataRetention(clamp(value, 0, MAX_RETENTION))}
-          aria-label={i18n._(t`Data retention period`)}
+          aria-label={t`Data retention period`}
         />
       </AlertModal>
     </>
   );
 }
 
-export default withI18n()(LaunchManagementPrompt);
+export default LaunchManagementPrompt;
diff --git a/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobList.jsx b/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobList.jsx
index 89c7200a57..569310a390 100644
--- a/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobList.jsx
+++ b/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobList.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { useLocation } from 'react-router-dom';
 import { Card, PageSection } from '@patternfly/react-core';
 
@@ -48,7 +48,7 @@ const loadManagementJobs = async search => {
   return { items, count, options };
 };
 
-function ManagementJobList({ i18n }) {
+function ManagementJobList() {
   const { search } = useLocation();
   const { me } = useConfig();
   const [launchError, setLaunchError] = useState(null);
@@ -79,13 +79,13 @@ function ManagementJobList({ i18n }) {
             hasContentLoading={isLoading}
             items={items}
             itemCount={count}
-            pluralizedItemName={i18n._(t`Management Jobs`)}
+            pluralizedItemName={t`Management Jobs`}
             emptyContentMessage={' '}
             toolbarSearchableKeys={searchableKeys}
             toolbarRelatedSearchableKeys={relatedSearchableKeys}
             toolbarSearchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
@@ -99,9 +99,9 @@ function ManagementJobList({ i18n }) {
             )}
             headerRow={
               <HeaderRow qsConfig={QS_CONFIG}>
-                <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
-                <HeaderCell>{i18n._(t`Description`)}</HeaderCell>
-                <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
+                <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
+                <HeaderCell>{t`Description`}</HeaderCell>
+                <HeaderCell>{t`Actions`}</HeaderCell>
               </HeaderRow>
             }
             renderRow={({ id, name, description, job_type }) => (
@@ -124,14 +124,14 @@ function ManagementJobList({ i18n }) {
       <AlertModal
         isOpen={Boolean(launchError)}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => setLaunchError(null)}
       >
-        {i18n._(t`Failed to launch job.`)}
+        {t`Failed to launch job.`}
         <ErrorDetail error={launchError} />
       </AlertModal>
     </>
   );
 }
 
-export default withI18n()(ManagementJobList);
+export default ManagementJobList;
diff --git a/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobListItem.jsx b/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobListItem.jsx
index 0347cfa47a..152028aafe 100644
--- a/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobListItem.jsx
+++ b/awx/ui_next/src/screens/ManagementJob/ManagementJobList/ManagementJobListItem.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link, useHistory } from 'react-router-dom';
 import { Button, Tooltip } from '@patternfly/react-core';
@@ -13,7 +13,6 @@ import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
 import LaunchManagementPrompt from './LaunchManagementPrompt';
 
 function ManagementJobListItem({
-  i18n,
   onLaunchError,
   isPrompted,
   isSuperUser,
@@ -65,17 +64,14 @@ function ManagementJobListItem({
     <>
       <Tr id={`mgmt-jobs-row-${jobType ? jobType.replace('_', '-') : ''}`}>
         <Td />
-        <Td dataLabel={i18n._(t`Name`)}>
+        <Td dataLabel={t`Name`}>
           <Link to={`${detailsUrl}`}>
             <b>{name}</b>
           </Link>
         </Td>
-        <Td dataLabel={i18n._(t`Description`)}>{description}</Td>
-        <ActionsTd dataLabel={i18n._(t`Actions`)}>
-          <ActionItem
-            visible={isSuperUser}
-            tooltip={i18n._(t`Launch Management Job`)}
-          >
+        <Td dataLabel={t`Description`}>{description}</Td>
+        <ActionsTd dataLabel={t`Actions`}>
+          <ActionItem visible={isSuperUser} tooltip={t`Launch Management Job`}>
             {isSuperUser ? (
               <>
                 {isPrompted ? (
@@ -90,13 +86,10 @@ function ManagementJobListItem({
                     />
                   </>
                 ) : (
-                  <Tooltip
-                    content={i18n._(t`Launch management job`)}
-                    position="top"
-                  >
+                  <Tooltip content={t`Launch management job`} position="top">
                     <Button
                       ouiaId={`${id}-launch-button`}
-                      aria-label={i18n._(t`Launch management job`)}
+                      aria-label={t`Launch management job`}
                       variant="plain"
                       onClick={handleLaunch}
                       isDisabled={isLaunchLoading}
@@ -115,8 +108,8 @@ function ManagementJobListItem({
           isOpen={managementPromptError}
           variant="danger"
           onClose={() => setManagementPromptError(null)}
-          title={i18n._(t`Management job launch error`)}
-          label={i18n._(t`Management job launch error`)}
+          title={t`Management job launch error`}
+          label={t`Management job launch error`}
         >
           <ErrorDetail error={managementPromptError} />
         </AlertModal>
@@ -125,4 +118,4 @@ function ManagementJobListItem({
   );
 }
 
-export default withI18n()(ManagementJobListItem);
+export default ManagementJobListItem;
diff --git a/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx b/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx
index 5d26de2a4e..24a2f09f77 100644
--- a/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx
+++ b/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Route, Switch } from 'react-router-dom';
 
@@ -7,34 +7,27 @@ import ScreenHeader from '../../components/ScreenHeader';
 import ManagementJob from './ManagementJob';
 import ManagementJobList from './ManagementJobList';
 
-function ManagementJobs({ i18n }) {
+function ManagementJobs() {
   const basePath = '/management_jobs';
 
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    [basePath]: i18n._(t`Management jobs`),
+    [basePath]: t`Management jobs`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    ({ id, name }, nested) => {
-      if (!id) return;
+  const buildBreadcrumbConfig = useCallback(({ id, name }, nested) => {
+    if (!id) return;
 
-      setBreadcrumbConfig({
-        [basePath]: i18n._(t`Management job`),
-        [`${basePath}/${id}`]: name,
-        [`${basePath}/${id}/notifications`]: i18n._(t`Notifications`),
-        [`${basePath}/${id}/schedules`]: i18n._(t`Schedules`),
-        [`${basePath}/${id}/schedules/add`]: i18n._(t`Create New Schedule`),
-        [`${basePath}/${id}/schedules/${nested?.id}`]: `${nested?.name}`,
-        [`${basePath}/${id}/schedules/${nested?.id}/details`]: i18n._(
-          t`Details`
-        ),
-        [`${basePath}/${id}/schedules/${nested?.id}/edit`]: i18n._(
-          t`Edit Details`
-        ),
-      });
-    },
-    [i18n]
-  );
+    setBreadcrumbConfig({
+      [basePath]: t`Management job`,
+      [`${basePath}/${id}`]: name,
+      [`${basePath}/${id}/notifications`]: t`Notifications`,
+      [`${basePath}/${id}/schedules`]: t`Schedules`,
+      [`${basePath}/${id}/schedules/add`]: t`Create New Schedule`,
+      [`${basePath}/${id}/schedules/${nested?.id}`]: `${nested?.name}`,
+      [`${basePath}/${id}/schedules/${nested?.id}/details`]: t`Details`,
+      [`${basePath}/${id}/schedules/${nested?.id}/edit`]: t`Edit Details`,
+    });
+  }, []);
 
   return (
     <>
@@ -51,4 +44,4 @@ function ManagementJobs({ i18n }) {
   );
 }
 
-export default withI18n()(ManagementJobs);
+export default ManagementJobs;
diff --git a/awx/ui_next/src/screens/Metrics/Metrics.jsx b/awx/ui_next/src/screens/Metrics/Metrics.jsx
index 90baa054ab..b45911c728 100644
--- a/awx/ui_next/src/screens/Metrics/Metrics.jsx
+++ b/awx/ui_next/src/screens/Metrics/Metrics.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useCallback, useState, useRef } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   PageSection,
@@ -44,7 +44,7 @@ function useInterval(callback, delay, instance, metric) {
   }, [callback, delay, instance, metric]);
   return { count };
 }
-function Metrics({ i18n }) {
+function Metrics() {
   const [instanceIsOpen, setInstanceIsOpen] = useState(false);
   const [instance, setInstance] = useState(null);
   const [metric, setMetric] = useState(null);
@@ -167,7 +167,7 @@ function Metrics({ i18n }) {
   }
   return (
     <>
-      <ScreenHeader breadcrumbConfig={{ '/metrics': i18n._(t`Metrics`) }} />
+      <ScreenHeader breadcrumbConfig={{ '/metrics': t`Metrics` }} />
 
       <PageSection>
         <Card>
@@ -175,7 +175,7 @@ function Metrics({ i18n }) {
             <Toolbar>
               <ToolbarContent>
                 <ToolbarGroup>
-                  <ToolbarItem>{i18n._(t`Instance`)}</ToolbarItem>
+                  <ToolbarItem>{t`Instance`}</ToolbarItem>
                   <ToolbarItem>
                     <Select
                       ouiaId="Instance-select"
@@ -188,18 +188,18 @@ function Metrics({ i18n }) {
                         setRenderedData([]);
                       }}
                       selections={instance}
-                      placeholderText={i18n._(t`Select a instance`)}
+                      placeholderText={t`Select a instance`}
                     >
                       {instances.map(inst => (
                         <SelectOption value={inst} key={inst} />
                       ))}
                     </Select>
                   </ToolbarItem>
-                  <ToolbarItem>{i18n._(t`Metric`)}</ToolbarItem>
+                  <ToolbarItem>{t`Metric`}</ToolbarItem>
                   <ToolbarItem>
                     <Select
                       ouiaId="Metric-select"
-                      placeholderText={i18n._(t`Select a metric`)}
+                      placeholderText={t`Select a metric`}
                       isOpen={metricIsOpen}
                       onSelect={(e, value) => {
                         count = [0];
@@ -230,7 +230,7 @@ function Metrics({ i18n }) {
               )
             ) : (
               <ContentEmpty
-                title={i18n._(t`Select an instance and a metric to show chart`)}
+                title={t`Select an instance and a metric to show chart`}
               />
             )}
           </CardBody>
@@ -240,4 +240,4 @@ function Metrics({ i18n }) {
   );
 }
 
-export default withI18n()(Metrics);
+export default Metrics;
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
index 219bb124bd..b00ba4094d 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { Card, PageSection } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import {
@@ -20,7 +20,7 @@ import NotificationTemplateDetail from './NotificationTemplateDetail';
 import NotificationTemplateEdit from './NotificationTemplateEdit';
 import ContentLoading from '../../components/ContentLoading';
 
-function NotificationTemplate({ setBreadcrumb, i18n }) {
+function NotificationTemplate({ setBreadcrumb }) {
   const { id: templateId } = useParams();
   const match = useRouteMatch();
   const location = useLocation();
@@ -55,9 +55,9 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
           <ContentError error={error}>
             {error.response.status === 404 && (
               <span>
-                {i18n._(t`Notification Template not found.`)}{' '}
+                {t`Notification Template not found.`}{' '}
                 <Link to="/notification_templates">
-                  {i18n._(t`View all Notification Templates.`)}
+                  {t`View all Notification Templates.`}
                 </Link>
               </span>
             )}
@@ -73,14 +73,14 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Notifications`)}
+          {t`Back to Notifications`}
         </>
       ),
       link: `/notification_templates`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `${match.url}/details`,
       id: 0,
     },
@@ -118,4 +118,4 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
   );
 }
 
-export default withI18n()(NotificationTemplate);
+export default NotificationTemplate;
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.jsx
index 51148d6489..7202b3256a 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.jsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { useHistory, Link } from 'react-router-dom';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { Card, PageSection } from '@patternfly/react-core';
 import { CardBody } from '../../components/Card';
 import { NotificationTemplatesAPI } from '../../api';
@@ -9,7 +9,7 @@ import useRequest from '../../util/useRequest';
 import ContentError from '../../components/ContentError';
 import NotificationTemplateForm from './shared/NotificationTemplateForm';
 
-function NotificationTemplateAdd({ i18n }) {
+function NotificationTemplateAdd() {
   const history = useHistory();
   const [formError, setFormError] = useState(null);
   const {
@@ -47,9 +47,9 @@ function NotificationTemplateAdd({ i18n }) {
           <ContentError error={error}>
             {error.response.status === 404 && (
               <span>
-                {i18n._(t`Notification Template not found.`)}{' '}
+                {t`Notification Template not found.`}{' '}
                 <Link to="/notification_templates">
-                  {i18n._(t`View all Notification Templates.`)}
+                  {t`View all Notification Templates.`}
                 </Link>
               </span>
             )}
@@ -78,4 +78,4 @@ function NotificationTemplateAdd({ i18n }) {
 }
 
 export { NotificationTemplateAdd as _NotificationTemplateAdd };
-export default withI18n()(NotificationTemplateAdd);
+export default NotificationTemplateAdd;
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
index 1d1c303f81..554660b15b 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { Button } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
 import AlertModal from '../../../components/AlertModal';
@@ -20,7 +20,7 @@ import useRequest, { useDismissableError } from '../../../util/useRequest';
 import hasCustomMessages from '../shared/hasCustomMessages';
 import { NOTIFICATION_TYPES } from '../constants';
 
-function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
+function NotificationTemplateDetail({ template, defaultMessages }) {
   const history = useHistory();
 
   const {
@@ -44,19 +44,15 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
   return (
     <CardBody>
       <DetailList gutter="sm">
+        <Detail label={t`Name`} value={template.name} dataCy="nt-detail-name" />
         <Detail
-          label={i18n._(t`Name`)}
-          value={template.name}
-          dataCy="nt-detail-name"
-        />
-        <Detail
-          label={i18n._(t`Description`)}
+          label={t`Description`}
           value={template.description}
           dataCy="nt-detail-description"
         />
         {summary_fields.organization ? (
           <Detail
-            label={i18n._(t`Organization`)}
+            label={t`Organization`}
             value={
               <Link
                 to={`/organizations/${summary_fields.organization.id}/details`}
@@ -66,10 +62,10 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
             }
           />
         ) : (
-          <DeletedDetail label={i18n._(t`Organization`)} />
+          <DeletedDetail label={t`Organization`} />
         )}
         <Detail
-          label={i18n._(t`Notification Type`)}
+          label={t`Notification Type`}
           value={
             NOTIFICATION_TYPES[template.notification_type] ||
             template.notification_type
@@ -79,40 +75,38 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         {template.notification_type === 'email' && (
           <>
             <Detail
-              label={i18n._(t`Username`)}
+              label={t`Username`}
               value={configuration.username}
               dataCy="nt-detail-username"
             />
             <Detail
-              label={i18n._(t`Host`)}
+              label={t`Host`}
               value={configuration.host}
               dataCy="nt-detail-host"
             />
             <ArrayDetail
-              label={i18n._(t`Recipient List`)}
+              label={t`Recipient List`}
               value={configuration.recipients}
               dataCy="nt-detail-recipients"
             />
             <Detail
-              label={i18n._(t`Sender Email`)}
+              label={t`Sender Email`}
               value={configuration.sender}
               dataCy="nt-detail-sender"
             />
             <Detail
-              label={i18n._(t`Port`)}
+              label={t`Port`}
               value={configuration.port}
               dataCy="nt-detail-port"
             />
             <Detail
-              label={i18n._(t`Timeout`)}
+              label={t`Timeout`}
               value={configuration.timeout}
               dataCy="nt-detail-timeout"
             />
             <Detail
-              label={i18n._(t`Email Options`)}
-              value={
-                configuration.use_ssl ? i18n._(t`Use SSL`) : i18n._(t`Use TLS`)
-              }
+              label={t`Email Options`}
+              value={configuration.use_ssl ? t`Use SSL` : t`Use TLS`}
               dataCy="nt-detail-email-options"
             />
           </>
@@ -120,32 +114,28 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         {template.notification_type === 'grafana' && (
           <>
             <Detail
-              label={i18n._(t`Grafana URL`)}
+              label={t`Grafana URL`}
               value={configuration.grafana_url}
               dataCy="nt-detail-grafana-url"
             />
             <Detail
-              label={i18n._(t`ID of the Dashboard`)}
+              label={t`ID of the Dashboard`}
               value={configuration.dashboardId}
               dataCy="nt-detail-dashboard-id"
             />
             <Detail
-              label={i18n._(t`ID of the Panel`)}
+              label={t`ID of the Panel`}
               value={configuration.panelId}
               dataCy="nt-detail-panel-id"
             />
             <ArrayDetail
-              label={i18n._(t`Tags for the Annotation`)}
+              label={t`Tags for the Annotation`}
               value={configuration.annotation_tags}
               dataCy="nt-detail-"
             />
             <Detail
-              label={i18n._(t`Disable SSL Verification`)}
-              value={
-                configuration.grafana_no_verify_ssl
-                  ? i18n._(t`True`)
-                  : i18n._(t`False`)
-              }
+              label={t`Disable SSL Verification`}
+              value={configuration.grafana_no_verify_ssl ? t`True` : t`False`}
               dataCy="nt-detail-disable-ssl"
             />
           </>
@@ -153,28 +143,28 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         {template.notification_type === 'irc' && (
           <>
             <Detail
-              label={i18n._(t`IRC Server Port`)}
+              label={t`IRC Server Port`}
               value={configuration.port}
               dataCy="nt-detail-irc-port"
             />
             <Detail
-              label={i18n._(t`IRC Server Address`)}
+              label={t`IRC Server Address`}
               value={configuration.server}
               dataCy="nt-detail-irc-server"
             />
             <Detail
-              label={i18n._(t`IRC Nick`)}
+              label={t`IRC Nick`}
               value={configuration.nickname}
               dataCy="nt-detail-irc-nickname"
             />
             <ArrayDetail
-              label={i18n._(t`Destination Channels or Users`)}
+              label={t`Destination Channels or Users`}
               value={configuration.targets}
               dataCy="nt-detail-channels"
             />
             <Detail
-              label={i18n._(t`SSL Connection`)}
-              value={configuration.use_ssl ? i18n._(t`True`) : i18n._(t`False`)}
+              label={t`SSL Connection`}
+              value={configuration.use_ssl ? t`True` : t`False`}
               dataCy="nt-detail-irc-ssl"
             />
           </>
@@ -182,31 +172,29 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         {template.notification_type === 'mattermost' && (
           <>
             <Detail
-              label={i18n._(t`Target URL`)}
+              label={t`Target URL`}
               value={configuration.mattermost_url}
               dataCy="nt-detail-mattermost-url"
             />
             <Detail
-              label={i18n._(t`Username`)}
+              label={t`Username`}
               value={configuration.mattermost_username}
               dataCy="nt-detail-mattermost-username"
             />
             <Detail
-              label={i18n._(t`Channel`)}
+              label={t`Channel`}
               value={configuration.mattermost_channel}
               dataCy="nt-detail-mattermost_channel"
             />
             <Detail
-              label={i18n._(t`Icon URL`)}
+              label={t`Icon URL`}
               value={configuration.mattermost_icon_url}
               dataCy="nt-detail-mattermost-icon-url"
             />
             <Detail
-              label={i18n._(t`Disable SSL Verification`)}
+              label={t`Disable SSL Verification`}
               value={
-                configuration.mattermost_no_verify_ssl
-                  ? i18n._(t`True`)
-                  : i18n._(t`False`)
+                configuration.mattermost_no_verify_ssl ? t`True` : t`False`
               }
               dataCy="nt-detail-disable-ssl"
             />
@@ -215,17 +203,17 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         {template.notification_type === 'pagerduty' && (
           <>
             <Detail
-              label={i18n._(t`Pagerduty Subdomain`)}
+              label={t`Pagerduty Subdomain`}
               value={configuration.subdomain}
               dataCy="nt-detail-pagerduty-subdomain"
             />
             <Detail
-              label={i18n._(t`API Service/Integration Key`)}
+              label={t`API Service/Integration Key`}
               value={configuration.service_key}
               dataCy="nt-detail-pagerduty-service-key"
             />
             <Detail
-              label={i18n._(t`Client Identifier`)}
+              label={t`Client Identifier`}
               value={configuration.client_name}
               dataCy="nt-detail-pagerduty-client-name"
             />
@@ -234,26 +222,24 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         {template.notification_type === 'rocketchat' && (
           <>
             <Detail
-              label={i18n._(t`Target URL`)}
+              label={t`Target URL`}
               value={configuration.rocketchat_url}
               dataCy="nt-detail-rocketchat-url"
             />
             <Detail
-              label={i18n._(t`Username`)}
+              label={t`Username`}
               value={configuration.rocketchat_username}
               dataCy="nt-detail-rocketchat-username"
             />
             <Detail
-              label={i18n._(t`Icon URL`)}
+              label={t`Icon URL`}
               value={configuration.rocketchat_icon_url}
               dataCy="nt-detail-rocketchat-icon-url"
             />
             <Detail
-              label={i18n._(t`Disable SSL Verification`)}
+              label={t`Disable SSL Verification`}
               value={
-                configuration.rocketchat_no_verify_ssl
-                  ? i18n._(t`True`)
-                  : i18n._(t`False`)
+                configuration.rocketchat_no_verify_ssl ? t`True` : t`False`
               }
               dataCy="nt-detail-disable-ssl"
             />
@@ -262,12 +248,12 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         {template.notification_type === 'slack' && (
           <>
             <ArrayDetail
-              label={i18n._(t`Destination Channels`)}
+              label={t`Destination Channels`}
               value={configuration.channels}
               dataCy="nt-detail-slack-channels"
             />
             <Detail
-              label={i18n._(t`Notification Color`)}
+              label={t`Notification Color`}
               value={configuration.hex_color}
               dataCy="nt-detail-slack-color"
             />
@@ -276,17 +262,17 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         {template.notification_type === 'twilio' && (
           <>
             <Detail
-              label={i18n._(t`Source Phone Number`)}
+              label={t`Source Phone Number`}
               value={configuration.from_number}
               dataCy="nt-detail-twilio-source-phone"
             />
             <ArrayDetail
-              label={i18n._(t`Destination SMS Number(s)`)}
+              label={t`Destination SMS Number(s)`}
               value={configuration.to_numbers}
               dataCy="nt-detail-twilio-destination-numbers"
             />
             <Detail
-              label={i18n._(t`Account SID`)}
+              label={t`Account SID`}
               value={configuration.account_sid}
               dataCy="nt-detail-twilio-account-sid"
             />
@@ -295,31 +281,29 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         {template.notification_type === 'webhook' && (
           <>
             <Detail
-              label={i18n._(t`Username`)}
+              label={t`Username`}
               value={configuration.username}
               dataCy="nt-detail-webhook-password"
             />
             <Detail
-              label={i18n._(t`Target URL`)}
+              label={t`Target URL`}
               value={configuration.url}
               dataCy="nt-detail-webhook-url"
             />
             <Detail
-              label={i18n._(t`Disable SSL Verification`)}
+              label={t`Disable SSL Verification`}
               value={
-                configuration.disable_ssl_verification
-                  ? i18n._(t`True`)
-                  : i18n._(t`False`)
+                configuration.disable_ssl_verification ? t`True` : t`False`
               }
               dataCy="nt-detail-disable-ssl"
             />
             <Detail
-              label={i18n._(t`HTTP Method`)}
+              label={t`HTTP Method`}
               value={configuration.http_method}
               dataCy="nt-detail-webhook-http-method"
             />
             <CodeDetail
-              label={i18n._(t`HTTP Headers`)}
+              label={t`HTTP Headers`}
               value={JSON.stringify(configuration.headers)}
               mode="json"
               rows="6"
@@ -328,12 +312,12 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
           </>
         )}
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={created}
           user={summary_fields?.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={modified}
           user={summary_fields?.modified_by}
         />
@@ -342,7 +326,6 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
             messages={messages}
             defaults={typeMessageDefaults}
             type={template.notification_type}
-            i18n={i18n}
           />
         )}
       </DetailList>
@@ -353,20 +336,20 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
               ouiaId="notification-template-detail-edit-button"
               component={Link}
               to={`/notification_templates/${template.id}/edit`}
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
         {summary_fields.user_capabilities &&
           summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={template.name}
-              modalTitle={i18n._(t`Delete Notification`)}
+              modalTitle={t`Delete Notification`}
               onConfirm={deleteTemplate}
               isDisabled={isLoading}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -374,10 +357,10 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete notification.`)}
+          {t`Failed to delete notification.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -385,7 +368,7 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
   );
 }
 
-function CustomMessageDetails({ messages, defaults, type, i18n }) {
+function CustomMessageDetails({ messages, defaults, type }) {
   const showMessages = type !== 'webhook';
   const showBodies = ['email', 'pagerduty', 'webhook'].includes(type);
 
@@ -393,7 +376,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
     <>
       {showMessages && (
         <CodeDetail
-          label={i18n._(t`Start message`)}
+          label={t`Start message`}
           value={messages.started.message || defaults.started.message}
           mode="jinja2"
           rows="2"
@@ -402,7 +385,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showBodies && (
         <CodeDetail
-          label={i18n._(t`Start message body`)}
+          label={t`Start message body`}
           value={messages.started.body || defaults.started.body}
           mode="jinja2"
           rows="6"
@@ -411,7 +394,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showMessages && (
         <CodeDetail
-          label={i18n._(t`Success message`)}
+          label={t`Success message`}
           value={messages.success.message || defaults.success.message}
           mode="jinja2"
           rows="2"
@@ -420,7 +403,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showBodies && (
         <CodeDetail
-          label={i18n._(t`Success message body`)}
+          label={t`Success message body`}
           value={messages.success.body || defaults.success.body}
           mode="jinja2"
           rows="6"
@@ -429,7 +412,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showMessages && (
         <CodeDetail
-          label={i18n._(t`Error message`)}
+          label={t`Error message`}
           value={messages.error.message || defaults.error.message}
           mode="jinja2"
           rows="2"
@@ -438,7 +421,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showBodies && (
         <CodeDetail
-          label={i18n._(t`Error message body`)}
+          label={t`Error message body`}
           value={messages.error.body || defaults.error.body}
           mode="jinja2"
           rows="6"
@@ -447,7 +430,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showMessages && (
         <CodeDetail
-          label={i18n._(t`Workflow approved message`)}
+          label={t`Workflow approved message`}
           value={
             messages.workflow_approval?.approved?.message ||
             defaults.workflow_approval.approved.message
@@ -459,7 +442,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showBodies && (
         <CodeDetail
-          label={i18n._(t`Workflow approved message body`)}
+          label={t`Workflow approved message body`}
           value={
             messages.workflow_approval?.approved?.body ||
             defaults.workflow_approval.approved.body
@@ -471,7 +454,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showMessages && (
         <CodeDetail
-          label={i18n._(t`Workflow denied message`)}
+          label={t`Workflow denied message`}
           value={
             messages.workflow_approval?.denied?.message ||
             defaults.workflow_approval.denied.message
@@ -483,7 +466,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showBodies && (
         <CodeDetail
-          label={i18n._(t`Workflow denied message body`)}
+          label={t`Workflow denied message body`}
           value={
             messages.workflow_approval?.denied?.body ||
             defaults.workflow_approval.denied.body
@@ -495,7 +478,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showMessages && (
         <CodeDetail
-          label={i18n._(t`Workflow pending message`)}
+          label={t`Workflow pending message`}
           value={
             messages.workflow_approval?.running?.message ||
             defaults.workflow_approval.running.message
@@ -507,7 +490,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showBodies && (
         <CodeDetail
-          label={i18n._(t`Workflow pending message body`)}
+          label={t`Workflow pending message body`}
           value={
             messages.workflow_approval?.running?.body ||
             defaults.workflow_approval.running.body
@@ -519,7 +502,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showMessages && (
         <CodeDetail
-          label={i18n._(t`Workflow timed out message`)}
+          label={t`Workflow timed out message`}
           value={
             messages.workflow_approval?.timed_out?.message ||
             defaults.workflow_approval.timed_out.message
@@ -531,7 +514,7 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
       )}
       {showBodies && (
         <CodeDetail
-          label={i18n._(t`Workflow timed out message body`)}
+          label={t`Workflow timed out message body`}
           value={
             messages.workflow_approval?.timed_out?.body ||
             defaults.workflow_approval.timed_out.body
@@ -545,4 +528,4 @@ function CustomMessageDetails({ messages, defaults, type, i18n }) {
   );
 }
 
-export default withI18n()(NotificationTemplateDetail);
+export default NotificationTemplateDetail;
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.jsx
index c2d3a66690..849290a166 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateList.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useLocation, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Alert,
@@ -32,7 +32,7 @@ const QS_CONFIG = getQSConfig('notification-templates', {
   order_by: 'name',
 });
 
-function NotificationTemplatesList({ i18n }) {
+function NotificationTemplatesList() {
   const location = useLocation();
   const match = useRouteMatch();
   const [testToasts, setTestToasts] = useState([]);
@@ -131,41 +131,41 @@ function NotificationTemplatesList({ i18n }) {
             hasContentLoading={isTemplatesLoading || isDeleteLoading}
             items={templates}
             itemCount={count}
-            pluralizedItemName={i18n._(t`Notification Templates`)}
+            pluralizedItemName={t`Notification Templates`}
             qsConfig={QS_CONFIG}
             onRowClick={handleSelect}
             toolbarSearchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Description`),
+                name: t`Description`,
                 key: 'description__icontains',
               },
               {
-                name: i18n._(t`Notification type`),
+                name: t`Notification type`,
                 key: 'or__notification_type',
                 options: [
-                  ['email', i18n._(t`Email`)],
-                  ['grafana', i18n._(t`Grafana`)],
-                  ['hipchat', i18n._(t`Hipchat`)],
-                  ['irc', i18n._(t`IRC`)],
-                  ['mattermost', i18n._(t`Mattermost`)],
-                  ['pagerduty', i18n._(t`Pagerduty`)],
-                  ['rocketchat', i18n._(t`Rocket.Chat`)],
-                  ['slack', i18n._(t`Slack`)],
-                  ['twilio', i18n._(t`Twilio`)],
-                  ['webhook', i18n._(t`Webhook`)],
+                  ['email', t`Email`],
+                  ['grafana', t`Grafana`],
+                  ['hipchat', t`Hipchat`],
+                  ['irc', t`IRC`],
+                  ['mattermost', t`Mattermost`],
+                  ['pagerduty', t`Pagerduty`],
+                  ['rocketchat', t`Rocket.Chat`],
+                  ['slack', t`Slack`],
+                  ['twilio', t`Twilio`],
+                  ['webhook', t`Webhook`],
                 ],
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: t`Created by (username)`,
                 key: 'created_by__username__icontains',
               },
               {
-                name: i18n._(t`Modified by (username)`),
+                name: t`Modified by (username)`,
                 key: 'modified_by__username__icontains',
               },
             ]}
@@ -186,19 +186,17 @@ function NotificationTemplatesList({ i18n }) {
                     key="delete"
                     onDelete={handleDelete}
                     itemsToDelete={selected}
-                    pluralizedItemName={i18n._(t`Notification Templates`)}
+                    pluralizedItemName={t`Notification Templates`}
                   />,
                 ]}
               />
             )}
             headerRow={
               <HeaderRow qsConfig={QS_CONFIG}>
-                <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
-                <HeaderCell>{i18n._(t`Status`)}</HeaderCell>
-                <HeaderCell sortKey="notification_type">
-                  {i18n._(t`Type`)}
-                </HeaderCell>
-                <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
+                <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
+                <HeaderCell>{t`Status`}</HeaderCell>
+                <HeaderCell sortKey="notification_type">{t`Type`}</HeaderCell>
+                <HeaderCell>{t`Actions`}</HeaderCell>
               </HeaderRow>
             }
             renderRow={(template, index) => (
@@ -222,10 +220,10 @@ function NotificationTemplatesList({ i18n }) {
       <AlertModal
         isOpen={deletionError}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={clearDeletionError}
       >
-        {i18n._(t`Failed to delete one or more notification template.`)}
+        {t`Failed to delete one or more notification template.`}
         <ErrorDetail error={deletionError} />
       </AlertModal>
       <AlertGroup data-cy={alertGroupDataCy} isToast>
@@ -247,11 +245,11 @@ function NotificationTemplatesList({ i18n }) {
             >
               <>
                 {notification.status === 'successful' && (
-                  <p>{i18n._(t`Notification sent successfully`)}</p>
+                  <p>{t`Notification sent successfully`}</p>
                 )}
                 {notification.status === 'failed' &&
                   notification?.error === 'timed out' && (
-                    <p>{i18n._(t`Notification timed out`)}</p>
+                    <p>{t`Notification timed out`}</p>
                   )}
                 {notification.status === 'failed' &&
                   notification?.error !== 'timed out' && (
@@ -265,4 +263,4 @@ function NotificationTemplatesList({ i18n }) {
   );
 }
 
-export default withI18n()(NotificationTemplatesList);
+export default NotificationTemplatesList;
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.jsx
index 025e4b7465..c2f783b583 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React, { useState, useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
@@ -27,7 +27,6 @@ function NotificationTemplateListItem({
   isSelected,
   onSelect,
   rowIndex,
-  i18n,
 }) {
   const recentNotifications = template.summary_fields?.recent_notifications;
   const latestStatus = recentNotifications
@@ -102,25 +101,25 @@ function NotificationTemplateListItem({
             isSelected,
             onSelect,
           }}
-          dataLabel={i18n._(t`Selected`)}
+          dataLabel={t`Selected`}
         />
-        <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+        <Td id={labelId} dataLabel={t`Name`}>
           <Link to={`${detailUrl}`}>
             <b>{template.name}</b>
           </Link>
         </Td>
-        <Td dataLabel={i18n._(t`Status`)}>
+        <Td dataLabel={t`Status`}>
           {status && <StatusLabel status={status} />}
         </Td>
-        <Td dataLabel={i18n._(t`Type`)}>
+        <Td dataLabel={t`Type`}>
           {NOTIFICATION_TYPES[template.notification_type] ||
             template.notification_type}
         </Td>
-        <ActionsTd dataLabel={i18n._(t`Actions`)}>
-          <ActionItem visible tooltip={i18n._(t`Test notification`)}>
+        <ActionsTd dataLabel={t`Actions`}>
+          <ActionItem visible tooltip={t`Test notification`}>
             <Button
               ouiaId={`notification-test-button-${template.id}`}
-              aria-label={i18n._(t`Test Notification`)}
+              aria-label={t`Test Notification`}
               variant="plain"
               onClick={sendTestNotification}
               isDisabled={isLoading || status === 'running'}
@@ -130,11 +129,11 @@ function NotificationTemplateListItem({
           </ActionItem>
           <ActionItem
             visible={template.summary_fields.user_capabilities.edit}
-            tooltip={i18n._(t`Edit`)}
+            tooltip={t`Edit`}
           >
             <Button
               ouiaId={`notification-edit-button-${template.id}`}
-              aria-label={i18n._(t`Edit Notification Template`)}
+              aria-label={t`Edit Notification Template`}
               variant="plain"
               component={Link}
               to={`/notification_templates/${template.id}/edit`}
@@ -144,7 +143,7 @@ function NotificationTemplateListItem({
           </ActionItem>
           <ActionItem
             visible={template.summary_fields.user_capabilities.copy}
-            tooltip={i18n._(t`Copy Notification Template`)}
+            tooltip={t`Copy Notification Template`}
           >
             <CopyButton
               ouiaId={`notification-copy-button-${template.id}`}
@@ -152,7 +151,7 @@ function NotificationTemplateListItem({
               isCopyDisabled={isCopyDisabled}
               onCopyStart={handleCopyStart}
               onCopyFinish={handleCopyFinish}
-              errorMessage={i18n._(t`Failed to copy template.`)}
+              errorMessage={t`Failed to copy template.`}
             />
           </ActionItem>
         </ActionsTd>
@@ -161,10 +160,10 @@ function NotificationTemplateListItem({
         <AlertModal
           isOpen
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to send test notification.`)}
+          {t`Failed to send test notification.`}
           <ErrorDetail error={sendTestError} />
         </AlertModal>
       )}
@@ -172,4 +171,4 @@ function NotificationTemplateListItem({
   );
 }
 
-export default withI18n()(NotificationTemplateListItem);
+export default NotificationTemplateListItem;
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx
index 9d41166d1d..a0aad9b236 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx
@@ -1,34 +1,29 @@
 import React, { useState, useCallback } from 'react';
 import { Route, Switch, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import NotificationTemplateList from './NotificationTemplateList';
 import NotificationTemplateAdd from './NotificationTemplateAdd';
 import NotificationTemplate from './NotificationTemplate';
 import ScreenHeader from '../../components/ScreenHeader/ScreenHeader';
 
-function NotificationTemplates({ i18n }) {
+function NotificationTemplates() {
   const match = useRouteMatch();
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/notification_templates': i18n._(t`Notification Templates`),
-    '/notification_templates/add': i18n._(t`Create New Notification Template`),
+    '/notification_templates': t`Notification Templates`,
+    '/notification_templates/add': t`Create New Notification Template`,
   });
 
-  const updateBreadcrumbConfig = useCallback(
-    notification => {
-      const { id } = notification;
-      setBreadcrumbConfig({
-        '/notification_templates': i18n._(t`Notification Templates`),
-        '/notification_templates/add': i18n._(
-          t`Create New Notification Template`
-        ),
-        [`/notification_templates/${id}`]: notification.name,
-        [`/notification_templates/${id}/edit`]: i18n._(t`Edit Details`),
-        [`/notification_templates/${id}/details`]: i18n._(t`Details`),
-      });
-    },
-    [i18n]
-  );
+  const updateBreadcrumbConfig = useCallback(notification => {
+    const { id } = notification;
+    setBreadcrumbConfig({
+      '/notification_templates': t`Notification Templates`,
+      '/notification_templates/add': t`Create New Notification Template`,
+      [`/notification_templates/${id}`]: notification.name,
+      [`/notification_templates/${id}/edit`]: t`Edit Details`,
+      [`/notification_templates/${id}/details`]: t`Details`,
+    });
+  }, []);
 
   return (
     <>
@@ -51,4 +46,4 @@ function NotificationTemplates({ i18n }) {
   );
 }
 
-export default withI18n()(NotificationTemplates);
+export default NotificationTemplates;
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
index 89d92b8c06..1bae493cdb 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React, { useEffect, useRef } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField, useFormikContext } from 'formik';
 import { Switch, Text } from '@patternfly/react-core';
@@ -12,7 +12,7 @@ import CodeEditorField from '../../../components/CodeEditor/CodeEditorField';
 import { useConfig } from '../../../contexts/Config';
 import getDocsBaseUrl from '../../../util/getDocsBaseUrl';
 
-function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
+function CustomMessagesSubForm({ defaultMessages, type }) {
   const [useCustomField, , useCustomHelpers] = useField('useCustomMessages');
   const showMessages = type !== 'webhook';
   const showBodies = ['email', 'pagerduty', 'webhook'].includes(type);
@@ -61,7 +61,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
     <>
       <Switch
         id="toggle-custom-messages"
-        label={i18n._(t`Customize messages…`)}
+        label={t`Customize messages…`}
         isChecked={!!useCustomField.value}
         onChange={() => useCustomHelpers.setValue(!useCustomField.value)}
       />
@@ -72,9 +72,9 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
             css="margin-bottom: var(--pf-c-content--MarginBottom)"
           >
             <small>
-              {i18n._(t`Use custom messages to change the content of
+              {t`Use custom messages to change the content of
                 notifications sent when a job starts, succeeds, or fails. Use
-                curly braces to access information about the job:`)}{' '}
+                curly braces to access information about the job:`}{' '}
               <code>
                 {'{{'} job_friendly_name {'}}'}
               </code>
@@ -87,8 +87,8 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
                 {'{{'} job.status {'}}'}
               </code>
               .{' '}
-              {i18n._(t`You may apply a number of possible variables in the
-                message. For more information, refer to the`)}{' '}
+              {t`You may apply a number of possible variables in the
+                message. For more information, refer to the`}{' '}
               <a
                 target="_blank"
                 rel="noopener noreferrer"
@@ -96,7 +96,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
                   config
                 )}/html/userguide/notifications.html#create-custom-notifications`}
               >
-                {i18n._(t`Documentation.`)}
+                {t`Ansible Tower Documentation.`}
               </a>
             </small>
           </Text>
@@ -105,7 +105,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="start-message"
                 name="messages.started.message"
-                label={i18n._(t`Start message`)}
+                label={t`Start message`}
                 mode="jinja2"
                 rows={2}
               />
@@ -114,7 +114,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="start-body"
                 name="messages.started.body"
-                label={i18n._(t`Start message body`)}
+                label={t`Start message body`}
                 mode="jinja2"
                 rows={6}
               />
@@ -123,7 +123,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="success-message"
                 name="messages.success.message"
-                label={i18n._(t`Success message`)}
+                label={t`Success message`}
                 mode="jinja2"
                 rows={2}
               />
@@ -132,7 +132,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="success-body"
                 name="messages.success.body"
-                label={i18n._(t`Success message body`)}
+                label={t`Success message body`}
                 mode="jinja2"
                 rows={6}
               />
@@ -141,7 +141,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="error-message"
                 name="messages.error.message"
-                label={i18n._(t`Error message`)}
+                label={t`Error message`}
                 mode="jinja2"
                 rows={2}
               />
@@ -150,7 +150,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="error-body"
                 name="messages.error.body"
-                label={i18n._(t`Error message body`)}
+                label={t`Error message body`}
                 mode="jinja2"
                 rows={6}
               />
@@ -159,7 +159,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="wf-approved-message"
                 name="messages.workflow_approval.approved.message"
-                label={i18n._(t`Workflow approved message`)}
+                label={t`Workflow approved message`}
                 mode="jinja2"
                 rows={2}
               />
@@ -168,7 +168,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="wf-approved-body"
                 name="messages.workflow_approval.approved.body"
-                label={i18n._(t`Workflow approved message body`)}
+                label={t`Workflow approved message body`}
                 mode="jinja2"
                 rows={6}
               />
@@ -177,7 +177,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="wf-denied-message"
                 name="messages.workflow_approval.denied.message"
-                label={i18n._(t`Workflow denied message`)}
+                label={t`Workflow denied message`}
                 mode="jinja2"
                 rows={2}
               />
@@ -186,7 +186,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="wf-denied-body"
                 name="messages.workflow_approval.denied.body"
-                label={i18n._(t`Workflow denied message body`)}
+                label={t`Workflow denied message body`}
                 mode="jinja2"
                 rows={6}
               />
@@ -195,7 +195,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="wf-running-message"
                 name="messages.workflow_approval.running.message"
-                label={i18n._(t`Workflow pending message`)}
+                label={t`Workflow pending message`}
                 mode="jinja2"
                 rows={2}
               />
@@ -204,7 +204,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="wf-running-body"
                 name="messages.workflow_approval.running.body"
-                label={i18n._(t`Workflow pending message body`)}
+                label={t`Workflow pending message body`}
                 mode="jinja2"
                 rows={6}
               />
@@ -213,7 +213,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="wf-timed-out-message"
                 name="messages.workflow_approval.timed_out.message"
-                label={i18n._(t`Workflow timed out message`)}
+                label={t`Workflow timed out message`}
                 mode="jinja2"
                 rows={2}
               />
@@ -222,7 +222,7 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
               <CodeEditorField
                 id="wf-timed-out-body"
                 name="messages.workflow_approval.timed_out.body"
-                label={i18n._(t`Workflow timed out message body`)}
+                label={t`Workflow timed out message body`}
                 mode="jinja2"
                 rows={6}
               />
@@ -234,4 +234,4 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
   );
 }
 
-export default withI18n()(CustomMessagesSubForm);
+export default CustomMessagesSubForm;
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index fa100189b5..58cb0a90e1 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { shape, func } from 'prop-types';
 import { Formik, useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Form, FormGroup } from '@patternfly/react-core';
 
@@ -16,12 +16,12 @@ import CustomMessagesSubForm from './CustomMessagesSubForm';
 import hasCustomMessages from './hasCustomMessages';
 import typeFieldNames, { initialConfigValues } from './typeFieldNames';
 
-function NotificationTemplateFormFields({ i18n, defaultMessages, template }) {
+function NotificationTemplateFormFields({ defaultMessages, template }) {
   const { setFieldValue } = useFormikContext();
   const [orgField, orgMeta, orgHelpers] = useField('organization');
   const [typeField, typeMeta] = useField({
     name: 'notification_type',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   const onOrganizationChange = useCallback(
@@ -37,15 +37,15 @@ function NotificationTemplateFormFields({ i18n, defaultMessages, template }) {
         id="notification-name"
         name="name"
         type="text"
-        label={i18n._(t`Name`)}
-        validate={required(null, i18n)}
+        label={t`Name`}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="notification-description"
         name="description"
         type="text"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
       />
       <OrganizationLookup
         helperTextInvalid={orgMeta.error}
@@ -63,7 +63,7 @@ function NotificationTemplateFormFields({ i18n, defaultMessages, template }) {
         helperTextInvalid={typeMeta.error}
         isRequired
         validated={!typeMeta.touched || !typeMeta.error ? 'default' : 'error'}
-        label={i18n._(t`Type`)}
+        label={t`Type`}
       >
         <AnsibleSelect
           {...typeField}
@@ -73,10 +73,10 @@ function NotificationTemplateFormFields({ i18n, defaultMessages, template }) {
             {
               value: '',
               key: 'none',
-              label: i18n._(t`Choose a Notification Type`),
+              label: t`Choose a Notification Type`,
               isDisabled: true,
             },
-            { value: 'email', key: 'email', label: i18n._(t`E-mail`) },
+            { value: 'email', key: 'email', label: t`E-mail` },
             { value: 'grafana', key: 'grafana', label: 'Grafana' },
             { value: 'irc', key: 'irc', label: 'IRC' },
             { value: 'mattermost', key: 'mattermost', label: 'Mattermost' },
@@ -103,7 +103,6 @@ function NotificationTemplateForm({
   onSubmit,
   onCancel,
   submitError,
-  i18n,
 }) {
   const handleSubmit = values => {
     onSubmit(
@@ -184,7 +183,6 @@ function NotificationTemplateForm({
         <Form autoComplete="off" onSubmit={formik.handleSubmit}>
           <FormColumnLayout>
             <NotificationTemplateFormFields
-              i18n={i18n}
               defaultMessages={defaultMessages}
               template={template}
             />
@@ -217,7 +215,7 @@ NotificationTemplateForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(NotificationTemplateForm);
+export default NotificationTemplateForm;
 
 function normalizeFields(values, defaultMessages) {
   return normalizeTypeFields(normalizeMessageFields(values, defaultMessages));
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
index 0c29b52951..b7f8b4a1be 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import { FormGroup, Title } from '@patternfly/react-core';
@@ -36,15 +36,15 @@ const TypeFields = {
   webhook: WebhookFields,
 };
 
-function TypeInputsSubForm({ type, i18n }) {
+function TypeInputsSubForm({ type }) {
   const Fields = TypeFields[type];
   return (
     <SubFormLayout>
       <Title size="md" headingLevel="h4">
-        {i18n._(t`Type Details`)}
+        {t`Type Details`}
       </Title>
       <FormColumnLayout>
-        <Fields i18n={i18n} />
+        <Fields />
       </FormColumnLayout>
     </SubFormLayout>
   );
@@ -53,75 +53,75 @@ TypeInputsSubForm.propTypes = {
   type: NotificationType.isRequired,
 };
 
-export default withI18n()(TypeInputsSubForm);
+export default TypeInputsSubForm;
 
-function EmailFields({ i18n }) {
+function EmailFields() {
   const [optionsField, optionsMeta] = useField({
     name: 'emailOptions',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   return (
     <>
       <FormField
         id="email-username"
-        label={i18n._(t`Username`)}
+        label={t`Username`}
         name="notification_configuration.username"
         type="text"
       />
       <PasswordField
         id="email-password"
-        label={i18n._(t`Password`)}
+        label={t`Password`}
         name="notification_configuration.password"
       />
       <FormField
         id="email-host"
-        label={i18n._(t`Host`)}
+        label={t`Host`}
         name="notification_configuration.host"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <ArrayTextField
         id="email-recipients"
-        label={i18n._(t`Recipient list`)}
+        label={t`Recipient list`}
         name="notification_configuration.recipients"
         type="textarea"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
         rows={3}
-        tooltip={i18n._(t`Enter one email address per line to create a recipient
-          list for this type of notification.`)}
+        tooltip={t`Enter one email address per line to create a recipient
+          list for this type of notification.`}
       />
       <FormField
         id="email-sender"
-        label={i18n._(t`Sender e-mail`)}
+        label={t`Sender e-mail`}
         name="notification_configuration.sender"
         type="text"
-        validate={requiredEmail(i18n)}
+        validate={requiredEmail()}
         isRequired
       />
       <FormField
         id="email-port"
-        label={i18n._(t`Port`)}
+        label={t`Port`}
         name="notification_configuration.port"
         type="number"
-        validate={combine([required(null, i18n), minMaxValue(1, 65535, i18n)])}
+        validate={combine([required(null), minMaxValue(1, 65535)])}
         isRequired
         min="0"
         max="65535"
       />
       <FormField
         id="email-timeout"
-        label={i18n._(t`Timeout`)}
+        label={t`Timeout`}
         name="notification_configuration.timeout"
         type="number"
-        validate={combine([required(null, i18n), minMaxValue(1, 120, i18n)])}
+        validate={combine([required(null), minMaxValue(1, 120)])}
         isRequired
         min="1"
         max="120"
-        tooltip={i18n._(t`The amount of time (in seconds) before the email
+        tooltip={t`The amount of time (in seconds) before the email
           notification stops trying to reach the host and times out. Ranges
-          from 1 to 120 seconds.`)}
+          from 1 to 120 seconds.`}
       />
       <FormGroup
         fieldId="email-options"
@@ -130,7 +130,7 @@ function EmailFields({ i18n }) {
         validated={
           !optionsMeta.touched || !optionsMeta.error ? 'default' : 'error'
         }
-        label={i18n._(t`E-mail options`)}
+        label={t`E-mail options`}
       >
         <AnsibleSelect
           {...optionsField}
@@ -139,11 +139,11 @@ function EmailFields({ i18n }) {
             {
               value: '',
               key: '',
-              label: i18n._(t`Choose an email option`),
+              label: t`Choose an email option`,
               isDisabled: true,
             },
-            { value: 'tls', key: 'tls', label: i18n._(t`Use TLS`) },
-            { value: 'ssl', key: 'ssl', label: i18n._(t`Use SSL`) },
+            { value: 'tls', key: 'tls', label: t`Use TLS` },
+            { value: 'ssl', key: 'ssl', label: t`Use SSL` },
           ]}
         />
       </FormGroup>
@@ -151,332 +151,332 @@ function EmailFields({ i18n }) {
   );
 }
 
-function GrafanaFields({ i18n }) {
+function GrafanaFields() {
   return (
     <>
       <FormField
         id="grafana-url"
-        label={i18n._(t`Grafana URL`)}
+        label={t`Grafana URL`}
         name="notification_configuration.grafana_url"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
-        tooltip={i18n._(t`The base URL of the Grafana server - the
+        tooltip={t`The base URL of the Grafana server - the
         /api/annotations endpoint will be added automatically to the base
-        Grafana URL.`)}
+        Grafana URL.`}
       />
       <PasswordField
         id="grafana-key"
-        label={i18n._(t`Grafana API key`)}
+        label={t`Grafana API key`}
         name="notification_configuration.grafana_key"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="grafana-dashboard-id"
-        label={i18n._(t`ID of the dashboard (optional)`)}
+        label={t`ID of the dashboard (optional)`}
         name="notification_configuration.dashboardId"
         type="text"
       />
       <FormField
         id="grafana-panel-id"
-        label={i18n._(t`ID of the panel (optional)`)}
+        label={t`ID of the panel (optional)`}
         name="notification_configuration.panelId"
         type="text"
       />
       <ArrayTextField
         id="grafana-tags"
-        label={i18n._(t`Tags for the annotation (optional)`)}
+        label={t`Tags for the annotation (optional)`}
         name="notification_configuration.annotation_tags"
         type="textarea"
         rows={3}
-        tooltip={i18n._(t`Enter one Annotation Tag per line, without commas.`)}
+        tooltip={t`Enter one Annotation Tag per line, without commas.`}
       />
       <CheckboxField
         id="grafana-ssl"
-        label={i18n._(t`Disable SSL verification`)}
+        label={t`Disable SSL verification`}
         name="notification_configuration.grafana_no_verify_ssl"
       />
     </>
   );
 }
 
-function IRCFields({ i18n }) {
+function IRCFields() {
   return (
     <>
       <PasswordField
         id="irc-password"
-        label={i18n._(t`IRC server password`)}
+        label={t`IRC server password`}
         name="notification_configuration.password"
       />
       <FormField
         id="irc-port"
-        label={i18n._(t`IRC server port`)}
+        label={t`IRC server port`}
         name="notification_configuration.port"
         type="number"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
         min="0"
       />
       <FormField
         id="irc-server"
-        label={i18n._(t`IRC server address`)}
+        label={t`IRC server address`}
         name="notification_configuration.server"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="irc-nickname"
-        label={i18n._(t`IRC nick`)}
+        label={t`IRC nick`}
         name="notification_configuration.nickname"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <ArrayTextField
         id="irc-targets"
-        label={i18n._(t`Destination channels or users`)}
+        label={t`Destination channels or users`}
         name="notification_configuration.targets"
         type="textarea"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
-        tooltip={i18n._(t`Enter one IRC channel or username per line. The pound
+        tooltip={t`Enter one IRC channel or username per line. The pound
           symbol (#) for channels, and the at (@) symbol for users, are not
-          required.`)}
+          required.`}
       />
       <CheckboxField
         id="grafana-ssl"
-        label={i18n._(t`Disable SSL verification`)}
+        label={t`Disable SSL verification`}
         name="notification_configuration.use_ssl"
       />
     </>
   );
 }
 
-function MattermostFields({ i18n }) {
+function MattermostFields() {
   return (
     <>
       <FormField
         id="mattermost-url"
-        label={i18n._(t`Target URL`)}
+        label={t`Target URL`}
         name="notification_configuration.mattermost_url"
         type="text"
-        validate={combine([required(null, i18n), url(i18n)])}
+        validate={combine([required(null), url()])}
         isRequired
       />
       <FormField
         id="mattermost-username"
-        label={i18n._(t`Username`)}
+        label={t`Username`}
         name="notification_configuration.mattermost_username"
         type="text"
       />
       <FormField
         id="mattermost-channel"
-        label={i18n._(t`Channel`)}
+        label={t`Channel`}
         name="notification_configuration.mattermost_channel"
         type="text"
       />
       <FormField
         id="mattermost-icon"
-        label={i18n._(t`Icon URL`)}
+        label={t`Icon URL`}
         name="notification_configuration.mattermost_icon_url"
         type="text"
-        validate={url(i18n)}
+        validate={url()}
       />
       <CheckboxField
         id="mattermost-ssl"
-        label={i18n._(t`Disable SSL verification`)}
+        label={t`Disable SSL verification`}
         name="notification_configuration.mattermost_no_verify_ssl"
       />
     </>
   );
 }
 
-function PagerdutyFields({ i18n }) {
+function PagerdutyFields() {
   return (
     <>
       <PasswordField
         id="pagerduty-token"
-        label={i18n._(t`API Token`)}
+        label={t`API Token`}
         name="notification_configuration.token"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="pagerduty-subdomain"
-        label={i18n._(t`Pagerduty subdomain`)}
+        label={t`Pagerduty subdomain`}
         name="notification_configuration.subdomain"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="pagerduty-service-key"
-        label={i18n._(t`API service/integration key`)}
+        label={t`API service/integration key`}
         name="notification_configuration.service_key"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="pagerduty-identifier"
-        label={i18n._(t`Client identifier`)}
+        label={t`Client identifier`}
         name="notification_configuration.client_name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
     </>
   );
 }
 
-function RocketChatFields({ i18n }) {
+function RocketChatFields() {
   return (
     <>
       <FormField
         id="rocketchat-url"
-        label={i18n._(t`Target URL`)}
+        label={t`Target URL`}
         name="notification_configuration.rocketchat_url"
         type="text"
-        validate={combine([required(null, i18n), url(i18n)])}
+        validate={combine([required(null), url()])}
         isRequired
       />
       <FormField
         id="rocketchat-username"
-        label={i18n._(t`Username`)}
+        label={t`Username`}
         name="notification_configuration.rocketchat_username"
         type="text"
       />
       <FormField
         id="rocketchat-icon-url"
-        label={i18n._(t`Icon URL`)}
+        label={t`Icon URL`}
         name="notification_configuration.rocketchat_icon_url"
         type="text"
-        validate={url(i18n)}
+        validate={url()}
       />
       <CheckboxField
         id="rocketchat-ssl"
-        label={i18n._(t`Disable SSL verification`)}
+        label={t`Disable SSL verification`}
         name="notification_configuration.rocketchat_no_verify_ssl"
       />
     </>
   );
 }
 
-function SlackFields({ i18n }) {
+function SlackFields() {
   return (
     <>
       <ArrayTextField
         id="slack-channels"
-        label={i18n._(t`Destination channels`)}
+        label={t`Destination channels`}
         name="notification_configuration.channels"
         type="textarea"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
-        tooltip={i18n._(t`Enter one Slack channel per line. The pound symbol (#)
-          is required for channels.`)}
+        tooltip={t`Enter one Slack channel per line. The pound symbol (#)
+          is required for channels.`}
       />
       <PasswordField
         id="slack-token"
-        label={i18n._(t`Token`)}
+        label={t`Token`}
         name="notification_configuration.token"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="slack-color"
-        label={i18n._(t`Notification color`)}
+        label={t`Notification color`}
         name="notification_configuration.hex_color"
         type="text"
-        tooltip={i18n._(t`Specify a notification color. Acceptable colors are hex
-          color code (example: #3af or #789abc).`)}
+        tooltip={t`Specify a notification color. Acceptable colors are hex
+          color code (example: #3af or #789abc).`}
       />
     </>
   );
 }
 
-function TwilioFields({ i18n }) {
+function TwilioFields() {
   return (
     <>
       <PasswordField
         id="twilio-token"
-        label={i18n._(t`Account token`)}
+        label={t`Account token`}
         name="notification_configuration.account_token"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="twilio-from-phone"
-        label={i18n._(t`Source phone number`)}
+        label={t`Source phone number`}
         name="notification_configuration.from_number"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
-        tooltip={i18n._(t`Enter the number associated with the "Messaging
-          Service" in Twilio in the format +18005550199.`)}
+        tooltip={t`Enter the number associated with the "Messaging
+          Service" in Twilio in the format +18005550199.`}
       />
       <ArrayTextField
         id="twilio-destination-numbers"
-        label={i18n._(t`Destination SMS number(s)`)}
+        label={t`Destination SMS number(s)`}
         name="notification_configuration.to_numbers"
         type="textarea"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
-        tooltip={i18n._(t`Enter one phone number per line to specify where to
-          route SMS messages.`)}
+        tooltip={t`Enter one phone number per line to specify where to
+          route SMS messages.`}
       />
       <FormField
         id="twilio-account-sid"
-        label={i18n._(t`Account SID`)}
+        label={t`Account SID`}
         name="notification_configuration.account_sid"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
     </>
   );
 }
 
-function WebhookFields({ i18n }) {
+function WebhookFields() {
   const [methodField, methodMeta] = useField({
     name: 'notification_configuration.http_method',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   return (
     <>
       <FormField
         id="webhook-username"
-        label={i18n._(t`Username`)}
+        label={t`Username`}
         name="notification_configuration.username"
         type="text"
       />
       <PasswordField
         id="webhook-password"
-        label={i18n._(t`Basic auth password`)}
+        label={t`Basic auth password`}
         name="notification_configuration.password"
       />
       <FormField
         id="webhook-url"
-        label={i18n._(t`Target URL`)}
+        label={t`Target URL`}
         name="notification_configuration.url"
         type="text"
-        validate={combine([required(null, i18n), url(i18n)])}
+        validate={combine([required(null), url()])}
         isRequired
       />
       <CheckboxField
         id="webhook-ssl"
-        label={i18n._(t`Disable SSL verification`)}
+        label={t`Disable SSL verification`}
         name="notification_configuration.disable_ssl_verification"
       />
       <FormFullWidthLayout>
         <CodeEditorField
           id="webhook-headers"
           name="notification_configuration.headers"
-          label={i18n._(t`HTTP Headers`)}
+          label={t`HTTP Headers`}
           mode="javascript"
-          tooltip={i18n._(t`Specify HTTP Headers in JSON format. Refer to
-        the documentation for example syntax.`)}
+          tooltip={t`Specify HTTP Headers in JSON format. Refer to
+        the Ansible Tower documentation for example syntax.`}
           rows={5}
         />
       </FormFullWidthLayout>
@@ -487,7 +487,7 @@ function WebhookFields({ i18n }) {
         validated={
           !methodMeta.touched || !methodMeta.error ? 'default' : 'error'
         }
-        label={i18n._(t`HTTP Method`)}
+        label={t`HTTP Method`}
       >
         <AnsibleSelect
           {...methodField}
@@ -496,11 +496,11 @@ function WebhookFields({ i18n }) {
             {
               value: '',
               key: '',
-              label: i18n._(t`Choose an HTTP method`),
+              label: t`Choose an HTTP method`,
               isDisabled: true,
             },
-            { value: 'POST', key: 'post', label: i18n._(t`POST`) },
-            { value: 'PUT', key: 'put', label: i18n._(t`PUT`) },
+            { value: 'POST', key: 'post', label: t`POST` },
+            { value: 'PUT', key: 'put', label: t`PUT` },
           ]}
         />
       </FormGroup>
diff --git a/awx/ui_next/src/screens/Organization/Organization.jsx b/awx/ui_next/src/screens/Organization/Organization.jsx
index a826ef641d..10a6f73fa6 100644
--- a/awx/ui_next/src/screens/Organization/Organization.jsx
+++ b/awx/ui_next/src/screens/Organization/Organization.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useRef } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Switch,
@@ -24,7 +24,7 @@ import OrganizationTeams from './OrganizationTeams';
 import { OrganizationsAPI } from '../../api';
 import OrganizationExecEnvList from './OrganizationExecEnvList';
 
-function Organization({ i18n, setBreadcrumb, me }) {
+function Organization({ setBreadcrumb, me }) {
   const location = useLocation();
   const { id: organizationId } = useParams();
   const match = useRouteMatch();
@@ -114,17 +114,17 @@ function Organization({ i18n, setBreadcrumb, me }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Organizations`)}
+          {t`Back to Organizations`}
         </>
       ),
       link: `/organizations`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `${match.url}/details`, id: 0 },
-    { name: i18n._(t`Access`), link: `${match.url}/access`, id: 1 },
-    { name: i18n._(t`Teams`), link: `${match.url}/teams`, id: 2 },
+    { name: t`Details`, link: `${match.url}/details`, id: 0 },
+    { name: t`Access`, link: `${match.url}/access`, id: 1 },
+    { name: t`Teams`, link: `${match.url}/teams`, id: 2 },
     {
-      name: i18n._(t`Execution Environments`),
+      name: t`Execution Environments`,
       link: `${match.url}/execution_environments`,
       id: 4,
     },
@@ -132,7 +132,7 @@ function Organization({ i18n, setBreadcrumb, me }) {
 
   if (canSeeNotificationsTab) {
     tabsArray.push({
-      name: i18n._(t`Notifications`),
+      name: t`Notifications`,
       link: `${match.url}/notifications`,
       id: 3,
     });
@@ -151,10 +151,8 @@ function Organization({ i18n, setBreadcrumb, me }) {
           <ContentError error={organizationError}>
             {organizationError.response.status === 404 && (
               <span>
-                {i18n._(t`Organization not found.`)}{' '}
-                <Link to="/organizations">
-                  {i18n._(t`View all Organizations.`)}
-                </Link>
+                {t`Organization not found.`}{' '}
+                <Link to="/organizations">{t`View all Organizations.`}</Link>
               </span>
             )}
           </ContentError>
@@ -224,7 +222,7 @@ function Organization({ i18n, setBreadcrumb, me }) {
               <ContentError isNotFound>
                 {match.params.id && (
                   <Link to={`/organizations/${match.params.id}/details`}>
-                    {i18n._(t`View Organization Details`)}
+                    {t`View Organization Details`}
                   </Link>
                 )}
               </ContentError>
@@ -237,5 +235,5 @@ function Organization({ i18n, setBreadcrumb, me }) {
   );
 }
 
-export default withI18n()(withRouter(Organization));
+export default withRouter(Organization);
 export { Organization as _Organization };
diff --git a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx
index 0ba78a0c08..647b441075 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useCallback } from 'react';
 import { Link, useHistory, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Chip } from '@patternfly/react-core';
 import { OrganizationsAPI } from '../../../api';
@@ -22,7 +22,7 @@ import { useConfig } from '../../../contexts/Config';
 import ExecutionEnvironmentDetail from '../../../components/ExecutionEnvironmentDetail';
 import { relatedResourceDeleteRequests } from '../../../util/getRelatedResourceDeleteDetails';
 
-function OrganizationDetail({ i18n, organization }) {
+function OrganizationDetail({ organization }) {
   const {
     params: { id },
   } = useRouteMatch();
@@ -88,13 +88,13 @@ function OrganizationDetail({ i18n, organization }) {
     <CardBody>
       <DetailList>
         <Detail
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={name}
           dataCy="organization-detail-name"
         />
-        <Detail label={i18n._(t`Description`)} value={description} />
+        <Detail label={t`Description`} value={description} />
         {license_info?.license_type !== 'open' && (
-          <Detail label={i18n._(t`Max Hosts`)} value={`${max_hosts}`} />
+          <Detail label={t`Max Hosts`} value={`${max_hosts}`} />
         )}
         <ExecutionEnvironmentDetail
           virtualEnvironment={custom_virtualenv}
@@ -102,19 +102,19 @@ function OrganizationDetail({ i18n, organization }) {
           isDefaultEnvironment
         />
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={created}
           user={summary_fields.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={modified}
           user={summary_fields.modified_by}
         />
         {instanceGroups && instanceGroups.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Instance Groups`)}
+            label={t`Instance Groups`}
             value={
               <ChipGroup numChips={5} totalChips={instanceGroups.length}>
                 {instanceGroups.map(ig => (
@@ -129,7 +129,7 @@ function OrganizationDetail({ i18n, organization }) {
         {galaxy_credentials && galaxy_credentials.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Galaxy Credentials`)}
+            label={t`Galaxy Credentials`}
             value={
               <ChipGroup numChips={5} totalChips={galaxy_credentials.length}>
                 {galaxy_credentials.map(credential => (
@@ -148,26 +148,24 @@ function OrganizationDetail({ i18n, organization }) {
         {summary_fields.user_capabilities.edit && (
           <Button
             ouiaId="organization-detail-edit-button"
-            aria-label={i18n._(t`Edit`)}
+            aria-label={t`Edit`}
             component={Link}
             to={`/organizations/${id}/edit`}
           >
-            {i18n._(t`Edit`)}
+            {t`Edit`}
           </Button>
         )}
         {summary_fields.user_capabilities &&
           summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={name}
-              modalTitle={i18n._(t`Delete Organization`)}
+              modalTitle={t`Delete Organization`}
               onConfirm={deleteOrganization}
               isDisabled={isLoading}
               deleteDetailsRequests={deleteDetailsRequests}
-              deleteMessage={i18n._(
-                t`This organization is currently being by other resources. Are you sure you want to delete it?`
-              )}
+              deleteMessage={t`This organization is currently being by other resources. Are you sure you want to delete it?`}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -176,10 +174,10 @@ function OrganizationDetail({ i18n, organization }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete organization.`)}
+          {t`Failed to delete organization.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -187,4 +185,4 @@ function OrganizationDetail({ i18n, organization }) {
   );
 }
 
-export default withI18n()(OrganizationDetail);
+export default OrganizationDetail;
diff --git a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx
index d567c24097..7ab2a0ef4d 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Card } from '@patternfly/react-core';
 
@@ -18,7 +18,7 @@ const QS_CONFIG = getQSConfig('organizations', {
   order_by: 'name',
 });
 
-function OrganizationExecEnvList({ i18n, organization }) {
+function OrganizationExecEnvList({ organization }) {
   const { id } = organization;
   const location = useLocation();
 
@@ -74,45 +74,45 @@ function OrganizationExecEnvList({ i18n, organization }) {
           hasContentLoading={isLoading}
           items={executionEnvironments}
           itemCount={executionEnvironmentsCount}
-          pluralizedItemName={i18n._(t`Execution Environments`)}
+          pluralizedItemName={t`Execution Environments`}
           qsConfig={QS_CONFIG}
           toolbarSearchableKeys={searchableKeys}
           toolbarRelatedSearchableKeys={relatedSearchableKeys}
           toolbarSearchColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: 'name__icontains',
               isDefault: true,
             },
             {
-              name: i18n._(t`Image`),
+              name: t`Image`,
               key: 'image__icontains',
               isDefault: false,
             },
             {
-              name: i18n._(t`Created By (Username)`),
+              name: t`Created By (Username)`,
               key: 'created_by__username__icontains',
             },
             {
-              name: i18n._(t`Modified By (Username)`),
+              name: t`Modified By (Username)`,
               key: 'modified_by__username__icontains',
             },
           ]}
           toolbarSortColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: 'name',
             },
             {
-              name: i18n._(t`Image`),
+              name: t`Image`,
               key: 'image',
             },
             {
-              name: i18n._(t`Created`),
+              name: t`Created`,
               key: 'created',
             },
             {
-              name: i18n._(t`Modified`),
+              name: t`Modified`,
               key: 'modified',
             },
           ]}
@@ -132,4 +132,4 @@ function OrganizationExecEnvList({ i18n, organization }) {
   );
 }
 
-export default withI18n()(OrganizationExecEnvList);
+export default OrganizationExecEnvList;
diff --git a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.jsx b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.jsx
index da292712ea..02a630cf83 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationExecEnvList/OrganizationExecEnvListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { string } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 import {
@@ -12,11 +12,7 @@ import {
 import DataListCell from '../../../components/DataListCell';
 import { ExecutionEnvironment } from '../../../types';
 
-function OrganizationExecEnvListItem({
-  executionEnvironment,
-  detailUrl,
-  i18n,
-}) {
+function OrganizationExecEnvListItem({ executionEnvironment, detailUrl }) {
   const labelId = `check-action-${executionEnvironment.id}`;
 
   return (
@@ -28,17 +24,14 @@ function OrganizationExecEnvListItem({
       <DataListItemRow>
         <DataListItemCells
           dataListCells={[
-            <DataListCell
-              key="name"
-              aria-label={i18n._(t`Execution environment name`)}
-            >
+            <DataListCell key="name" aria-label={t`Execution environment name`}>
               <Link to={`${detailUrl}`}>
                 <b>{executionEnvironment.name}</b>
               </Link>
             </DataListCell>,
             <DataListCell
               key="image"
-              aria-label={i18n._(t`Execution environment image`)}
+              aria-label={t`Execution environment image`}
             >
               {executionEnvironment.image}
             </DataListCell>,
@@ -54,4 +47,4 @@ OrganizationExecEnvListItem.prototype = {
   detailUrl: string.isRequired,
 };
 
-export default withI18n()(OrganizationExecEnvListItem);
+export default OrganizationExecEnvListItem;
diff --git a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationListItem.jsx b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationListItem.jsx
index 86fb43cdf8..e1b966efea 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationListItem.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Tooltip } from '@patternfly/react-core';
 import { Tr, Td } from '@patternfly/react-table';
@@ -24,7 +24,6 @@ function OrganizationListItem({
   onSelect,
   rowIndex,
   detailUrl,
-  i18n,
 }) {
   const labelId = `check-action-${organization.id}`;
 
@@ -40,9 +39,9 @@ function OrganizationListItem({
           onSelect,
           disable: false,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         <span>
           <Link to={`${detailUrl}`}>
             <b>{organization.name}</b>
@@ -52,9 +51,7 @@ function OrganizationListItem({
           <span>
             <Tooltip
               className="missing-execution-environment"
-              content={i18n._(
-                t`Custom virtual environment ${organization.custom_virtualenv} must be replaced by an execution environment.`
-              )}
+              content={t`Custom virtual environment ${organization.custom_virtualenv} must be replaced by an execution environment.`}
               position="right"
             >
               <ExclamationTriangleIcon />
@@ -62,20 +59,20 @@ function OrganizationListItem({
           </span>
         )}
       </Td>
-      <Td dataLabel={i18n._(t`Members`)}>
+      <Td dataLabel={t`Members`}>
         {organization.summary_fields.related_field_counts.users}
       </Td>
-      <Td dataLabel={i18n._(t`Teams`)}>
+      <Td dataLabel={t`Teams`}>
         {organization.summary_fields.related_field_counts.teams}
       </Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)}>
+      <ActionsTd dataLabel={t`Actions`}>
         <ActionItem
           visible={organization.summary_fields.user_capabilities.edit}
-          tooltip={i18n._(t`Edit Organization`)}
+          tooltip={t`Edit Organization`}
         >
           <Button
             ouiaId={`${organization.id}-edit-button`}
-            aria-label={i18n._(t`Edit Organization`)}
+            aria-label={t`Edit Organization`}
             variant="plain"
             component={Link}
             to={`/organizations/${organization.id}/edit`}
@@ -95,4 +92,4 @@ OrganizationListItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(OrganizationListItem);
+export default OrganizationListItem;
diff --git a/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamList.jsx b/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamList.jsx
index 36f7e2317d..22a3f145b6 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamList.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamList.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { OrganizationsAPI } from '../../../api';
 import PaginatedDataList from '../../../components/PaginatedDataList';
@@ -15,7 +15,7 @@ const QS_CONFIG = getQSConfig('team', {
   order_by: 'name',
 });
 
-function OrganizationTeamList({ id, i18n }) {
+function OrganizationTeamList({ id }) {
   const location = useLocation();
 
   const {
@@ -59,26 +59,26 @@ function OrganizationTeamList({ id, i18n }) {
       hasContentLoading={isLoading}
       items={teams}
       itemCount={count}
-      pluralizedItemName={i18n._(t`Teams`)}
+      pluralizedItemName={t`Teams`}
       qsConfig={QS_CONFIG}
       toolbarSearchColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Created by (username)`),
+          name: t`Created by (username)`,
           key: 'created_by__username__icontains',
         },
         {
-          name: i18n._(t`Modified by (username)`),
+          name: t`Modified by (username)`,
           key: 'modified_by__username__icontains',
         },
       ]}
       toolbarSortColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ]}
@@ -101,4 +101,4 @@ OrganizationTeamList.propTypes = {
 };
 
 export { OrganizationTeamList as _OrganizationTeamList };
-export default withI18n()(OrganizationTeamList);
+export default OrganizationTeamList;
diff --git a/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamListItem.jsx b/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamListItem.jsx
index 586b7fe229..2009e33794 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamListItem.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeamListItem.jsx
@@ -10,11 +10,11 @@ import {
   Tooltip,
 } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { PencilAltIcon } from '@patternfly/react-icons';
 import DataListCell from '../../../components/DataListCell';
 
-function OrganizationTeamListItem({ i18n, team, detailUrl }) {
+function OrganizationTeamListItem({ team, detailUrl }) {
   const labelId = `check-action-${team.id}`;
 
   return (
@@ -25,22 +25,22 @@ function OrganizationTeamListItem({ i18n, team, detailUrl }) {
             <DataListCell key="divider">
               <span>
                 <Link to={`${detailUrl}/details`}>
-                  <b aria-label={i18n._(t`team name`)}>{team.name}</b>
+                  <b aria-label={t`team name`}>{team.name}</b>
                 </Link>
               </span>
             </DataListCell>,
           ]}
         />
         <DataListAction
-          aria-label={i18n._(t`actions`)}
+          aria-label={t`actions`}
           aria-labelledby={labelId}
           id={labelId}
         >
           {team.summary_fields.user_capabilities.edit && (
-            <Tooltip content={i18n._(t`Edit Team`)} position="top">
+            <Tooltip content={t`Edit Team`} position="top">
               <Button
                 ouiaId={`${team.id}-edit-button`}
-                aria-label={i18n._(t`Edit Team`)}
+                aria-label={t`Edit Team`}
                 css="grid-column: 2"
                 variant="plain"
                 component={Link}
@@ -62,4 +62,4 @@ OrganizationTeamListItem.propTypes = {
   detailUrl: PropTypes.string.isRequired,
 };
 
-export default withI18n()(OrganizationTeamListItem);
+export default OrganizationTeamListItem;
diff --git a/awx/ui_next/src/screens/Organization/Organizations.jsx b/awx/ui_next/src/screens/Organization/Organizations.jsx
index fcf1b8398b..0c3cc71325 100644
--- a/awx/ui_next/src/screens/Organization/Organizations.jsx
+++ b/awx/ui_next/src/screens/Organization/Organizations.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useState, Fragment } from 'react';
 import { Route, withRouter, Switch, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import { Config } from '../../contexts/Config';
@@ -10,38 +10,31 @@ import OrganizationsList from './OrganizationList/OrganizationList';
 import OrganizationAdd from './OrganizationAdd/OrganizationAdd';
 import Organization from './Organization';
 
-function Organizations({ i18n }) {
+function Organizations() {
   const match = useRouteMatch();
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/organizations': i18n._(t`Organizations`),
-    '/organizations/add': i18n._(t`Create New Organization`),
+    '/organizations': t`Organizations`,
+    '/organizations/add': t`Create New Organization`,
   });
 
-  const setBreadcrumb = useCallback(
-    organization => {
-      if (!organization) {
-        return;
-      }
+  const setBreadcrumb = useCallback(organization => {
+    if (!organization) {
+      return;
+    }
 
-      const breadcrumb = {
-        '/organizations': i18n._(t`Organizations`),
-        '/organizations/add': i18n._(t`Create New Organization`),
-        [`/organizations/${organization.id}`]: `${organization.name}`,
-        [`/organizations/${organization.id}/edit`]: i18n._(t`Edit Details`),
-        [`/organizations/${organization.id}/details`]: i18n._(t`Details`),
-        [`/organizations/${organization.id}/access`]: i18n._(t`Access`),
-        [`/organizations/${organization.id}/teams`]: i18n._(t`Teams`),
-        [`/organizations/${organization.id}/notifications`]: i18n._(
-          t`Notifications`
-        ),
-        [`/organizations/${organization.id}/execution_environments`]: i18n._(
-          t`Execution Environments`
-        ),
-      };
-      setBreadcrumbConfig(breadcrumb);
-    },
-    [i18n]
-  );
+    const breadcrumb = {
+      '/organizations': t`Organizations`,
+      '/organizations/add': t`Create New Organization`,
+      [`/organizations/${organization.id}`]: `${organization.name}`,
+      [`/organizations/${organization.id}/edit`]: t`Edit Details`,
+      [`/organizations/${organization.id}/details`]: t`Details`,
+      [`/organizations/${organization.id}/access`]: t`Access`,
+      [`/organizations/${organization.id}/teams`]: t`Teams`,
+      [`/organizations/${organization.id}/notifications`]: t`Notifications`,
+      [`/organizations/${organization.id}/execution_environments`]: t`Execution Environments`,
+    };
+    setBreadcrumbConfig(breadcrumb);
+  }, []);
 
   return (
     <Fragment>
@@ -69,4 +62,4 @@ function Organizations({ i18n }) {
 }
 
 export { Organizations as _Organizations };
-export default withI18n()(withRouter(Organizations));
+export default withRouter(Organizations);
diff --git a/awx/ui_next/src/screens/Organization/shared/OrganizationForm.jsx b/awx/ui_next/src/screens/Organization/shared/OrganizationForm.jsx
index 70b2f24ef8..32f1c57e37 100644
--- a/awx/ui_next/src/screens/Organization/shared/OrganizationForm.jsx
+++ b/awx/ui_next/src/screens/Organization/shared/OrganizationForm.jsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { Formik, useField, useFormikContext } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Form } from '@patternfly/react-core';
 
@@ -21,7 +21,6 @@ import { FormColumnLayout } from '../../../components/FormLayout';
 import CredentialLookup from '../../../components/Lookup/CredentialLookup';
 
 function OrganizationFormFields({
-  i18n,
   instanceGroups,
   setInstanceGroups,
   organizationId,
@@ -57,28 +56,26 @@ function OrganizationFormFields({
         id="org-name"
         name="name"
         type="text"
-        label={i18n._(t`Name`)}
-        validate={required(null, i18n)}
+        label={t`Name`}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="org-description"
         name="description"
         type="text"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
       />
       {license_info?.license_type !== 'open' && (
         <FormField
           id="org-max_hosts"
           name="max_hosts"
           type="number"
-          label={i18n._(t`Max Hosts`)}
-          tooltip={i18n._(
-            t`The maximum number of hosts allowed to be managed by this organization.
+          label={t`Max Hosts`}
+          tooltip={t`The maximum number of hosts allowed to be managed by this organization.
             Value defaults to 0 which means no limit. Refer to the Ansible
-            documentation for more details.`
-          )}
-          validate={minMaxValue(0, Number.MAX_SAFE_INTEGER, i18n)}
+            documentation for more details.`}
+          validate={minMaxValue(0, Number.MAX_SAFE_INTEGER)}
           me={me}
           isDisabled={!me.is_superuser}
         />
@@ -86,9 +83,7 @@ function OrganizationFormFields({
       <InstanceGroupsLookup
         value={instanceGroups}
         onChange={setInstanceGroups}
-        tooltip={i18n._(
-          t`Select the Instance Groups for this Organization to run on.`
-        )}
+        tooltip={t`Select the Instance Groups for this Organization to run on.`}
       />
       <ExecutionEnvironmentLookup
         helperTextInvalid={executionEnvironmentMeta.error}
@@ -98,16 +93,14 @@ function OrganizationFormFields({
         onBlur={() => executionEnvironmentHelpers.setTouched()}
         value={executionEnvironmentField.value}
         onChange={value => executionEnvironmentHelpers.setValue(value)}
-        popoverContent={i18n._(
-          t`Select the default execution environment for this organization.`
-        )}
+        popoverContent={t`Select the default execution environment for this organization.`}
         globallyAvailable
         organizationId={organizationId}
         isDefaultEnvironment
       />
       <CredentialLookup
         credentialTypeNamespace="galaxy_api_token"
-        label={i18n._(t`Galaxy Credentials`)}
+        label={t`Galaxy Credentials`}
         helperTextInvalid={galaxyCredentialsMeta.error}
         isValid={!galaxyCredentialsMeta.touched || !galaxyCredentialsMeta.error}
         onBlur={() => galaxyCredentialsHelpers.setTouched()}
@@ -234,4 +227,4 @@ OrganizationForm.defaultProps = {
 };
 
 export { OrganizationForm as _OrganizationForm };
-export default withI18n()(OrganizationForm);
+export default OrganizationForm;
diff --git a/awx/ui_next/src/screens/Project/Project.jsx b/awx/ui_next/src/screens/Project/Project.jsx
index 5c3a5a7564..85e218c8ed 100644
--- a/awx/ui_next/src/screens/Project/Project.jsx
+++ b/awx/ui_next/src/screens/Project/Project.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Switch,
@@ -25,7 +25,7 @@ import ProjectEdit from './ProjectEdit';
 import ProjectJobTemplatesList from './ProjectJobTemplatesList';
 import { OrganizationsAPI, ProjectsAPI } from '../../api';
 
-function Project({ i18n, setBreadcrumb }) {
+function Project({ setBreadcrumb }) {
   const { me = {} } = useConfig();
   const { id } = useParams();
   const location = useLocation();
@@ -96,31 +96,31 @@ function Project({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Projects`)}
+          {t`Back to Projects`}
         </>
       ),
       link: `/projects`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `/projects/${id}/details` },
-    { name: i18n._(t`Access`), link: `/projects/${id}/access` },
+    { name: t`Details`, link: `/projects/${id}/details` },
+    { name: t`Access`, link: `/projects/${id}/access` },
   ];
 
   if (canSeeNotificationsTab) {
     tabsArray.push({
-      name: i18n._(t`Notifications`),
+      name: t`Notifications`,
       link: `/projects/${id}/notifications`,
     });
   }
 
   tabsArray.push({
-    name: i18n._(t`Job Templates`),
+    name: t`Job Templates`,
     link: `/projects/${id}/job_templates`,
   });
 
   if (project?.scm_type) {
     tabsArray.push({
-      name: i18n._(t`Schedules`),
+      name: t`Schedules`,
       link: `/projects/${id}/schedules`,
     });
   }
@@ -136,8 +136,8 @@ function Project({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response.status === 404 && (
               <span>
-                {i18n._(t`Project not found.`)}{' '}
-                <Link to="/projects">{i18n._(t`View all Projects.`)}</Link>
+                {t`Project not found.`}{' '}
+                <Link to="/projects">{t`View all Projects.`}</Link>
               </span>
             )}
           </ContentError>
@@ -195,7 +195,7 @@ function Project({ i18n, setBreadcrumb }) {
               <ContentError isNotFound>
                 {id && (
                   <Link to={`/projects/${id}/details`}>
-                    {i18n._(t`View Project Details`)}
+                    {t`View Project Details`}
                   </Link>
                 )}
               </ContentError>
@@ -207,5 +207,5 @@ function Project({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(withRouter(Project));
+export default withRouter(Project);
 export { Project as _Project };
diff --git a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx
index 7e7c9a07be..22ae88d711 100644
--- a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useCallback } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, List, ListItem, Tooltip } from '@patternfly/react-core';
 import { Project } from '../../../types';
@@ -26,7 +26,7 @@ import StatusLabel from '../../../components/StatusLabel';
 import { formatDateString } from '../../../util/dates';
 import useWsProject from './useWsProject';
 
-function ProjectDetail({ project, i18n }) {
+function ProjectDetail({ project }) {
   const {
     allow_override,
     created,
@@ -68,21 +68,15 @@ function ProjectDetail({ project, i18n }) {
   ) {
     optionsList = (
       <List>
-        {scm_clean && <ListItem>{i18n._(t`Clean`)}</ListItem>}
-        {scm_delete_on_update && (
-          <ListItem>{i18n._(t`Delete on Update`)}</ListItem>
-        )}
+        {scm_clean && <ListItem>{t`Clean`}</ListItem>}
+        {scm_delete_on_update && <ListItem>{t`Delete on Update`}</ListItem>}
         {scm_track_submodules && (
-          <ListItem>
-            {i18n._(t`Track submodules latest commit on branch`)}
-          </ListItem>
+          <ListItem>{t`Track submodules latest commit on branch`}</ListItem>
         )}
         {scm_update_on_launch && (
-          <ListItem>{i18n._(t`Update Revision on Launch`)}</ListItem>
-        )}
-        {allow_override && (
-          <ListItem>{i18n._(t`Allow Branch Override`)}</ListItem>
+          <ListItem>{t`Update Revision on Launch`}</ListItem>
         )}
+        {allow_override && <ListItem>{t`Allow Branch Override`}</ListItem>}
       </List>
     );
   }
@@ -90,16 +84,16 @@ function ProjectDetail({ project, i18n }) {
   const generateLastJobTooltip = job => {
     return (
       <Fragment>
-        <div>{i18n._(t`MOST RECENT SYNC`)}</div>
+        <div>{t`MOST RECENT SYNC`}</div>
         <div>
-          {i18n._(t`JOB ID:`)} {job.id}
+          {t`JOB ID:`} {job.id}
         </div>
         <div>
-          {i18n._(t`STATUS:`)} {job.status.toUpperCase()}
+          {t`STATUS:`} {job.status.toUpperCase()}
         </div>
         {job.finished && (
           <div>
-            {i18n._(t`FINISHED:`)} {formatDateString(job.finished)}
+            {t`FINISHED:`} {formatDateString(job.finished)}
           </div>
         )}
       </Fragment>
@@ -118,7 +112,7 @@ function ProjectDetail({ project, i18n }) {
     <CardBody>
       <DetailList gutter="sm">
         <Detail
-          label={i18n._(t`Last Job Status`)}
+          label={t`Last Job Status`}
           value={
             job && (
               <Tooltip
@@ -133,15 +127,11 @@ function ProjectDetail({ project, i18n }) {
             )
           }
         />
-        <Detail
-          label={i18n._(t`Name`)}
-          value={name}
-          dataCy="project-detail-name"
-        />
-        <Detail label={i18n._(t`Description`)} value={description} />
+        <Detail label={t`Name`} value={name} dataCy="project-detail-name" />
+        <Detail label={t`Description`} value={description} />
         {summary_fields.organization && (
           <Detail
-            label={i18n._(t`Organization`)}
+            label={t`Organization`}
             value={
               <Link
                 to={`/organizations/${summary_fields.organization.id}/details`}
@@ -152,17 +142,15 @@ function ProjectDetail({ project, i18n }) {
           />
         )}
         <Detail
-          label={i18n._(t`Source Control Type`)}
-          value={
-            scm_type === '' ? i18n._(t`Manual`) : toTitleCase(project.scm_type)
-          }
+          label={t`Source Control Type`}
+          value={scm_type === '' ? t`Manual` : toTitleCase(project.scm_type)}
         />
-        <Detail label={i18n._(t`Source Control URL`)} value={scm_url} />
-        <Detail label={i18n._(t`Source Control Branch`)} value={scm_branch} />
-        <Detail label={i18n._(t`Source Control Refspec`)} value={scm_refspec} />
+        <Detail label={t`Source Control URL`} value={scm_url} />
+        <Detail label={t`Source Control Branch`} value={scm_branch} />
+        <Detail label={t`Source Control Refspec`} value={scm_refspec} />
         {summary_fields.credential && (
           <Detail
-            label={i18n._(t`Source Control Credential`)}
+            label={t`Source Control Credential`}
             value={
               <CredentialChip
                 key={summary_fields.credential.id}
@@ -172,12 +160,10 @@ function ProjectDetail({ project, i18n }) {
             }
           />
         )}
-        {optionsList && (
-          <Detail label={i18n._(t`Options`)} value={optionsList} />
-        )}
+        {optionsList && <Detail label={t`Options`} value={optionsList} />}
         <Detail
-          label={i18n._(t`Cache Timeout`)}
-          value={`${scm_update_cache_timeout} ${i18n._(t`Seconds`)}`}
+          label={t`Cache Timeout`}
+          value={`${scm_update_cache_timeout} ${t`Seconds`}`}
         />
         <ExecutionEnvironmentDetail
           virtualEnvironment={custom_virtualenv}
@@ -186,21 +172,18 @@ function ProjectDetail({ project, i18n }) {
         />
         <Config>
           {({ project_base_dir }) => (
-            <Detail
-              label={i18n._(t`Project Base Path`)}
-              value={project_base_dir}
-            />
+            <Detail label={t`Project Base Path`} value={project_base_dir} />
           )}
         </Config>
-        <Detail label={i18n._(t`Playbook Directory`)} value={local_path} />
+        <Detail label={t`Playbook Directory`} value={local_path} />
 
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={created}
           user={summary_fields.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={modified}
           user={summary_fields.modified_by}
         />
@@ -209,11 +192,11 @@ function ProjectDetail({ project, i18n }) {
         {summary_fields.user_capabilities?.edit && (
           <Button
             ouiaId="project-detail-edit-button"
-            aria-label={i18n._(t`edit`)}
+            aria-label={t`edit`}
             component={Link}
             to={`/projects/${id}/edit`}
           >
-            {i18n._(t`Edit`)}
+            {t`Edit`}
           </Button>
         )}
         {summary_fields.user_capabilities?.start && (
@@ -225,15 +208,13 @@ function ProjectDetail({ project, i18n }) {
         {summary_fields.user_capabilities?.delete && (
           <DeleteButton
             name={name}
-            modalTitle={i18n._(t`Delete Project`)}
+            modalTitle={t`Delete Project`}
             onConfirm={deleteProject}
             isDisabled={isLoading}
             deleteDetailsRequests={deleteDetailsRequests}
-            deleteMessage={i18n._(
-              t`This project is currently being used by other resources. Are you sure you want to delete it?`
-            )}
+            deleteMessage={t`This project is currently being used by other resources. Are you sure you want to delete it?`}
           >
-            {i18n._(t`Delete`)}
+            {t`Delete`}
           </DeleteButton>
         )}
       </CardActionsRow>
@@ -242,10 +223,10 @@ function ProjectDetail({ project, i18n }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete project.`)}
+          {t`Failed to delete project.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -257,4 +238,4 @@ ProjectDetail.propTypes = {
   project: Project.isRequired,
 };
 
-export default withI18n()(ProjectDetail);
+export default ProjectDetail;
diff --git a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesList.jsx b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesList.jsx
index 58d53341aa..7e3bd41738 100644
--- a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesList.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesList.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Card } from '@patternfly/react-core';
 import { JobTemplatesAPI } from '../../../api';
@@ -22,7 +22,7 @@ const QS_CONFIG = getQSConfig('template', {
   order_by: 'name',
 });
 
-function ProjectJobTemplatesList({ i18n }) {
+function ProjectJobTemplatesList() {
   const { id: projectId } = useParams();
   const location = useLocation();
 
@@ -112,47 +112,47 @@ function ProjectJobTemplatesList({ i18n }) {
           hasContentLoading={isDeleteLoading || isLoading}
           items={jobTemplates}
           itemCount={itemCount}
-          pluralizedItemName={i18n._(t`Job templates`)}
+          pluralizedItemName={t`Job templates`}
           qsConfig={QS_CONFIG}
           onRowClick={handleSelect}
           toolbarSearchColumns={[
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: 'name__icontains',
               isDefault: true,
             },
             {
-              name: i18n._(t`Created By (Username)`),
+              name: t`Created By (Username)`,
               key: 'created_by__username__icontains',
             },
             {
-              name: i18n._(t`Modified By (Username)`),
+              name: t`Modified By (Username)`,
               key: 'modified_by__username__icontains',
             },
           ]}
           toolbarSortColumns={[
             {
-              name: i18n._(t`Inventory`),
+              name: t`Inventory`,
               key: 'job_template__inventory__id',
             },
             {
-              name: i18n._(t`Last job run`),
+              name: t`Last job run`,
               key: 'last_job_run',
             },
             {
-              name: i18n._(t`Modified`),
+              name: t`Modified`,
               key: 'modified',
             },
             {
-              name: i18n._(t`Name`),
+              name: t`Name`,
               key: 'name',
             },
             {
-              name: i18n._(t`Project`),
+              name: t`Project`,
               key: 'jobtemplate__project__id',
             },
             {
-              name: i18n._(t`Type`),
+              name: t`Type`,
               key: 'type',
             },
           ]}
@@ -173,7 +173,7 @@ function ProjectJobTemplatesList({ i18n }) {
                   key="delete"
                   onDelete={handleTemplateDelete}
                   itemsToDelete={selected}
-                  pluralizedItemName={i18n._(t`Job templates`)}
+                  pluralizedItemName={t`Job templates`}
                 />,
               ]}
             />
@@ -194,14 +194,14 @@ function ProjectJobTemplatesList({ i18n }) {
       <AlertModal
         isOpen={deletionError}
         variant="danger"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={clearDeletionError}
       >
-        {i18n._(t`Failed to delete one or more job templates.`)}
+        {t`Failed to delete one or more job templates.`}
         <ErrorDetail error={deletionError} />
       </AlertModal>
     </>
   );
 }
 
-export default withI18n()(ProjectJobTemplatesList);
+export default ProjectJobTemplatesList;
diff --git a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.jsx b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.jsx
index 0f150e7bb7..388a65cbc7 100644
--- a/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.jsx
@@ -11,7 +11,7 @@ import {
   Tooltip,
 } from '@patternfly/react-core';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import {
   ExclamationTriangleIcon,
   PencilAltIcon,
@@ -37,7 +37,6 @@ const ExclamationTriangleIconWarning = styled(ExclamationTriangleIcon)`
 `;
 
 function ProjectJobTemplateListItem({
-  i18n,
   template,
   isSelected,
   onSelect,
@@ -77,9 +76,7 @@ function ProjectJobTemplateListItem({
               {missingResourceIcon && (
                 <span>
                   <Tooltip
-                    content={i18n._(
-                      t`Resources are missing from this template.`
-                    )}
+                    content={t`Resources are missing from this template.`}
                     position="right"
                   >
                     <ExclamationTriangleIcon css="color: #c9190b; margin-left: 20px;" />
@@ -89,9 +86,7 @@ function ProjectJobTemplateListItem({
               {missingExecutionEnvironment && (
                 <span>
                   <Tooltip
-                    content={i18n._(
-                      t`Custom virtual environment ${template.custom_virtualenv} must be replaced by an execution environment.`
-                    )}
+                    content={t`Custom virtual environment ${template.custom_virtualenv} must be replaced by an execution environment.`}
                     position="right"
                     className="missing-execution-environment"
                   >
@@ -109,12 +104,12 @@ function ProjectJobTemplateListItem({
           ]}
         />
         <DataListAction
-          aria-label={i18n._(t`actions`)}
+          aria-label={t`actions`}
           aria-labelledby={labelId}
           id={labelId}
         >
           {canLaunch && template.type === 'job_template' && (
-            <Tooltip content={i18n._(t`Launch Template`)} position="top">
+            <Tooltip content={t`Launch Template`} position="top">
               <LaunchButton resource={template}>
                 {({ handleLaunch, isLaunching }) => (
                   <Button
@@ -131,7 +126,7 @@ function ProjectJobTemplateListItem({
             </Tooltip>
           )}
           {template.summary_fields.user_capabilities.edit && (
-            <Tooltip content={i18n._(t`Edit Template`)} position="top">
+            <Tooltip content={t`Edit Template`} position="top">
               <Button
                 ouiaId={`${template.id}-edit-button`}
                 css="grid-column: 2"
@@ -150,4 +145,4 @@ function ProjectJobTemplateListItem({
 }
 
 export { ProjectJobTemplateListItem as _ProjectJobTemplateListItem };
-export default withI18n()(ProjectJobTemplateListItem);
+export default ProjectJobTemplateListItem;
diff --git a/awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.jsx b/awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.jsx
index 08058020f5..d3300af7cf 100644
--- a/awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { Fragment, useState, useCallback } from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { Button, Tooltip } from '@patternfly/react-core';
 import { Tr, Td, ExpandableRowContent } from '@patternfly/react-table';
 import { t } from '@lingui/macro';
@@ -43,7 +43,6 @@ function ProjectListItem({
   detailUrl,
   fetchProjects,
   rowIndex,
-  i18n,
 }) {
   const [isExpanded, setIsExpanded] = useState(false);
   const [isDisabled, setIsDisabled] = useState(false);
@@ -64,16 +63,16 @@ function ProjectListItem({
   const generateLastJobTooltip = job => {
     return (
       <Fragment>
-        <div>{i18n._(t`MOST RECENT SYNC`)}</div>
+        <div>{t`MOST RECENT SYNC`}</div>
         <div>
-          {i18n._(t`JOB ID:`)} {job.id}
+          {t`JOB ID:`} {job.id}
         </div>
         <div>
-          {i18n._(t`STATUS:`)} {job.status.toUpperCase()}
+          {t`STATUS:`} {job.status.toUpperCase()}
         </div>
         {job.finished && (
           <div>
-            {i18n._(t`FINISHED:`)} {formatDateString(job.finished)}
+            {t`FINISHED:`} {formatDateString(job.finished)}
           </div>
         )}
       </Fragment>
@@ -117,9 +116,9 @@ function ProjectListItem({
             isSelected,
             onSelect,
           }}
-          dataLabel={i18n._(t`Selected`)}
+          dataLabel={t`Selected`}
         />
-        <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+        <Td id={labelId} dataLabel={t`Name`}>
           <span>
             <Link to={`${detailUrl}`}>
               <b>{project.name}</b>
@@ -128,9 +127,7 @@ function ProjectListItem({
           {missingExecutionEnvironment && (
             <span>
               <Tooltip
-                content={i18n._(
-                  t`Custom virtual environment ${project.custom_virtualenv} must be replaced by an execution environment.`
-                )}
+                content={t`Custom virtual environment ${project.custom_virtualenv} must be replaced by an execution environment.`}
                 position="right"
                 className="missing-execution-environment"
               >
@@ -139,7 +136,7 @@ function ProjectListItem({
             </span>
           )}
         </Td>
-        <Td dataLabel={i18n._(t`Status`)}>
+        <Td dataLabel={t`Status`}>
           {job && (
             <Tooltip
               position="top"
@@ -152,30 +149,28 @@ function ProjectListItem({
             </Tooltip>
           )}
         </Td>
-        <Td dataLabel={i18n._(t`Type`)}>
-          {project.scm_type === ''
-            ? i18n._(t`Manual`)
-            : toTitleCase(project.scm_type)}
+        <Td dataLabel={t`Type`}>
+          {project.scm_type === '' ? t`Manual` : toTitleCase(project.scm_type)}
         </Td>
-        <Td dataLabel={i18n._(t`Revision`)}>
+        <Td dataLabel={t`Revision`}>
           {project.scm_revision.substring(0, 7)}
           {!project.scm_revision && (
-            <Label aria-label={i18n._(t`copy to clipboard disabled`)}>
-              {i18n._(t`Sync for revision`)}
+            <Label aria-label={t`copy to clipboard disabled`}>
+              {t`Sync for revision`}
             </Label>
           )}
           <ClipboardCopyButton
             isDisabled={!project.scm_revision}
             stringToCopy={project.scm_revision}
-            copyTip={i18n._(t`Copy full revision to clipboard.`)}
-            copiedSuccessTip={i18n._(t`Successfully copied to clipboard!`)}
+            copyTip={t`Copy full revision to clipboard.`}
+            copiedSuccessTip={t`Successfully copied to clipboard!`}
             ouiaId="copy-revision-button"
           />
         </Td>
-        <ActionsTd dataLabel={i18n._(t`Actions`)}>
+        <ActionsTd dataLabel={t`Actions`}>
           <ActionItem
             visible={project.summary_fields.user_capabilities.start}
-            tooltip={i18n._(t`Sync Project`)}
+            tooltip={t`Sync Project`}
           >
             <ProjectSyncButton
               projectId={project.id}
@@ -184,12 +179,12 @@ function ProjectListItem({
           </ActionItem>
           <ActionItem
             visible={project.summary_fields.user_capabilities.edit}
-            tooltip={i18n._(t`Edit Project`)}
+            tooltip={t`Edit Project`}
           >
             <Button
               ouiaId={`${project.id}-edit-button`}
               isDisabled={isDisabled}
-              aria-label={i18n._(t`Edit Project`)}
+              aria-label={t`Edit Project`}
               variant="plain"
               component={Link}
               to={`/projects/${project.id}/edit`}
@@ -198,7 +193,7 @@ function ProjectListItem({
             </Button>
           </ActionItem>
           <ActionItem
-            tooltip={i18n._(t`Copy Project`)}
+            tooltip={t`Copy Project`}
             visible={project.summary_fields.user_capabilities.copy}
           >
             <CopyButton
@@ -206,7 +201,7 @@ function ProjectListItem({
               isDisabled={isDisabled}
               onCopyStart={handleCopyStart}
               onCopyFinish={handleCopyFinish}
-              errorMessage={i18n._(t`Failed to copy project.`)}
+              errorMessage={t`Failed to copy project.`}
             />
           </ActionItem>
         </ActionsTd>
@@ -217,13 +212,13 @@ function ProjectListItem({
           <ExpandableRowContent>
             <DetailList>
               <Detail
-                label={i18n._(t`Description`)}
+                label={t`Description`}
                 value={project.description}
                 dataCy={`project-${project.id}-description`}
               />
               {project.summary_fields.organization ? (
                 <Detail
-                  label={i18n._(t`Organization`)}
+                  label={t`Organization`}
                   value={
                     <Link
                       to={`/organizations/${project.summary_fields.organization.id}/details`}
@@ -234,7 +229,7 @@ function ProjectListItem({
                   dataCy={`project-${project.id}-organization`}
                 />
               ) : (
-                <DeletedDetail label={i18n._(t`Organization`)} />
+                <DeletedDetail label={t`Organization`} />
               )}
               <ExecutionEnvironmentDetail
                 virtualEnvironment={project.custom_virtualenv}
@@ -244,12 +239,12 @@ function ProjectListItem({
                 isDefaultEnvironment
               />
               <Detail
-                label={i18n._(t`Last modified`)}
+                label={t`Last modified`}
                 value={formatDateString(project.modified)}
                 dataCy={`project-${project.id}-last-modified`}
               />
               <Detail
-                label={i18n._(t`Last used`)}
+                label={t`Last used`}
                 value={formatDateString(project.last_job_run)}
                 dataCy={`project-${project.id}-last-used`}
               />
@@ -260,4 +255,4 @@ function ProjectListItem({
     </>
   );
 }
-export default withI18n()(ProjectListItem);
+export default ProjectListItem;
diff --git a/awx/ui_next/src/screens/Project/Projects.jsx b/awx/ui_next/src/screens/Project/Projects.jsx
index 8063d4c1e6..d72ce0a3fc 100644
--- a/awx/ui_next/src/screens/Project/Projects.jsx
+++ b/awx/ui_next/src/screens/Project/Projects.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { Route, withRouter, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import ScreenHeader from '../../components/ScreenHeader/ScreenHeader';
@@ -9,39 +9,34 @@ import ProjectsList from './ProjectList/ProjectList';
 import ProjectAdd from './ProjectAdd/ProjectAdd';
 import Project from './Project';
 
-function Projects({ i18n }) {
+function Projects() {
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/projects': i18n._(t`Projects`),
-    '/projects/add': i18n._(t`Create New Project`),
+    '/projects': t`Projects`,
+    '/projects/add': t`Create New Project`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    (project, nested) => {
-      if (!project) {
-        return;
-      }
-      const projectSchedulesPath = `/projects/${project.id}/schedules`;
-      setBreadcrumbConfig({
-        '/projects': i18n._(t`Projects`),
-        '/projects/add': i18n._(t`Create New Project`),
-        [`/projects/${project.id}`]: `${project.name}`,
-        [`/projects/${project.id}/edit`]: i18n._(t`Edit Details`),
-        [`/projects/${project.id}/details`]: i18n._(t`Details`),
-        [`/projects/${project.id}/access`]: i18n._(t`Access`),
-        [`/projects/${project.id}/notifications`]: i18n._(t`Notifications`),
-        [`/projects/${project.id}/job_templates`]: i18n._(t`Job Templates`),
+  const buildBreadcrumbConfig = useCallback((project, nested) => {
+    if (!project) {
+      return;
+    }
+    const projectSchedulesPath = `/projects/${project.id}/schedules`;
+    setBreadcrumbConfig({
+      '/projects': t`Projects`,
+      '/projects/add': t`Create New Project`,
+      [`/projects/${project.id}`]: `${project.name}`,
+      [`/projects/${project.id}/edit`]: t`Edit Details`,
+      [`/projects/${project.id}/details`]: t`Details`,
+      [`/projects/${project.id}/access`]: t`Access`,
+      [`/projects/${project.id}/notifications`]: t`Notifications`,
+      [`/projects/${project.id}/job_templates`]: t`Job Templates`,
 
-        [`${projectSchedulesPath}`]: i18n._(t`Schedules`),
-        [`${projectSchedulesPath}/add`]: i18n._(t`Create New Schedule`),
-        [`${projectSchedulesPath}/${nested?.id}`]: `${nested?.name}`,
-        [`${projectSchedulesPath}/${nested?.id}/details`]: i18n._(
-          t`Schedule Details`
-        ),
-        [`${projectSchedulesPath}/${nested?.id}/edit`]: i18n._(t`Edit Details`),
-      });
-    },
-    [i18n]
-  );
+      [`${projectSchedulesPath}`]: t`Schedules`,
+      [`${projectSchedulesPath}/add`]: t`Create New Schedule`,
+      [`${projectSchedulesPath}/${nested?.id}`]: `${nested?.name}`,
+      [`${projectSchedulesPath}/${nested?.id}/details`]: t`Schedule Details`,
+      [`${projectSchedulesPath}/${nested?.id}/edit`]: t`Edit Details`,
+    });
+  }, []);
 
   return (
     <>
@@ -62,4 +57,4 @@ function Projects({ i18n }) {
 }
 
 export { Projects as _Projects };
-export default withI18n()(withRouter(Projects));
+export default withRouter(Projects);
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx
index f880724469..20b407c4cc 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx
@@ -1,7 +1,7 @@
 /* eslint no-nested-ternary: 0 */
 import React, { useCallback, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik, useField, useFormikContext } from 'formik';
 import { Form, FormGroup, Title } from '@patternfly/react-core';
@@ -70,7 +70,7 @@ function ProjectFormFields({
   project_base_dir,
   project_local_paths,
   formik,
-  i18n,
+
   setCredentials,
   credentials,
   scmTypeOptions,
@@ -94,11 +94,11 @@ function ProjectFormFields({
 
   const [scmTypeField, scmTypeMeta, scmTypeHelpers] = useField({
     name: 'scm_type',
-    validate: required(i18n._(t`Set a value for this field`), i18n),
+    validate: required(t`Set a value for this field`),
   });
   const [organizationField, organizationMeta, organizationHelpers] = useField({
     name: 'organization',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   const [
@@ -165,15 +165,15 @@ function ProjectFormFields({
     <>
       <FormField
         id="project-name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="project-description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
@@ -194,12 +194,8 @@ function ProjectFormFields({
         onBlur={() => executionEnvironmentHelpers.setTouched()}
         value={executionEnvironmentField.value}
         onChange={value => executionEnvironmentHelpers.setValue(value)}
-        popoverContent={i18n._(
-          t`Select the default execution environment for this project.`
-        )}
-        tooltip={i18n._(
-          t`Select an organization before editing the default execution environment.`
-        )}
+        popoverContent={t`Select the default execution environment for this project.`}
+        tooltip={t`Select an organization before editing the default execution environment.`}
         globallyAvailable
         isDisabled={!organizationField.value}
         organizationId={organizationField.value?.id}
@@ -212,7 +208,7 @@ function ProjectFormFields({
         validated={
           !scmTypeMeta.touched || !scmTypeMeta.error ? 'default' : 'error'
         }
-        label={i18n._(t`Source Control Credential Type`)}
+        label={t`Source Control Credential Type`}
       >
         <AnsibleSelect
           {...scmTypeField}
@@ -221,7 +217,7 @@ function ProjectFormFields({
             {
               value: '',
               key: '',
-              label: i18n._(t`Choose a Source Control Type`),
+              label: t`Choose a Source Control Type`,
               isDisabled: true,
             },
             ...scmTypeOptions.map(([value, label]) => {
@@ -244,7 +240,7 @@ function ProjectFormFields({
       {formik.values.scm_type !== '' && (
         <SubFormLayout>
           <Title size="md" headingLevel="h4">
-            {i18n._(t`Type Details`)}
+            {t`Type Details`}
           </Title>
           <FormColumnLayout>
             {
@@ -296,7 +292,7 @@ function ProjectFormFields({
   );
 }
 
-function ProjectForm({ i18n, project, submitError, ...props }) {
+function ProjectForm({ project, submitError, ...props }) {
   const { handleCancel, handleSubmit } = props;
   const { summary_fields = {} } = project;
   const { project_base_dir, project_local_paths } = useConfig();
@@ -391,7 +387,6 @@ function ProjectForm({ i18n, project, submitError, ...props }) {
               project_base_dir={project_base_dir}
               project_local_paths={project_local_paths}
               formik={formik}
-              i18n={i18n}
               setCredentials={setCredentials}
               credentials={credentials}
               scmTypeOptions={scmTypeOptions}
@@ -422,4 +417,4 @@ ProjectForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(ProjectForm);
+export default ProjectForm;
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ArchiveSubForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ArchiveSubForm.jsx
index d06d9ea84b..3475b76578 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ArchiveSubForm.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ArchiveSubForm.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   UrlFormField,
@@ -9,17 +9,15 @@ import {
 } from './SharedFields';
 
 const ArchiveSubForm = ({
-  i18n,
   credential,
   onCredentialSelection,
   scmUpdateOnLaunch,
 }) => (
   <>
     <UrlFormField
-      i18n={i18n}
       tooltip={
         <span>
-          {i18n._(t`Example URLs for Remote Archive Source Control include:`)}
+          {t`Example URLs for Remote Archive Source Control include:`}
           <ul css={{ margin: '10px 0 10px 20px' }}>
             <li>
               <code>
@@ -43,4 +41,4 @@ const ArchiveSubForm = ({
   </>
 );
 
-export default withI18n()(ArchiveSubForm);
+export default ArchiveSubForm;
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/GitSubForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/GitSubForm.jsx
index abd3508d71..013ca53d6d 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/GitSubForm.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/GitSubForm.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import FormField from '../../../../components/FormField';
 import {
@@ -13,7 +13,6 @@ import { useConfig } from '../../../../contexts/Config';
 import getDocsBaseUrl from '../../../../util/getDocsBaseUrl';
 
 const GitSubForm = ({
-  i18n,
   credential,
   onCredentialSelection,
   scmUpdateOnLaunch,
@@ -22,10 +21,9 @@ const GitSubForm = ({
   return (
     <>
       <UrlFormField
-        i18n={i18n}
         tooltip={
           <span>
-            {i18n._(t`Example URLs for GIT Source Control include:`)}
+            {t`Example URLs for GIT Source Control include:`}
             <ul css="margin: 10px 0 10px 20px">
               <li>
                 <code>https://github.com/ansible/ansible.git</code>
@@ -37,36 +35,33 @@ const GitSubForm = ({
                 <code>git://servername.example.com/ansible.git</code>
               </li>
             </ul>
-            {i18n._(t`Note: When using SSH protocol for GitHub or
+            {t`Note: When using SSH protocol for GitHub or
             Bitbucket, enter an SSH key only, do not enter a username
             (other than git). Additionally, GitHub and Bitbucket do
             not support password authentication when using SSH. GIT
             read only protocol (git://) does not use username or
-            password information.`)}
+            password information.`}
           </span>
         }
       />
-      <BranchFormField
-        i18n={i18n}
-        label={i18n._(t`Source Control Branch/Tag/Commit`)}
-      />
+      <BranchFormField label={t`Source Control Branch/Tag/Commit`} />
       <FormField
         id="project-scm-refspec"
-        label={i18n._(t`Source Control Refspec`)}
+        label={t`Source Control Refspec`}
         name="scm_refspec"
         type="text"
         tooltipMaxWidth="400px"
         tooltip={
           <span>
-            {i18n._(t`A refspec to fetch (passed to the Ansible git
+            {t`A refspec to fetch (passed to the Ansible git
             module). This parameter allows access to references via
-            the branch field not otherwise available.`)}
+            the branch field not otherwise available.`}
             <br />
             <br />
-            {i18n._(t`Note: This field assumes the remote name is "origin".`)}
+            {t`Note: This field assumes the remote name is "origin".`}
             <br />
             <br />
-            {i18n._(t`Examples include:`)}
+            {t`Examples include:`}
             <ul css={{ margin: '10px 0 10px 20px' }}>
               <li>
                 <code>refs/*:refs/remotes/origin/*</code>
@@ -75,12 +70,12 @@ const GitSubForm = ({
                 <code>refs/pull/62/head:refs/remotes/origin/pull/62/head</code>
               </li>
             </ul>
-            {i18n._(t`The first fetches all references. The second
+            {t`The first fetches all references. The second
             fetches the Github pull request number 62, in this example
-            the branch needs to be "pull/62/head".`)}
+            the branch needs to be "pull/62/head".`}
             <br />
             <br />
-            {i18n._(t`For more information, refer to the`)}{' '}
+            {t`For more information, refer to the`}{' '}
             <a
               target="_blank"
               rel="noopener noreferrer"
@@ -88,7 +83,7 @@ const GitSubForm = ({
                 config
               )}/html/userguide/projects.html#manage-playbooks-using-source-control`}
             >
-              {i18n._(t`Documentation.`)}
+              {t`Documentation.`}
             </a>
           </span>
         }
@@ -102,4 +97,4 @@ const GitSubForm = ({
   );
 };
 
-export default withI18n()(GitSubForm);
+export default GitSubForm;
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/InsightsSubForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/InsightsSubForm.jsx
index 5eac7c6bc1..5c85a82549 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/InsightsSubForm.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/InsightsSubForm.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField, useFormikContext } from 'formik';
 import CredentialLookup from '../../../../components/Lookup/CredentialLookup';
@@ -7,7 +7,6 @@ import { required } from '../../../../util/validators';
 import { ScmTypeOptions } from './SharedFields';
 
 const InsightsSubForm = ({
-  i18n,
   credential,
   onCredentialSelection,
   scmUpdateOnLaunch,
@@ -16,7 +15,7 @@ const InsightsSubForm = ({
   const { setFieldValue } = useFormikContext();
   const [, credMeta, credHelpers] = useField({
     name: 'credential',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   const onCredentialChange = useCallback(
@@ -31,7 +30,7 @@ const InsightsSubForm = ({
     <>
       <CredentialLookup
         credentialTypeId={credential.typeId}
-        label={i18n._(t`Insights Credential`)}
+        label={t`Insights Credential`}
         helperTextInvalid={credMeta.error}
         isValid={!credMeta.touched || !credMeta.error}
         onBlur={() => credHelpers.setTouched()}
@@ -45,4 +44,4 @@ const InsightsSubForm = ({
   );
 };
 
-export default withI18n()(InsightsSubForm);
+export default InsightsSubForm;
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.jsx
index db4a34485b..e15e5147d3 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/ManualSubForm.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import { FormGroup, Alert } from '@patternfly/react-core';
@@ -16,7 +16,6 @@ import { BrandName } from '../../../../variables';
 const brandName = BrandName;
 
 const ManualSubForm = ({
-  i18n,
   localPath,
   project_base_dir,
   project_local_paths,
@@ -26,7 +25,7 @@ const ManualSubForm = ({
     {
       value: '',
       key: '',
-      label: i18n._(t`Choose a Playbook Directory`),
+      label: t`Choose a Playbook Directory`,
     },
     ...localPaths
       .filter(path => path)
@@ -38,43 +37,43 @@ const ManualSubForm = ({
   ];
   const [pathField, pathMeta, pathHelpers] = useField({
     name: 'local_path',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   return (
     <>
       {options.length === 1 && (
         <Alert
-          title={i18n._(t`WARNING: `)}
+          title={t`WARNING: `}
           css="grid-column: 1/-1"
           variant="warning"
           isInline
         >
-          {i18n._(t`
+          {t`
             There are no available playbook directories in ${project_base_dir}.
             Either that directory is empty, or all of the contents are already
             assigned to other projects. Create a new directory there and make
             sure the playbook files can be read by the "awx" system user,
             or have ${brandName} directly retrieve your playbooks from
-            source control using the Source Control Type option above.`)}
+            source control using the Source Control Type option above.`}
         </Alert>
       )}
       <FormField
         id="project-base-dir"
-        label={i18n._(t`Project Base Path`)}
+        label={t`Project Base Path`}
         name="base_dir"
         type="text"
         isReadOnly
         tooltip={
           <span>
-            {i18n._(t`Base path used for locating playbooks. Directories
+            {t`Base path used for locating playbooks. Directories
               found inside this path will be listed in the playbook directory drop-down.
               Together the base path and selected playbook directory provide the full
-              path used to locate playbooks.`)}
+              path used to locate playbooks.`}
             <br />
             <br />
-            {i18n._(t`Change PROJECTS_ROOT when deploying
-              ${brandName} to change this location.`)}
+            {t`Change PROJECTS_ROOT when deploying
+              ${brandName} to change this location.`}
           </span>
         }
       />
@@ -83,12 +82,12 @@ const ManualSubForm = ({
         helperTextInvalid={pathMeta.error}
         isRequired
         validated={!pathMeta.touched || !pathMeta.error ? 'default' : 'error'}
-        label={i18n._(t`Playbook Directory`)}
+        label={t`Playbook Directory`}
         labelIcon={
           <Popover
-            content={i18n._(t`Select from the list of directories found in
+            content={t`Select from the list of directories found in
           the Project Base Path. Together the base path and the playbook
-          directory provide the full path used to locate playbooks.`)}
+          directory provide the full path used to locate playbooks.`}
           />
         }
       >
@@ -105,4 +104,4 @@ const ManualSubForm = ({
   );
 };
 
-export default withI18n()(ManualSubForm);
+export default ManualSubForm;
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx
index 8393f32fa4..799b752fdc 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useFormikContext } from 'formik';
 import { FormGroup, Title } from '@patternfly/react-core';
@@ -11,135 +11,124 @@ import {
   FormFullWidthLayout,
 } from '../../../../components/FormLayout';
 
-export const UrlFormField = withI18n()(({ i18n, tooltip }) => (
+export const UrlFormField = ({ tooltip }) => (
   <FormField
     id="project-scm-url"
     isRequired
-    label={i18n._(t`Source Control URL`)}
+    label={t`Source Control URL`}
     name="scm_url"
     tooltip={tooltip}
     tooltipMaxWidth="350px"
     type="text"
-    validate={required(null, i18n)}
+    validate={required(null)}
   />
-));
+);
 
-export const BranchFormField = withI18n()(({ i18n, label }) => (
+export const BranchFormField = ({ label }) => (
   <FormField
     id="project-scm-branch"
     name="scm_branch"
     type="text"
     label={label}
-    tooltip={i18n._(t`Branch to checkout. In addition to branches,
+    tooltip={t`Branch to checkout. In addition to branches,
         you can input tags, commit hashes, and arbitrary refs. Some
         commit hashes and refs may not be available unless you also
-        provide a custom refspec.`)}
+        provide a custom refspec.`}
   />
-));
-
-export const ScmCredentialFormField = withI18n()(
-  ({ i18n, credential, onCredentialSelection }) => {
-    const { setFieldValue } = useFormikContext();
-
-    const onCredentialChange = useCallback(
-      value => {
-        onCredentialSelection('scm', value);
-        setFieldValue('credential', value ? value.id : '');
-      },
-      [onCredentialSelection, setFieldValue]
-    );
-
-    return (
-      <CredentialLookup
-        credentialTypeId={credential.typeId}
-        label={i18n._(t`Source Control Credential`)}
-        value={credential.value}
-        onChange={onCredentialChange}
-      />
-    );
-  }
 );
 
-export const ScmTypeOptions = withI18n()(
-  ({ i18n, scmUpdateOnLaunch, hideAllowOverride }) => (
-    <FormFullWidthLayout>
-      <FormGroup fieldId="project-option-checkboxes" label={i18n._(t`Options`)}>
-        <FormCheckboxLayout>
-          <CheckboxField
-            id="option-scm-clean"
-            name="scm_clean"
-            label={i18n._(t`Clean`)}
-            tooltip={i18n._(
-              t`Remove any local modifications prior to performing an update.`
-            )}
-          />
-          <CheckboxField
-            id="option-scm-delete-on-update"
-            name="scm_delete_on_update"
-            label={i18n._(t`Delete`)}
-            tooltip={i18n._(
-              t`Delete the local repository in its entirety prior to
+export const ScmCredentialFormField = ({
+  credential,
+  onCredentialSelection,
+}) => {
+  const { setFieldValue } = useFormikContext();
+
+  const onCredentialChange = useCallback(
+    value => {
+      onCredentialSelection('scm', value);
+      setFieldValue('credential', value ? value.id : '');
+    },
+    [onCredentialSelection, setFieldValue]
+  );
+
+  return (
+    <CredentialLookup
+      credentialTypeId={credential.typeId}
+      label={t`Source Control Credential`}
+      value={credential.value}
+      onChange={onCredentialChange}
+    />
+  );
+};
+
+export const ScmTypeOptions = ({ scmUpdateOnLaunch, hideAllowOverride }) => (
+  <FormFullWidthLayout>
+    <FormGroup fieldId="project-option-checkboxes" label={t`Options`}>
+      <FormCheckboxLayout>
+        <CheckboxField
+          id="option-scm-clean"
+          name="scm_clean"
+          label={t`Clean`}
+          tooltip={t`Remove any local modifications prior to performing an update.`}
+        />
+        <CheckboxField
+          id="option-scm-delete-on-update"
+          name="scm_delete_on_update"
+          label={t`Delete`}
+          tooltip={t`Delete the local repository in its entirety prior to
                   performing an update. Depending on the size of the
                   repository this may significantly increase the amount
-                  of time required to complete an update.`
-            )}
-          />
-          <CheckboxField
-            id="option-scm-track-submodules"
-            name="scm_track_submodules"
-            label={i18n._(t`Track submodules`)}
-            tooltip={i18n._(
-              t`Submodules will track the latest commit on
+                  of time required to complete an update.`}
+        />
+        <CheckboxField
+          id="option-scm-track-submodules"
+          name="scm_track_submodules"
+          label={t`Track submodules`}
+          tooltip={t`Submodules will track the latest commit on
                   their master branch (or other branch specified in
                   .gitmodules). If no, submodules will be kept at
                   the revision specified by the main project.
                   This is equivalent to specifying the --remote
-                  flag to git submodule update.`
-            )}
-          />
+                  flag to git submodule update.`}
+        />
+        <CheckboxField
+          id="option-scm-update-on-launch"
+          name="scm_update_on_launch"
+          label={t`Update Revision on Launch`}
+          tooltip={t`Each time a job runs using this project, update the
+                  revision of the project prior to starting the job.`}
+        />
+        {!hideAllowOverride && (
           <CheckboxField
-            id="option-scm-update-on-launch"
-            name="scm_update_on_launch"
-            label={i18n._(t`Update Revision on Launch`)}
-            tooltip={i18n._(
-              t`Each time a job runs using this project, update the
-                  revision of the project prior to starting the job.`
-            )}
+            id="option-allow-override"
+            name="allow_override"
+            label={t`Allow Branch Override`}
+            tooltip={t`Allow changing the Source Control branch or revision in a job
+                    template that uses this project.`}
           />
-          {!hideAllowOverride && (
-            <CheckboxField
-              id="option-allow-override"
-              name="allow_override"
-              label={i18n._(t`Allow Branch Override`)}
-              tooltip={i18n._(
-                t`Allow changing the Source Control branch or revision in a job
-                    template that uses this project.`
-              )}
-            />
-          )}
-        </FormCheckboxLayout>
-      </FormGroup>
+        )}
+      </FormCheckboxLayout>
+    </FormGroup>
 
-      {scmUpdateOnLaunch && (
-        <>
-          <Title size="md" headingLevel="h4">
-            {i18n._(t`Option Details`)}
-          </Title>
-          <FormField
-            id="project-cache-timeout"
-            name="scm_update_cache_timeout"
-            type="number"
-            min="0"
-            label={i18n._(t`Cache Timeout`)}
-            tooltip={i18n._(t`Time in seconds to consider a project
+    {scmUpdateOnLaunch && (
+      <>
+        <Title size="md" headingLevel="h4">
+          {t`Option Details`}
+        </Title>
+        <FormField
+          id="project-cache-timeout"
+          name="scm_update_cache_timeout"
+          type="number"
+          min="0"
+          label={t`Cache Timeout`}
+          tooltip={t`Time in seconds to consider a project
                     to be current. During job runs and callbacks the task
                     system will evaluate the timestamp of the latest project
                     update. If it is older than Cache Timeout, it is not
                     considered current, and a new project update will be
-                    performed.`)}
-          />
-        </>
-      )}
-    </FormFullWidthLayout>
-  )
+                    performed.`}
+        />
+      </>
+    )}
+  </FormFullWidthLayout>
 );
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SvnSubForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SvnSubForm.jsx
index f14d0ad649..b19e943dff 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SvnSubForm.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SvnSubForm.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   UrlFormField,
@@ -10,17 +10,15 @@ import {
 } from './SharedFields';
 
 const SvnSubForm = ({
-  i18n,
   credential,
   onCredentialSelection,
   scmUpdateOnLaunch,
 }) => (
   <>
     <UrlFormField
-      i18n={i18n}
       tooltip={
         <span>
-          {i18n._(t`Example URLs for Subversion Source Control include:`)}
+          {t`Example URLs for Subversion Source Control include:`}
           <ul css={{ margin: '10px 0 10px 20px' }}>
             <li>
               <code>https://github.com/ansible/ansible</code>
@@ -35,7 +33,7 @@ const SvnSubForm = ({
         </span>
       }
     />
-    <BranchFormField i18n={i18n} label={i18n._(t`Revision #`)} />
+    <BranchFormField label={t`Revision #`} />
     <ScmCredentialFormField
       credential={credential}
       onCredentialSelection={onCredentialSelection}
@@ -44,4 +42,4 @@ const SvnSubForm = ({
   </>
 );
 
-export default withI18n()(SvnSubForm);
+export default SvnSubForm;
diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSyncButton.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSyncButton.jsx
index e8569620b6..6f17aa9b2e 100644
--- a/awx/ui_next/src/screens/Project/shared/ProjectSyncButton.jsx
+++ b/awx/ui_next/src/screens/Project/shared/ProjectSyncButton.jsx
@@ -4,7 +4,7 @@ import { Button, Tooltip } from '@patternfly/react-core';
 import { SyncIcon } from '@patternfly/react-icons';
 
 import { number } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import useRequest, { useDismissableError } from '../../../util/useRequest';
 
@@ -12,7 +12,7 @@ import AlertModal from '../../../components/AlertModal';
 import ErrorDetail from '../../../components/ErrorDetail';
 import { ProjectsAPI } from '../../../api';
 
-function ProjectSyncButton({ i18n, projectId, lastJobStatus = null }) {
+function ProjectSyncButton({ projectId, lastJobStatus = null }) {
   const match = useRouteMatch();
 
   const { request: handleSync, error: syncError } = useRequest(
@@ -30,41 +30,39 @@ function ProjectSyncButton({ i18n, projectId, lastJobStatus = null }) {
     <>
       {isDisabled ? (
         <Tooltip
-          content={i18n._(
-            t`This project is currently on sync and cannot be clicked until sync process completed`
-          )}
+          content={t`This project is currently on sync and cannot be clicked until sync process completed`}
           position="top"
         >
           <div>
             <Button
               ouiaId={`${projectId}-sync-button`}
-              aria-label={i18n._(t`Sync Project`)}
+              aria-label={t`Sync Project`}
               variant={isDetailsView ? 'secondary' : 'plain'}
               isDisabled={isDisabled}
             >
-              {match.url.endsWith('/details') ? i18n._(t`Sync`) : <SyncIcon />}
+              {match.url.endsWith('/details') ? t`Sync` : <SyncIcon />}
             </Button>
           </div>
         </Tooltip>
       ) : (
         <Button
           ouiaId={`${projectId}-sync-button`}
-          aria-label={i18n._(t`Sync Project`)}
+          aria-label={t`Sync Project`}
           variant={isDetailsView ? 'secondary' : 'plain'}
           isDisabled={isDisabled}
           onClick={handleSync}
         >
-          {match.url.endsWith('/details') ? i18n._(t`Sync`) : <SyncIcon />}
+          {match.url.endsWith('/details') ? t`Sync` : <SyncIcon />}
         </Button>
       )}
       {error && (
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to sync project.`)}
+          {t`Failed to sync project.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -76,4 +74,4 @@ ProjectSyncButton.propTypes = {
   projectId: number.isRequired,
 };
 
-export default withI18n()(ProjectSyncButton);
+export default ProjectSyncButton;
diff --git a/awx/ui_next/src/screens/Schedule/AllSchedules.jsx b/awx/ui_next/src/screens/Schedule/AllSchedules.jsx
index 4e778e9623..9e985d819f 100644
--- a/awx/ui_next/src/screens/Schedule/AllSchedules.jsx
+++ b/awx/ui_next/src/screens/Schedule/AllSchedules.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import { PageSection, Card } from '@patternfly/react-core';
@@ -8,7 +8,7 @@ import ScreenHeader from '../../components/ScreenHeader';
 import { ScheduleList } from '../../components/Schedule';
 import { SchedulesAPI } from '../../api';
 
-function AllSchedules({ i18n }) {
+function AllSchedules() {
   const loadScheduleOptions = useCallback(() => {
     return SchedulesAPI.readOptions();
   }, []);
@@ -22,7 +22,7 @@ function AllSchedules({ i18n }) {
       <ScreenHeader
         streamType="schedule"
         breadcrumbConfig={{
-          '/schedules': i18n._(t`Schedules`),
+          '/schedules': t`Schedules`,
         }}
       />
       <Switch>
@@ -42,4 +42,4 @@ function AllSchedules({ i18n }) {
   );
 }
 
-export default withI18n()(AllSchedules);
+export default AllSchedules;
diff --git a/awx/ui_next/src/screens/Setting/ActivityStream/ActivityStream.jsx b/awx/ui_next/src/screens/Setting/ActivityStream/ActivityStream.jsx
index 3ecbaaa6bc..3be6063096 100644
--- a/awx/ui_next/src/screens/Setting/ActivityStream/ActivityStream.jsx
+++ b/awx/ui_next/src/screens/Setting/ActivityStream/ActivityStream.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
@@ -8,7 +8,7 @@ import { useConfig } from '../../../contexts/Config';
 import ActivityStreamDetail from './ActivityStreamDetail';
 import ActivityStreamEdit from './ActivityStreamEdit';
 
-function ActivityStream({ i18n }) {
+function ActivityStream() {
   const baseURL = '/settings/activity_stream';
   const { me } = useConfig();
 
@@ -30,7 +30,7 @@ function ActivityStream({ i18n }) {
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
               <Link to={`${baseURL}/details`}>
-                {i18n._(t`View Activity Stream settings`)}
+                {t`View Activity Stream settings`}
               </Link>
             </ContentError>
           </Route>
@@ -40,4 +40,4 @@ function ActivityStream({ i18n }) {
   );
 }
 
-export default withI18n()(ActivityStream);
+export default ActivityStream;
diff --git a/awx/ui_next/src/screens/Setting/ActivityStream/ActivityStreamDetail/ActivityStreamDetail.jsx b/awx/ui_next/src/screens/Setting/ActivityStream/ActivityStreamDetail/ActivityStreamDetail.jsx
index 16391ab3d4..b63e1ac96b 100644
--- a/awx/ui_next/src/screens/Setting/ActivityStream/ActivityStreamDetail/ActivityStreamDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/ActivityStream/ActivityStreamDetail/ActivityStreamDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Button } from '@patternfly/react-core';
@@ -15,7 +15,7 @@ import { useSettings } from '../../../../contexts/Settings';
 import { SettingsAPI } from '../../../../api';
 import { SettingDetail } from '../../shared';
 
-function ActivityStreamDetail({ i18n }) {
+function ActivityStreamDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
 
@@ -44,14 +44,14 @@ function ActivityStreamDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/activity_stream/details`,
       id: 0,
     },
@@ -85,11 +85,11 @@ function ActivityStreamDetail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="activity-stream-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/activity_stream/edit"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -98,4 +98,4 @@ function ActivityStreamDetail({ i18n }) {
   );
 }
 
-export default withI18n()(ActivityStreamDetail);
+export default ActivityStreamDetail;
diff --git a/awx/ui_next/src/screens/Setting/AzureAD/AzureAD.jsx b/awx/ui_next/src/screens/Setting/AzureAD/AzureAD.jsx
index 2158a407d8..fb87c27db4 100644
--- a/awx/ui_next/src/screens/Setting/AzureAD/AzureAD.jsx
+++ b/awx/ui_next/src/screens/Setting/AzureAD/AzureAD.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
 import AzureADDetail from './AzureADDetail';
 import AzureADEdit from './AzureADEdit';
 
-function AzureAD({ i18n }) {
+function AzureAD() {
   const baseURL = '/settings/azure';
   return (
     <PageSection>
@@ -22,9 +22,7 @@ function AzureAD({ i18n }) {
           </Route>
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
-              <Link to={`${baseURL}/details`}>
-                {i18n._(t`View Azure AD settings`)}
-              </Link>
+              <Link to={`${baseURL}/details`}>{t`View Azure AD settings`}</Link>
             </ContentError>
           </Route>
         </Switch>
@@ -33,4 +31,4 @@ function AzureAD({ i18n }) {
   );
 }
 
-export default withI18n()(AzureAD);
+export default AzureAD;
diff --git a/awx/ui_next/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.jsx b/awx/ui_next/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.jsx
index c93f9b8009..fde2b7d24c 100644
--- a/awx/ui_next/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -15,7 +15,7 @@ import useRequest from '../../../../util/useRequest';
 import { SettingsAPI } from '../../../../api';
 import { SettingDetail } from '../../shared';
 
-function AzureADDetail({ i18n }) {
+function AzureADDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
 
@@ -36,14 +36,14 @@ function AzureADDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/azure/details`,
       id: 0,
     },
@@ -77,11 +77,11 @@ function AzureADDetail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="azure-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/azure/edit"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -90,4 +90,4 @@ function AzureADDetail({ i18n }) {
   );
 }
 
-export default withI18n()(AzureADDetail);
+export default AzureADDetail;
diff --git a/awx/ui_next/src/screens/Setting/GitHub/GitHub.jsx b/awx/ui_next/src/screens/Setting/GitHub/GitHub.jsx
index aa23ae58ce..fa6d7e3c06 100644
--- a/awx/ui_next/src/screens/Setting/GitHub/GitHub.jsx
+++ b/awx/ui_next/src/screens/Setting/GitHub/GitHub.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
@@ -12,7 +12,7 @@ import GitHubEnterpriseEdit from './GitHubEnterpriseEdit';
 import GitHubEnterpriseOrgEdit from './GitHubEnterpriseOrgEdit';
 import GitHubEnterpriseTeamEdit from './GitHubEnterpriseTeamEdit';
 
-function GitHub({ i18n }) {
+function GitHub() {
   const baseURL = '/settings/github';
   const baseRoute = useRouteMatch({ path: '/settings/github', exact: true });
   const categoryRoute = useRouteMatch({
@@ -55,7 +55,7 @@ function GitHub({ i18n }) {
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
               <Link to={`${baseURL}/default/details`}>
-                {i18n._(t`View GitHub Settings`)}
+                {t`View GitHub Settings`}
               </Link>
             </ContentError>
           </Route>
@@ -65,4 +65,4 @@ function GitHub({ i18n }) {
   );
 }
 
-export default withI18n()(GitHub);
+export default GitHub;
diff --git a/awx/ui_next/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.jsx b/awx/ui_next/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.jsx
index fcea0d549c..03326d7036 100644
--- a/awx/ui_next/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link, Redirect, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -15,7 +15,7 @@ import useRequest from '../../../../util/useRequest';
 import { SettingsAPI } from '../../../../api';
 import { SettingDetail } from '../../shared';
 
-function GitHubDetail({ i18n }) {
+function GitHubDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
 
@@ -70,39 +70,39 @@ function GitHubDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`GitHub Default`),
+      name: t`GitHub Default`,
       link: `${baseURL}/default/details`,
       id: 0,
     },
     {
-      name: i18n._(t`GitHub Organization`),
+      name: t`GitHub Organization`,
       link: `${baseURL}/organization/details`,
       id: 1,
     },
     {
-      name: i18n._(t`GitHub Team`),
+      name: t`GitHub Team`,
       link: `${baseURL}/team/details`,
       id: 2,
     },
     {
-      name: i18n._(t`GitHub Enterprise`),
+      name: t`GitHub Enterprise`,
       link: `${baseURL}/enterprise/details`,
       id: 3,
     },
     {
-      name: i18n._(t`GitHub Enterprise Organization`),
+      name: t`GitHub Enterprise Organization`,
       link: `${baseURL}/enterprise_organization/details`,
       id: 4,
     },
     {
-      name: i18n._(t`GitHub Enterprise Team`),
+      name: t`GitHub Enterprise Team`,
       link: `${baseURL}/enterprise_team/details`,
       id: 5,
     },
@@ -140,11 +140,11 @@ function GitHubDetail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="github-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to={`${baseURL}/${category}/edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -153,4 +153,4 @@ function GitHubDetail({ i18n }) {
   );
 }
 
-export default withI18n()(GitHubDetail);
+export default GitHubDetail;
diff --git a/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2.jsx b/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2.jsx
index a12441811d..c7214b8882 100644
--- a/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2.jsx
+++ b/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
 import GoogleOAuth2Detail from './GoogleOAuth2Detail';
 import GoogleOAuth2Edit from './GoogleOAuth2Edit';
 
-function GoogleOAuth2({ i18n }) {
+function GoogleOAuth2() {
   const baseURL = '/settings/google_oauth2';
   return (
     <PageSection>
@@ -23,7 +23,7 @@ function GoogleOAuth2({ i18n }) {
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
               <Link to={`${baseURL}/details`}>
-                {i18n._(t`View Google OAuth 2.0 settings`)}
+                {t`View Google OAuth 2.0 settings`}
               </Link>
             </ContentError>
           </Route>
@@ -33,4 +33,4 @@ function GoogleOAuth2({ i18n }) {
   );
 }
 
-export default withI18n()(GoogleOAuth2);
+export default GoogleOAuth2;
diff --git a/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.jsx b/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.jsx
index ff59e2604c..232f0eb3e5 100644
--- a/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.jsx
+++ b/awx/ui_next/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -15,7 +15,7 @@ import { useConfig } from '../../../../contexts/Config';
 import { useSettings } from '../../../../contexts/Settings';
 import { SettingDetail } from '../../shared';
 
-function GoogleOAuth2Detail({ i18n }) {
+function GoogleOAuth2Detail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
 
@@ -36,14 +36,14 @@ function GoogleOAuth2Detail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/google_oauth2/details`,
       id: 0,
     },
@@ -77,11 +77,11 @@ function GoogleOAuth2Detail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="google-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/google_oauth2/edit"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -90,4 +90,4 @@ function GoogleOAuth2Detail({ i18n }) {
   );
 }
 
-export default withI18n()(GoogleOAuth2Detail);
+export default GoogleOAuth2Detail;
diff --git a/awx/ui_next/src/screens/Setting/Jobs/Jobs.jsx b/awx/ui_next/src/screens/Setting/Jobs/Jobs.jsx
index 4e46c1d7b2..f23d968689 100644
--- a/awx/ui_next/src/screens/Setting/Jobs/Jobs.jsx
+++ b/awx/ui_next/src/screens/Setting/Jobs/Jobs.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
 import JobsDetail from './JobsDetail';
 import JobsEdit from './JobsEdit';
 
-function Jobs({ i18n }) {
+function Jobs() {
   const baseURL = '/settings/jobs';
   return (
     <PageSection>
@@ -22,9 +22,7 @@ function Jobs({ i18n }) {
           </Route>
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
-              <Link to={`${baseURL}/details`}>
-                {i18n._(t`View Jobs settings`)}
-              </Link>
+              <Link to={`${baseURL}/details`}>{t`View Jobs settings`}</Link>
             </ContentError>
           </Route>
         </Switch>
@@ -33,4 +31,4 @@ function Jobs({ i18n }) {
   );
 }
 
-export default withI18n()(Jobs);
+export default Jobs;
diff --git a/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.jsx b/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.jsx
index 1e56a72b69..52b9bf2faf 100644
--- a/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -16,7 +16,7 @@ import { SettingsAPI } from '../../../../api';
 import { sortNestedDetails } from '../../shared/settingUtils';
 import { SettingDetail } from '../../shared';
 
-function JobsDetail({ i18n }) {
+function JobsDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
 
@@ -54,14 +54,14 @@ function JobsDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/jobs/details`,
       id: 0,
     },
@@ -94,11 +94,11 @@ function JobsDetail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="jobs-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/jobs/edit"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -107,4 +107,4 @@ function JobsDetail({ i18n }) {
   );
 }
 
-export default withI18n()(JobsDetail);
+export default JobsDetail;
diff --git a/awx/ui_next/src/screens/Setting/LDAP/LDAP.jsx b/awx/ui_next/src/screens/Setting/LDAP/LDAP.jsx
index 722127079c..623d756643 100644
--- a/awx/ui_next/src/screens/Setting/LDAP/LDAP.jsx
+++ b/awx/ui_next/src/screens/Setting/LDAP/LDAP.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
 import LDAPDetail from './LDAPDetail';
 import LDAPEdit from './LDAPEdit';
 
-function LDAP({ i18n }) {
+function LDAP() {
   const baseURL = '/settings/ldap';
   const baseRoute = useRouteMatch({ path: '/settings/ldap', exact: true });
   const categoryRoute = useRouteMatch({
@@ -35,7 +35,7 @@ function LDAP({ i18n }) {
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
               <Link to={`${baseURL}/default/details`}>
-                {i18n._(t`View LDAP Settings`)}
+                {t`View LDAP Settings`}
               </Link>
             </ContentError>
           </Route>
@@ -45,4 +45,4 @@ function LDAP({ i18n }) {
   );
 }
 
-export default withI18n()(LDAP);
+export default LDAP;
diff --git a/awx/ui_next/src/screens/Setting/LDAP/LDAPDetail/LDAPDetail.jsx b/awx/ui_next/src/screens/Setting/LDAP/LDAPDetail/LDAPDetail.jsx
index ba1fe9df8e..dee7dade76 100644
--- a/awx/ui_next/src/screens/Setting/LDAP/LDAPDetail/LDAPDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/LDAP/LDAPDetail/LDAPDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link, Redirect, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -25,7 +25,7 @@ function filterByPrefix(data, prefix) {
     }, {});
 }
 
-function LDAPDetail({ i18n }) {
+function LDAPDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
   const {
@@ -87,39 +87,39 @@ function LDAPDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Default`),
+      name: t`Default`,
       link: `${baseURL}/default/details`,
       id: 0,
     },
     {
-      name: i18n._(t`LDAP1`),
+      name: t`LDAP1`,
       link: `${baseURL}/1/details`,
       id: 1,
     },
     {
-      name: i18n._(t`LDAP2`),
+      name: t`LDAP2`,
       link: `${baseURL}/2/details`,
       id: 2,
     },
     {
-      name: i18n._(t`LDAP3`),
+      name: t`LDAP3`,
       link: `${baseURL}/3/details`,
       id: 3,
     },
     {
-      name: i18n._(t`LDAP4`),
+      name: t`LDAP4`,
       link: `${baseURL}/4/details`,
       id: 4,
     },
     {
-      name: i18n._(t`LDAP5`),
+      name: t`LDAP5`,
       link: `${baseURL}/5/details`,
       id: 5,
     },
@@ -158,11 +158,11 @@ function LDAPDetail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="ldap-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to={`${baseURL}/${category}/edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -171,4 +171,4 @@ function LDAPDetail({ i18n }) {
   );
 }
 
-export default withI18n()(LDAPDetail);
+export default LDAPDetail;
diff --git a/awx/ui_next/src/screens/Setting/Logging/Logging.jsx b/awx/ui_next/src/screens/Setting/Logging/Logging.jsx
index a4d60db550..abdb7a16bc 100644
--- a/awx/ui_next/src/screens/Setting/Logging/Logging.jsx
+++ b/awx/ui_next/src/screens/Setting/Logging/Logging.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
@@ -8,7 +8,7 @@ import { useConfig } from '../../../contexts/Config';
 import LoggingDetail from './LoggingDetail';
 import LoggingEdit from './LoggingEdit';
 
-function Logging({ i18n }) {
+function Logging() {
   const baseURL = '/settings/logging';
   const { me } = useConfig();
 
@@ -29,9 +29,7 @@ function Logging({ i18n }) {
           </Route>
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
-              <Link to={`${baseURL}/details`}>
-                {i18n._(t`View Logging settings`)}
-              </Link>
+              <Link to={`${baseURL}/details`}>{t`View Logging settings`}</Link>
             </ContentError>
           </Route>
         </Switch>
@@ -40,4 +38,4 @@ function Logging({ i18n }) {
   );
 }
 
-export default withI18n()(Logging);
+export default Logging;
diff --git a/awx/ui_next/src/screens/Setting/Logging/LoggingDetail/LoggingDetail.jsx b/awx/ui_next/src/screens/Setting/Logging/LoggingDetail/LoggingDetail.jsx
index 3a6850779b..e8dd1d5aba 100644
--- a/awx/ui_next/src/screens/Setting/Logging/LoggingDetail/LoggingDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/Logging/LoggingDetail/LoggingDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -16,7 +16,7 @@ import { useSettings } from '../../../../contexts/Settings';
 import { SettingDetail } from '../../shared';
 import { sortNestedDetails, pluck } from '../../shared/settingUtils';
 
-function LoggingDetail({ i18n }) {
+function LoggingDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
 
@@ -60,14 +60,14 @@ function LoggingDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/logging/details`,
       id: 0,
     },
@@ -98,11 +98,11 @@ function LoggingDetail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="logging-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/logging/edit"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -111,4 +111,4 @@ function LoggingDetail({ i18n }) {
   );
 }
 
-export default withI18n()(LoggingDetail);
+export default LoggingDetail;
diff --git a/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.jsx b/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.jsx
index df488c8d3b..6a292cbb38 100644
--- a/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.jsx
+++ b/awx/ui_next/src/screens/Setting/Logging/LoggingEdit/LoggingEdit.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik } from 'formik';
 import { Button, Form, Tooltip } from '@patternfly/react-core';
@@ -25,7 +25,7 @@ import useRequest, { useDismissableError } from '../../../../util/useRequest';
 import { formatJson } from '../../shared/settingUtils';
 import { SettingsAPI } from '../../../../api';
 
-function LoggingEdit({ i18n }) {
+function LoggingEdit() {
   const history = useHistory();
   const { isModalOpen, toggleModal, closeModal } = useModal();
   const { PUT: options } = useSettings();
@@ -149,16 +149,14 @@ function LoggingEdit({ i18n }) {
                               <>
                                 <br />
                                 <br />
-                                {i18n._(
-                                  t`Cannot enable log aggregator without providing
-                                  logging aggregator host and logging aggregator type.`
-                                )}
+                                {t`Cannot enable log aggregator without providing
+                                  logging aggregator host and logging aggregator type.`}
                               </>
                             )}
                         </>
                       ),
                     }}
-                    ariaLabel={i18n._(t`Enable external logging`)}
+                    ariaLabel={t`Enable external logging`}
                     disabled={
                       !formik.values.LOG_AGGREGATOR_ENABLED &&
                       (!formik.values.LOG_AGGREGATOR_HOST ||
@@ -190,9 +188,7 @@ function LoggingEdit({ i18n }) {
                   />
                   <BooleanField
                     name="LOG_AGGREGATOR_INDIVIDUAL_FACTS"
-                    ariaLabel={i18n._(
-                      t`Enable log system tracking facts individually`
-                    )}
+                    ariaLabel={t`Enable log system tracking facts individually`}
                     config={logging.LOG_AGGREGATOR_INDIVIDUAL_FACTS}
                   />
                   <ChoiceField
@@ -216,9 +212,7 @@ function LoggingEdit({ i18n }) {
                   {formik.values.LOG_AGGREGATOR_PROTOCOL === 'https' && (
                     <BooleanField
                       name="LOG_AGGREGATOR_VERIFY_CERT"
-                      ariaLabel={i18n._(
-                        t`Enable HTTPS certificate verification`
-                      )}
+                      ariaLabel={t`Enable HTTPS certificate verification`}
                       config={logging.LOG_AGGREGATOR_VERIFY_CERT}
                     />
                   )}
@@ -235,17 +229,13 @@ function LoggingEdit({ i18n }) {
                     <Tooltip
                       content={
                         formik.dirty || !formik.values.LOG_AGGREGATOR_ENABLED
-                          ? i18n._(
-                              t`Save and enable log aggregation before testing the log aggregator.`
-                            )
-                          : i18n._(
-                              t`Send a test log message to the configured log aggregator.`
-                            )
+                          ? t`Save and enable log aggregation before testing the log aggregator.`
+                          : t`Send a test log message to the configured log aggregator.`
                       }
                     >
                       <div>
                         <Button
-                          aria-label={i18n._(t`Test logging`)}
+                          aria-label={t`Test logging`}
                           ouiaId="test-logging-button"
                           variant="secondary"
                           type="button"
@@ -257,7 +247,7 @@ function LoggingEdit({ i18n }) {
                             testError
                           }
                         >
-                          {i18n._(t`Test`)}
+                          {t`Test`}
                         </Button>
                       </div>
                     </Tooltip>
@@ -285,4 +275,4 @@ function LoggingEdit({ i18n }) {
   );
 }
 
-export default withI18n()(LoggingEdit);
+export default LoggingEdit;
diff --git a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystem.jsx b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystem.jsx
index 5fd118e3bd..a3d79809cd 100644
--- a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystem.jsx
+++ b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
@@ -8,7 +8,7 @@ import { useConfig } from '../../../contexts/Config';
 import MiscSystemDetail from './MiscSystemDetail';
 import MiscSystemEdit from './MiscSystemEdit';
 
-function MiscSystem({ i18n }) {
+function MiscSystem() {
   const baseURL = '/settings/miscellaneous_system';
   const { me } = useConfig();
 
@@ -30,7 +30,7 @@ function MiscSystem({ i18n }) {
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
               <Link to={`${baseURL}/details`}>
-                {i18n._(t`View Miscellaneous System settings`)}
+                {t`View Miscellaneous System settings`}
               </Link>
             </ContentError>
           </Route>
@@ -40,4 +40,4 @@ function MiscSystem({ i18n }) {
   );
 }
 
-export default withI18n()(MiscSystem);
+export default MiscSystem;
diff --git a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.jsx b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.jsx
index 6b91aaa921..75c8c0fce8 100644
--- a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -16,7 +16,7 @@ import { useSettings } from '../../../../contexts/Settings';
 import { SettingDetail } from '../../shared';
 import { sortNestedDetails, pluck } from '../../shared/settingUtils';
 
-function MiscSystemDetail({ i18n }) {
+function MiscSystemDetail() {
   const { me } = useConfig();
   const { GET: allOptions } = useSettings();
 
@@ -75,17 +75,17 @@ function MiscSystemDetail({ i18n }) {
         ACCESS_TOKEN_EXPIRE_SECONDS: {
           ...OAUTH2_PROVIDER_OPTIONS,
           type: OAUTH2_PROVIDER_OPTIONS.child.type,
-          label: i18n._(t`Access Token Expiration`),
+          label: t`Access Token Expiration`,
         },
         REFRESH_TOKEN_EXPIRE_SECONDS: {
           ...OAUTH2_PROVIDER_OPTIONS,
           type: OAUTH2_PROVIDER_OPTIONS.child.type,
-          label: i18n._(t`Refresh Token Expiration`),
+          label: t`Refresh Token Expiration`,
         },
         AUTHORIZATION_CODE_EXPIRE_SECONDS: {
           ...OAUTH2_PROVIDER_OPTIONS,
           type: OAUTH2_PROVIDER_OPTIONS.child.type,
-          label: i18n._(t`Authorization Code Expiration`),
+          label: t`Authorization Code Expiration`,
         },
       };
       const mergedData = {};
@@ -94,7 +94,7 @@ function MiscSystemDetail({ i18n }) {
         mergedData[key].value = systemData[key];
       });
       return sortNestedDetails(mergedData);
-    }, [allOptions, i18n]),
+    }, [allOptions]),
     null
   );
 
@@ -107,14 +107,14 @@ function MiscSystemDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/miscellaneous_system/details`,
       id: 0,
     },
@@ -145,11 +145,11 @@ function MiscSystemDetail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="system-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/miscellaneous_system/edit"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -158,4 +158,4 @@ function MiscSystemDetail({ i18n }) {
   );
 }
 
-export default withI18n()(MiscSystemDetail);
+export default MiscSystemDetail;
diff --git a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.jsx b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.jsx
index 5411326eb0..8206fb0a3c 100644
--- a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.jsx
+++ b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik } from 'formik';
 import { Form } from '@patternfly/react-core';
@@ -24,7 +24,7 @@ import useRequest from '../../../../util/useRequest';
 import { SettingsAPI, ExecutionEnvironmentsAPI } from '../../../../api';
 import { pluck, formatJson } from '../../shared/settingUtils';
 
-function MiscSystemEdit({ i18n }) {
+function MiscSystemEdit() {
   const history = useHistory();
   const { isModalOpen, toggleModal, closeModal } = useModal();
   const { PUT: options } = useSettings();
@@ -77,20 +77,20 @@ function MiscSystemEdit({ i18n }) {
           ...OAUTH2_PROVIDER_OPTIONS,
           default: OAUTH2_PROVIDER_OPTIONS.default.ACCESS_TOKEN_EXPIRE_SECONDS,
           type: OAUTH2_PROVIDER_OPTIONS.child.type,
-          label: i18n._(t`Access Token Expiration`),
+          label: t`Access Token Expiration`,
         },
         REFRESH_TOKEN_EXPIRE_SECONDS: {
           ...OAUTH2_PROVIDER_OPTIONS,
           default: OAUTH2_PROVIDER_OPTIONS.default.REFRESH_TOKEN_EXPIRE_SECONDS,
           type: OAUTH2_PROVIDER_OPTIONS.child.type,
-          label: i18n._(t`Refresh Token Expiration`),
+          label: t`Refresh Token Expiration`,
         },
         AUTHORIZATION_CODE_EXPIRE_SECONDS: {
           ...OAUTH2_PROVIDER_OPTIONS,
           default:
             OAUTH2_PROVIDER_OPTIONS.default.AUTHORIZATION_CODE_EXPIRE_SECONDS,
           type: OAUTH2_PROVIDER_OPTIONS.child.type,
-          label: i18n._(t`Authorization Code Expiration`),
+          label: t`Authorization Code Expiration`,
         },
       };
 
@@ -103,7 +103,7 @@ function MiscSystemEdit({ i18n }) {
         mergedData[key].value = systemData[key];
       });
       return mergedData;
-    }, [options, i18n]),
+    }, [options]),
     null
   );
 
@@ -244,9 +244,7 @@ function MiscSystemEdit({ i18n }) {
                         value
                       )
                     }
-                    popoverContent={i18n._(
-                      t`The Execution Environment to be used when one has not been configured for a job template.`
-                    )}
+                    popoverContent={t`The Execution Environment to be used when one has not been configured for a job template.`}
                     isGlobalDefaultEnvironment
                   />
                   <InputField
@@ -353,4 +351,4 @@ function MiscSystemEdit({ i18n }) {
   );
 }
 
-export default withI18n()(MiscSystemEdit);
+export default MiscSystemEdit;
diff --git a/awx/ui_next/src/screens/Setting/RADIUS/RADIUS.jsx b/awx/ui_next/src/screens/Setting/RADIUS/RADIUS.jsx
index a15ca69440..35bffe22f3 100644
--- a/awx/ui_next/src/screens/Setting/RADIUS/RADIUS.jsx
+++ b/awx/ui_next/src/screens/Setting/RADIUS/RADIUS.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
 import RADIUSDetail from './RADIUSDetail';
 import RADIUSEdit from './RADIUSEdit';
 
-function RADIUS({ i18n }) {
+function RADIUS() {
   const baseURL = '/settings/radius';
   return (
     <PageSection>
@@ -22,9 +22,7 @@ function RADIUS({ i18n }) {
           </Route>
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
-              <Link to={`${baseURL}/details`}>
-                {i18n._(t`View RADIUS settings`)}
-              </Link>
+              <Link to={`${baseURL}/details`}>{t`View RADIUS settings`}</Link>
             </ContentError>
           </Route>
         </Switch>
@@ -33,4 +31,4 @@ function RADIUS({ i18n }) {
   );
 }
 
-export default withI18n()(RADIUS);
+export default RADIUS;
diff --git a/awx/ui_next/src/screens/Setting/RADIUS/RADIUSDetail/RADIUSDetail.jsx b/awx/ui_next/src/screens/Setting/RADIUS/RADIUSDetail/RADIUSDetail.jsx
index 589bae4368..81e63ba715 100644
--- a/awx/ui_next/src/screens/Setting/RADIUS/RADIUSDetail/RADIUSDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/RADIUS/RADIUSDetail/RADIUSDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -15,7 +15,7 @@ import { useConfig } from '../../../../contexts/Config';
 import { useSettings } from '../../../../contexts/Settings';
 import { SettingDetail } from '../../shared';
 
-function RADIUSDetail({ i18n }) {
+function RADIUSDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
 
@@ -36,14 +36,14 @@ function RADIUSDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/radius/details`,
       id: 0,
     },
@@ -77,11 +77,11 @@ function RADIUSDetail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="radius-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/radius/edit"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -90,4 +90,4 @@ function RADIUSDetail({ i18n }) {
   );
 }
 
-export default withI18n()(RADIUSDetail);
+export default RADIUSDetail;
diff --git a/awx/ui_next/src/screens/Setting/SAML/SAML.jsx b/awx/ui_next/src/screens/Setting/SAML/SAML.jsx
index 964bef71a7..a7bff8966e 100644
--- a/awx/ui_next/src/screens/Setting/SAML/SAML.jsx
+++ b/awx/ui_next/src/screens/Setting/SAML/SAML.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
 import SAMLDetail from './SAMLDetail';
 import SAMLEdit from './SAMLEdit';
 
-function SAML({ i18n }) {
+function SAML() {
   const baseURL = '/settings/saml';
   return (
     <PageSection>
@@ -22,9 +22,7 @@ function SAML({ i18n }) {
           </Route>
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
-              <Link to={`${baseURL}/details`}>
-                {i18n._(t`View SAML settings`)}
-              </Link>
+              <Link to={`${baseURL}/details`}>{t`View SAML settings`}</Link>
             </ContentError>
           </Route>
         </Switch>
@@ -33,4 +31,4 @@ function SAML({ i18n }) {
   );
 }
 
-export default withI18n()(SAML);
+export default SAML;
diff --git a/awx/ui_next/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.jsx b/awx/ui_next/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.jsx
index baf7c3f570..08d9dfcb7f 100644
--- a/awx/ui_next/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -15,7 +15,7 @@ import { useConfig } from '../../../../contexts/Config';
 import { useSettings } from '../../../../contexts/Settings';
 import { SettingDetail } from '../../shared';
 
-function SAMLDetail({ i18n }) {
+function SAMLDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
   options.SOCIAL_AUTH_SAML_SP_PUBLIC_CERT.type = 'certificate';
@@ -37,14 +37,14 @@ function SAMLDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/saml/details`,
       id: 0,
     },
@@ -78,11 +78,11 @@ function SAMLDetail({ i18n }) {
           <CardActionsRow>
             <Button
               ouiaId="saml-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/saml/edit"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -91,4 +91,4 @@ function SAMLDetail({ i18n }) {
   );
 }
 
-export default withI18n()(SAMLDetail);
+export default SAMLDetail;
diff --git a/awx/ui_next/src/screens/Setting/SettingList.jsx b/awx/ui_next/src/screens/Setting/SettingList.jsx
index c72e1a3714..d42eaa2b10 100644
--- a/awx/ui_next/src/screens/Setting/SettingList.jsx
+++ b/awx/ui_next/src/screens/Setting/SettingList.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Card as _Card,
@@ -48,98 +48,92 @@ const CardDescription = styled.div`
   font-size: var(--pf-global--FontSize--xs);
 `;
 
-function SettingList({ i18n }) {
+function SettingList() {
   const config = useConfig();
   const settingRoutes = [
     {
-      header: i18n._(t`Authentication`),
-      description: i18n._(
-        t`Enable simplified login for your ${brandName} applications`
-      ),
+      header: t`Authentication`,
+      description: t`Enable simplified login for your ${brandName} applications`,
       id: 'authentication',
       routes: [
         {
-          title: i18n._(t`Azure AD settings`),
+          title: t`Azure AD settings`,
           path: '/settings/azure',
         },
         {
-          title: i18n._(t`GitHub settings`),
+          title: t`GitHub settings`,
           path: '/settings/github',
         },
         {
-          title: i18n._(t`Google OAuth 2 settings`),
+          title: t`Google OAuth 2 settings`,
           path: '/settings/google_oauth2',
         },
         {
-          title: i18n._(t`LDAP settings`),
+          title: t`LDAP settings`,
           path: '/settings/ldap',
         },
         {
-          title: i18n._(t`RADIUS settings`),
+          title: t`RADIUS settings`,
           path: '/settings/radius',
         },
         {
-          title: i18n._(t`SAML settings`),
+          title: t`SAML settings`,
           path: '/settings/saml',
         },
         {
-          title: i18n._(t`TACACS+ settings`),
+          title: t`TACACS+ settings`,
           path: '/settings/tacacs',
         },
       ],
     },
     {
-      header: i18n._(t`Jobs`),
-      description: i18n._(
-        t`Update settings pertaining to Jobs within ${brandName}`
-      ),
+      header: t`Jobs`,
+      description: t`Update settings pertaining to Jobs within ${brandName}`,
       id: 'jobs',
       routes: [
         {
-          title: i18n._(t`Jobs settings`),
+          title: t`Jobs settings`,
           path: '/settings/jobs',
         },
       ],
     },
     {
-      header: i18n._(t`System`),
-      description: i18n._(t`Define system-level features and functions`),
+      header: t`System`,
+      description: t`Define system-level features and functions`,
       id: 'system',
       routes: [
         {
-          title: i18n._(t`Miscellaneous System settings`),
+          title: t`Miscellaneous System settings`,
           path: '/settings/miscellaneous_system',
         },
         {
-          title: i18n._(t`Activity Stream settings`),
+          title: t`Activity Stream settings`,
           path: '/settings/activity_stream',
         },
         {
-          title: i18n._(t`Logging settings`),
+          title: t`Logging settings`,
           path: '/settings/logging',
         },
       ],
     },
     {
-      header: i18n._(t`User Interface`),
-      description: i18n._(
-        t`Set preferences for data collection, logos, and logins`
-      ),
+      header: t`User Interface`,
+      description: t`Set preferences for data collection, logos, and logins`,
       id: 'ui',
       routes: [
         {
-          title: i18n._(t`User Interface settings`),
+          title: t`User Interface settings`,
           path: '/settings/ui',
         },
       ],
     },
     {
-      header: i18n._(t`Subscription`),
-      description: i18n._(t`View and edit your subscription information`),
+      header: t`Subscription`,
+      description: t`View and edit your subscription information`,
       id: 'subscription',
       routes: [
         {
-          title: i18n._(t`Subscription settings`),
+          title: t`Subscription settings`,
           path: '/settings/subscription',
         },
       ],
@@ -193,4 +187,4 @@ function SettingList({ i18n }) {
   );
 }
 
-export default withI18n()(SettingList);
+export default SettingList;
diff --git a/awx/ui_next/src/screens/Setting/Settings.jsx b/awx/ui_next/src/screens/Setting/Settings.jsx
index f359bbce12..f6e5182728 100644
--- a/awx/ui_next/src/screens/Setting/Settings.jsx
+++ b/awx/ui_next/src/screens/Setting/Settings.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { Link, Route, Switch, Redirect } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../components/ContentError';
@@ -25,7 +25,7 @@ import { useConfig } from '../../contexts/Config';
 import { SettingsAPI } from '../../api';
 import useRequest from '../../util/useRequest';
 
-function Settings({ i18n }) {
+function Settings() {
   const { license_info = {}, me } = useConfig();
 
   const { request, result, isLoading, error } = useRequest(
@@ -40,80 +40,78 @@ function Settings({ i18n }) {
   }, [request]);
 
   const breadcrumbConfig = {
-    '/settings': i18n._(t`Settings`),
-    '/settings/activity_stream': i18n._(t`Activity Stream`),
-    '/settings/activity_stream/details': i18n._(t`Details`),
-    '/settings/activity_stream/edit': i18n._(t`Edit Details`),
-    '/settings/azure': i18n._(t`Azure AD`),
-    '/settings/azure/details': i18n._(t`Details`),
-    '/settings/azure/edit': i18n._(t`Edit Details`),
+    '/settings': t`Settings`,
+    '/settings/activity_stream': t`Activity Stream`,
+    '/settings/activity_stream/details': t`Details`,
+    '/settings/activity_stream/edit': t`Edit Details`,
+    '/settings/azure': t`Azure AD`,
+    '/settings/azure/details': t`Details`,
+    '/settings/azure/edit': t`Edit Details`,
     '/settings/github': null,
-    '/settings/github/default': i18n._(t`GitHub Default`),
-    '/settings/github/default/details': i18n._(t`Details`),
-    '/settings/github/default/edit': i18n._(t`Edit Details`),
-    '/settings/github/organization': i18n._(t`GitHub Organization`),
-    '/settings/github/organization/details': i18n._(t`Details`),
-    '/settings/github/organization/edit': i18n._(t`Edit Details`),
-    '/settings/github/team': i18n._(t`GitHub Team`),
-    '/settings/github/team/details': i18n._(t`Details`),
-    '/settings/github/team/edit': i18n._(t`Edit Details`),
-    '/settings/github/enterprise': i18n._(t`GitHub Enterprise`),
-    '/settings/github/enterprise/details': i18n._(t`Details`),
-    '/settings/github/enterprise/edit': i18n._(t`Edit Details`),
-    '/settings/github/enterprise_organization': i18n._(
-      t`GitHub Enterprise Organization`
-    ),
-    '/settings/github/enterprise_organization/details': i18n._(t`Details`),
-    '/settings/github/enterprise_organization/edit': i18n._(t`Edit Details`),
-    '/settings/github/enterprise_team': i18n._(t`GitHub Enterprise Team`),
-    '/settings/github/enterprise_team/details': i18n._(t`Details`),
-    '/settings/github/enterprise_team/edit': i18n._(t`Edit Details`),
-    '/settings/google_oauth2': i18n._(t`Google OAuth2`),
-    '/settings/google_oauth2/details': i18n._(t`Details`),
-    '/settings/google_oauth2/edit': i18n._(t`Edit Details`),
-    '/settings/jobs': i18n._(t`Jobs`),
-    '/settings/jobs/details': i18n._(t`Details`),
-    '/settings/jobs/edit': i18n._(t`Edit Details`),
+    '/settings/github/default': t`GitHub Default`,
+    '/settings/github/default/details': t`Details`,
+    '/settings/github/default/edit': t`Edit Details`,
+    '/settings/github/organization': t`GitHub Organization`,
+    '/settings/github/organization/details': t`Details`,
+    '/settings/github/organization/edit': t`Edit Details`,
+    '/settings/github/team': t`GitHub Team`,
+    '/settings/github/team/details': t`Details`,
+    '/settings/github/team/edit': t`Edit Details`,
+    '/settings/github/enterprise': t`GitHub Enterprise`,
+    '/settings/github/enterprise/details': t`Details`,
+    '/settings/github/enterprise/edit': t`Edit Details`,
+    '/settings/github/enterprise_organization': t`GitHub Enterprise Organization`,
+    '/settings/github/enterprise_organization/details': t`Details`,
+    '/settings/github/enterprise_organization/edit': t`Edit Details`,
+    '/settings/github/enterprise_team': t`GitHub Enterprise Team`,
+    '/settings/github/enterprise_team/details': t`Details`,
+    '/settings/github/enterprise_team/edit': t`Edit Details`,
+    '/settings/google_oauth2': t`Google OAuth2`,
+    '/settings/google_oauth2/details': t`Details`,
+    '/settings/google_oauth2/edit': t`Edit Details`,
+    '/settings/jobs': t`Jobs`,
+    '/settings/jobs/details': t`Details`,
+    '/settings/jobs/edit': t`Edit Details`,
     '/settings/ldap': null,
-    '/settings/ldap/default': i18n._(t`LDAP Default`),
-    '/settings/ldap/1': i18n._(t`LDAP 1`),
-    '/settings/ldap/2': i18n._(t`LDAP 2`),
-    '/settings/ldap/3': i18n._(t`LDAP 3`),
-    '/settings/ldap/4': i18n._(t`LDAP 4`),
-    '/settings/ldap/5': i18n._(t`LDAP 5`),
-    '/settings/ldap/default/details': i18n._(t`Details`),
-    '/settings/ldap/1/details': i18n._(t`Details`),
-    '/settings/ldap/2/details': i18n._(t`Details`),
-    '/settings/ldap/3/details': i18n._(t`Details`),
-    '/settings/ldap/4/details': i18n._(t`Details`),
-    '/settings/ldap/5/details': i18n._(t`Details`),
-    '/settings/ldap/default/edit': i18n._(t`Edit Details`),
-    '/settings/ldap/1/edit': i18n._(t`Edit Details`),
-    '/settings/ldap/2/edit': i18n._(t`Edit Details`),
-    '/settings/ldap/3/edit': i18n._(t`Edit Details`),
-    '/settings/ldap/4/edit': i18n._(t`Edit Details`),
-    '/settings/ldap/5/edit': i18n._(t`Edit Details`),
-    '/settings/logging': i18n._(t`Logging`),
-    '/settings/logging/details': i18n._(t`Details`),
-    '/settings/logging/edit': i18n._(t`Edit Details`),
-    '/settings/miscellaneous_system': i18n._(t`Miscellaneous System`),
-    '/settings/miscellaneous_system/details': i18n._(t`Details`),
-    '/settings/miscellaneous_system/edit': i18n._(t`Edit Details`),
-    '/settings/radius': i18n._(t`RADIUS`),
-    '/settings/radius/details': i18n._(t`Details`),
-    '/settings/radius/edit': i18n._(t`Edit Details`),
-    '/settings/saml': i18n._(t`SAML`),
-    '/settings/saml/details': i18n._(t`Details`),
-    '/settings/saml/edit': i18n._(t`Edit Details`),
-    '/settings/subscription': i18n._(t`Subscription`),
-    '/settings/subscription/details': i18n._(t`Details`),
-    '/settings/subscription/edit': i18n._(t`Edit Details`),
-    '/settings/tacacs': i18n._(t`TACACS+`),
-    '/settings/tacacs/details': i18n._(t`Details`),
-    '/settings/tacacs/edit': i18n._(t`Edit Details`),
-    '/settings/ui': i18n._(t`User Interface`),
-    '/settings/ui/details': i18n._(t`Details`),
-    '/settings/ui/edit': i18n._(t`Edit Details`),
+    '/settings/ldap/default': t`LDAP Default`,
+    '/settings/ldap/1': t`LDAP 1`,
+    '/settings/ldap/2': t`LDAP 2`,
+    '/settings/ldap/3': t`LDAP 3`,
+    '/settings/ldap/4': t`LDAP 4`,
+    '/settings/ldap/5': t`LDAP 5`,
+    '/settings/ldap/default/details': t`Details`,
+    '/settings/ldap/1/details': t`Details`,
+    '/settings/ldap/2/details': t`Details`,
+    '/settings/ldap/3/details': t`Details`,
+    '/settings/ldap/4/details': t`Details`,
+    '/settings/ldap/5/details': t`Details`,
+    '/settings/ldap/default/edit': t`Edit Details`,
+    '/settings/ldap/1/edit': t`Edit Details`,
+    '/settings/ldap/2/edit': t`Edit Details`,
+    '/settings/ldap/3/edit': t`Edit Details`,
+    '/settings/ldap/4/edit': t`Edit Details`,
+    '/settings/ldap/5/edit': t`Edit Details`,
+    '/settings/logging': t`Logging`,
+    '/settings/logging/details': t`Details`,
+    '/settings/logging/edit': t`Edit Details`,
+    '/settings/miscellaneous_system': t`Miscellaneous System`,
+    '/settings/miscellaneous_system/details': t`Details`,
+    '/settings/miscellaneous_system/edit': t`Edit Details`,
+    '/settings/radius': t`RADIUS`,
+    '/settings/radius/details': t`Details`,
+    '/settings/radius/edit': t`Edit Details`,
+    '/settings/saml': t`SAML`,
+    '/settings/saml/details': t`Details`,
+    '/settings/saml/edit': t`Edit Details`,
+    '/settings/subscription': t`Subscription`,
+    '/settings/subscription/details': t`Details`,
+    '/settings/subscription/edit': t`Edit Details`,
+    '/settings/tacacs': t`TACACS+`,
+    '/settings/tacacs/details': t`Details`,
+    '/settings/tacacs/edit': t`Edit Details`,
+    '/settings/ui': t`User Interface`,
+    '/settings/ui/details': t`Details`,
+    '/settings/ui/edit': t`Edit Details`,
   };
 
   if (error) {
@@ -194,7 +192,7 @@ function Settings({ i18n }) {
           <PageSection>
             <Card>
               <ContentError isNotFound>
-                <Link to="/settings">{i18n._(t`View all settings`)}</Link>
+                <Link to="/settings">{t`View all settings`}</Link>
               </ContentError>
             </Card>
           </PageSection>
@@ -204,4 +202,4 @@ function Settings({ i18n }) {
   );
 }
 
-export default withI18n()(Settings);
+export default Settings;
diff --git a/awx/ui_next/src/screens/Setting/Subscription/Subscription.jsx b/awx/ui_next/src/screens/Setting/Subscription/Subscription.jsx
index e7838927a7..72e57049a9 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/Subscription.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/Subscription.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import SubscriptionDetail from './SubscriptionDetail';
 import SubscriptionEdit from './SubscriptionEdit';
 import ContentError from '../../../components/ContentError';
 
-function Subscription({ i18n }) {
+function Subscription() {
   const baseURL = '/settings/subscription';
   const baseRoute = useRouteMatch({
     path: '/settings/subscription',
@@ -27,7 +27,7 @@ function Subscription({ i18n }) {
           </Route>
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
-              <Link to={baseURL}>{i18n._(t`View Settings`)}</Link>
+              <Link to={baseURL}>{t`View Settings`}</Link>
             </ContentError>
           </Route>
         </Switch>
@@ -36,4 +36,4 @@ function Subscription({ i18n }) {
   );
 }
 
-export default withI18n()(Subscription);
+export default Subscription;
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.jsx
index 600f9103d7..90239d11e1 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import { Button, Label } from '@patternfly/react-core';
 import {
@@ -18,7 +18,7 @@ import {
   secondsToDays,
 } from '../../../../util/dates';
 
-function SubscriptionDetail({ i18n }) {
+function SubscriptionDetail() {
   const { license_info, version } = useConfig();
   const baseURL = '/settings/subscription';
   const tabsArray = [
@@ -26,14 +26,14 @@ function SubscriptionDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: '/settings',
       id: 99,
     },
     {
-      name: i18n._(t`Subscription Details`),
+      name: t`Subscription Details`,
       link: `${baseURL}/details`,
       id: 0,
     },
@@ -46,11 +46,11 @@ function SubscriptionDetail({ i18n }) {
         <DetailList>
           <Detail
             dataCy="subscription-status"
-            label={i18n._(t`Status`)}
+            label={t`Status`}
             value={
               license_info.compliant ? (
                 <Label variant="outline" color="green" icon={<CheckIcon />}>
-                  {i18n._(t`Compliant`)}
+                  {t`Compliant`}
                 </Label>
               ) : (
                 <Label
@@ -58,34 +58,34 @@ function SubscriptionDetail({ i18n }) {
                   color="red"
                   icon={<ExclamationCircleIcon />}
                 >
-                  {i18n._(t`Out of compliance`)}
+                  {t`Out of compliance`}
                 </Label>
               )
             }
           />
           <Detail
             dataCy="subscription-version"
-            label={i18n._(t`Version`)}
+            label={t`Version`}
             value={version}
           />
           <Detail
             dataCy="subscription-type"
-            label={i18n._(t`Subscription type`)}
+            label={t`Subscription type`}
             value={license_info.license_type}
           />
           <Detail
             dataCy="subscription-name"
-            label={i18n._(t`Subscription`)}
+            label={t`Subscription`}
             value={license_info.subscription_name}
           />
           <Detail
             dataCy="subscription-trial"
-            label={i18n._(t`Trial`)}
-            value={license_info.trial ? i18n._(t`True`) : i18n._(t`False`)}
+            label={t`Trial`}
+            value={license_info.trial ? t`True` : t`False`}
           />
           <Detail
             dataCy="subscription-expires-on-date"
-            label={i18n._(t`Expires on`)}
+            label={t`Expires on`}
             value={
               license_info.license_date &&
               formatDateString(
@@ -95,7 +95,7 @@ function SubscriptionDetail({ i18n }) {
           />
           <Detail
             dataCy="subscription-expires-on-utc-date"
-            label={i18n._(t`Expires on UTC`)}
+            label={t`Expires on UTC`}
             value={
               license_info.license_date &&
               formatDateStringUTC(
@@ -105,7 +105,7 @@ function SubscriptionDetail({ i18n }) {
           />
           <Detail
             dataCy="subscription-days-remaining"
-            label={i18n._(t`Days remaining`)}
+            label={t`Days remaining`}
             value={
               license_info.time_remaining &&
               secondsToDays(license_info.time_remaining)
@@ -114,25 +114,25 @@ function SubscriptionDetail({ i18n }) {
           {license_info.instance_count < 9999999 && (
             <Detail
               dataCy="subscription-hosts-available"
-              label={i18n._(t`Hosts available`)}
+              label={t`Hosts available`}
               value={license_info.available_instances}
             />
           )}
           {license_info.instance_count >= 9999999 && (
             <Detail
               dataCy="subscription-unlimited-hosts-available"
-              label={i18n._(t`Hosts available`)}
-              value={i18n._(t`Unlimited`)}
+              label={t`Hosts available`}
+              value={t`Unlimited`}
             />
           )}
           <Detail
             dataCy="subscription-hosts-used"
-            label={i18n._(t`Hosts used`)}
+            label={t`Hosts used`}
             value={license_info.current_instances}
           />
           <Detail
             dataCy="subscription-hosts-remaining"
-            label={i18n._(t`Hosts remaining`)}
+            label={t`Hosts remaining`}
             value={license_info.free_instances}
           />
         </DetailList>
@@ -151,7 +151,7 @@ function SubscriptionDetail({ i18n }) {
         </Trans>
         <CardActionsRow>
           <Button
-            aria-label={i18n._(t`edit`)}
+            aria-label={t`edit`}
             component={Link}
             to="/settings/subscription/edit"
           >
@@ -163,4 +163,4 @@ function SubscriptionDetail({ i18n }) {
   );
 }
 
-export default withI18n()(SubscriptionDetail);
+export default SubscriptionDetail;
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.jsx
index ffe27a9a4e..83085b17c2 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { Trans, t } from '@lingui/macro';
 import { useField } from 'formik';
 import { Button, Flex, FormGroup } from '@patternfly/react-core';
@@ -13,7 +13,7 @@ import { useConfig } from '../../../../contexts/Config';
 
 const ANALYTICSLINK = 'https://www.ansible.com/products/automation-analytics';
 
-function AnalyticsStep({ i18n }) {
+function AnalyticsStep() {
   const config = useConfig();
   const [manifest] = useField({
     name: 'manifest_file',
@@ -67,24 +67,24 @@ function AnalyticsStep({ i18n }) {
         <CheckboxField
           name="pendo"
           isDisabled={!config.me.is_superuser}
-          aria-label={i18n._(t`User analytics`)}
-          label={i18n._(t`User analytics`)}
+          aria-label={t`User analytics`}
+          label={t`User analytics`}
           id="pendo-field"
-          description={i18n._(t`This data is used to enhance
-                   future releases of the Software and help
-                   streamline customer experience and success.`)}
+          description={t`This data is used to enhance
+                   future releases of the Tower Software and help
+                   streamline customer experience and success.`}
         />
       </FormGroup>
       <FormGroup fieldId="insights">
         <CheckboxField
           name="insights"
           isDisabled={!config.me.is_superuser}
-          aria-label={i18n._(t`Insights analytics`)}
-          label={i18n._(t`Insights Analytics`)}
+          aria-label={t`Insights analytics`}
+          label={t`Insights Analytics`}
           id="insights-field"
-          description={i18n._(t`This data is used to enhance
-                   future releases of the Software and to provide
-                   Insights Analytics to subscribers.`)}
+          description={t`This data is used to enhance
+                   future releases of the Tower Software and to provide
+                   Insights Analytics to Tower subscribers.`}
         />
       </FormGroup>
       {requireCredentialFields && (
@@ -100,18 +100,18 @@ function AnalyticsStep({ i18n }) {
             id="username-field"
             isDisabled={!config.me.is_superuser}
             isRequired={requireCredentialFields}
-            label={i18n._(t`Username`)}
+            label={t`Username`}
             name="username"
             type="text"
-            validate={required(null, i18n)}
+            validate={required(null)}
           />
           <PasswordField
             id="password-field"
             isDisabled={!config.me.is_superuser}
             isRequired={requireCredentialFields}
-            label={i18n._(t`Password`)}
+            label={t`Password`}
             name="password"
-            validate={required(null, i18n)}
+            validate={required(null)}
           />
         </>
       )}
@@ -119,7 +119,7 @@ function AnalyticsStep({ i18n }) {
         <img
           width="300"
           src="/static/media/insights-analytics-dashboard.jpeg"
-          alt={i18n._(t`Insights Analytics dashboard`)}
+          alt={t`Insights Analytics dashboard`}
         />
         <Button
           component="a"
@@ -134,4 +134,4 @@ function AnalyticsStep({ i18n }) {
     </Flex>
   );
 }
-export default withI18n()(AnalyticsStep);
+export default AnalyticsStep;
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/EulaStep.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/EulaStep.jsx
index 06c8ee1ef5..be8852ade1 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/EulaStep.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/EulaStep.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { Trans, t } from '@lingui/macro';
 import { useField } from 'formik';
 import { Flex, FormGroup, TextArea } from '@patternfly/react-core';
@@ -7,7 +7,7 @@ import { required } from '../../../../util/validators';
 import { useConfig } from '../../../../contexts/Config';
 import { CheckboxField } from '../../../../components/FormField';
 
-function EulaStep({ i18n }) {
+function EulaStep() {
   const { eula, me } = useConfig();
   const [, meta] = useField('eula');
   const isValid = !(meta.touched && meta.error);
@@ -21,7 +21,7 @@ function EulaStep({ i18n }) {
       </b>
       <FormGroup
         fieldId="eula"
-        label={i18n._(t`End User License Agreement`)}
+        label={t`End User License Agreement`}
         validated={isValid ? 'default' : 'error'}
         helperTextInvalid={meta.error}
         isRequired
@@ -36,19 +36,16 @@ function EulaStep({ i18n }) {
         </TextArea>
         <CheckboxField
           name="eula"
-          aria-label={i18n._(t`Agree to end user license agreement`)}
-          label={i18n._(t`I agree to the End User License Agreement`)}
+          aria-label={t`Agree to end user license agreement`}
+          label={t`I agree to the End User License Agreement`}
           id="eula"
           isDisabled={!me.is_superuser}
           validate={required(
-            i18n._(
-              t`Please agree to End User License Agreement before proceeding.`
-            ),
-            i18n
+            t`Please agree to End User License Agreement before proceeding.`
           )}
         />
       </FormGroup>
     </Flex>
   );
 }
-export default withI18n()(EulaStep);
+export default EulaStep;
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
index 68e4c48b6f..272e808d35 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { useHistory, Link, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import { Formik, useFormikContext } from 'formik';
 import {
@@ -23,7 +23,7 @@ import SubscriptionStep from './SubscriptionStep';
 import AnalyticsStep from './AnalyticsStep';
 import EulaStep from './EulaStep';
 
-const CustomFooter = withI18n()(({ i18n, isSubmitLoading }) => {
+const CustomFooter = ({ isSubmitLoading }) => {
   const { values, errors } = useFormikContext();
   const { me, license_info } = useConfig();
   const history = useHistory();
@@ -36,7 +36,7 @@ const CustomFooter = withI18n()(({ i18n, isSubmitLoading }) => {
             {activeStep.id === 'eula-step' ? (
               <Button
                 id="subscription-wizard-submit"
-                aria-label={i18n._(t`Submit`)}
+                aria-label={t`Submit`}
                 variant="primary"
                 onClick={onNext}
                 isDisabled={
@@ -77,7 +77,7 @@ const CustomFooter = withI18n()(({ i18n, isSubmitLoading }) => {
                 id="subscription-wizard-cancel"
                 ouiaId="subscription-wizard-cancel"
                 variant="link"
-                aria-label={i18n._(t`Cancel subscription edit`)}
+                aria-label={t`Cancel subscription edit`}
                 onClick={() => history.push('/settings/subscription/details')}
               >
                 <Trans>Cancel</Trans>
@@ -88,9 +88,9 @@ const CustomFooter = withI18n()(({ i18n, isSubmitLoading }) => {
       </WizardContextConsumer>
     </WizardFooter>
   );
-});
+};
 
-function SubscriptionEdit({ i18n }) {
+function SubscriptionEdit() {
   const history = useHistory();
   const { license_info, setConfig } = useConfig();
   const hasValidKey = Boolean(license_info?.valid_key);
@@ -209,25 +209,25 @@ function SubscriptionEdit({ i18n }) {
   const steps = [
     {
       name: hasValidKey
-        ? i18n._(t`Subscription Management`)
-        : `${brandName} ${i18n._(t`Subscription`)}`,
+        ? t`Subscription Management`
+        : `${brandName} ${t`Subscription`}`,
       id: 'subscription-step',
       component: <SubscriptionStep />,
     },
     ...(!hasValidKey
       ? [
           {
-            name: i18n._(t`User and Insights analytics`),
+            name: t`User and Insights analytics`,
             id: 'analytics-step',
             component: <AnalyticsStep />,
           },
         ]
       : []),
     {
-      name: i18n._(t`End user license agreement`),
+      name: t`End user license agreement`,
       component: <EulaStep />,
       id: 'eula-step',
-      nextButtonText: i18n._(t`Submit`),
+      nextButtonText: t`Submit`,
     },
   ];
 
@@ -270,7 +270,7 @@ function SubscriptionEdit({ i18n }) {
         {submitSuccessful && (
           <Alert
             variant="success"
-            title={i18n._(t`Save successful!`)}
+            title={t`Save successful!`}
             ouiaId="success-alert"
           >
             {subscriptionMgmtRoute ? (
@@ -289,4 +289,4 @@ function SubscriptionEdit({ i18n }) {
   );
 }
 
-export default withI18n()(SubscriptionEdit);
+export default SubscriptionEdit;
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionModal.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionModal.jsx
index c68c158a6a..9f15164b86 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionModal.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionModal.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import {
   Button,
@@ -28,7 +28,6 @@ import ContentEmpty from '../../../../components/ContentEmpty';
 import ContentLoading from '../../../../components/ContentLoading';
 
 function SubscriptionModal({
-  i18n,
   subscriptionCreds = {},
   selectedSubscription = null,
   onClose,
@@ -73,14 +72,14 @@ function SubscriptionModal({
 
   return (
     <Modal
-      aria-label={i18n._(t`Subscription selection modal`)}
+      aria-label={t`Subscription selection modal`}
       isOpen
       onClose={onClose}
-      title={i18n._(t`Select a subscription`)}
+      title={t`Select a subscription`}
       width="50%"
       actions={[
         <Button
-          aria-label={i18n._(t`Confirm selection`)}
+          aria-label={t`Confirm selection`}
           isDisabled={selected.length === 0}
           key="confirm"
           onClick={handleConfirm}
@@ -90,7 +89,7 @@ function SubscriptionModal({
           <Trans>Select</Trans>
         </Button>,
         <Button
-          aria-label={i18n._(t`Cancel`)}
+          aria-label={t`Cancel`}
           key="cancel"
           onClick={onClose}
           variant="link"
@@ -113,7 +112,7 @@ function SubscriptionModal({
                 We were unable to locate licenses associated with this account.
               </Trans>{' '}
               <Button
-                aria-label={i18n._(t`Close subscription modal`)}
+                aria-label={t`Close subscription modal`}
                 onClick={onClose}
                 variant="link"
                 isInline
@@ -128,23 +127,18 @@ function SubscriptionModal({
       )}
       {!isLoading && !error && subscriptions?.length === 0 && (
         <ContentEmpty
-          title={i18n._(t`No subscriptions found`)}
-          message={i18n._(
-            t`We were unable to locate subscriptions associated with this account.`
-          )}
+          title={t`No subscriptions found`}
+          message={t`We were unable to locate subscriptions associated with this account.`}
         />
       )}
       {!isLoading && !error && subscriptions?.length > 0 && (
-        <TableComposable
-          variant="compact"
-          aria-label={i18n._(t`Subscriptions table`)}
-        >
+        <TableComposable variant="compact" aria-label={t`Subscriptions table`}>
           <Thead>
             <Tr>
               <Th />
-              <Th>{i18n._(t`Name`)}</Th>
-              <Th modifier="fitContent">{i18n._(t`Managed nodes`)}</Th>
-              <Th modifier="fitContent">{i18n._(t`Expires`)}</Th>
+              <Th>{t`Name`}</Th>
+              <Th modifier="fitContent">{t`Managed nodes`}</Th>
+              <Th modifier="fitContent">{t`Expires`}</Th>
             </Tr>
           </Thead>
           <Tbody>
@@ -161,13 +155,11 @@ function SubscriptionModal({
                     rowIndex: `row-${subscription.pool_id}`,
                   }}
                 />
-                <Td dataLabel={i18n._(t`Trial`)}>
-                  {subscription.subscription_name}
-                </Td>
-                <Td dataLabel={i18n._(t`Managed nodes`)}>
+                <Td dataLabel={t`Trial`}>{subscription.subscription_name}</Td>
+                <Td dataLabel={t`Managed nodes`}>
                   {subscription.instance_count}
                 </Td>
-                <Td dataLabel={i18n._(t`Expires`)} modifier="nowrap">
+                <Td dataLabel={t`Expires`} modifier="nowrap">
                   {formatDateStringUTC(
                     new Date(subscription.license_date * 1000).toISOString()
                   )}
@@ -181,4 +173,4 @@ function SubscriptionModal({
   );
 }
 
-export default withI18n()(SubscriptionModal);
+export default SubscriptionModal;
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionStep.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionStep.jsx
index d102681acb..7bddc5cef2 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionStep.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionStep.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { Trans, t } from '@lingui/macro';
 import { useField, useFormikContext } from 'formik';
 import styled from 'styled-components';
@@ -30,7 +30,7 @@ const FileUploadField = styled(FormGroup)`
   }
 `;
 
-function SubscriptionStep({ i18n }) {
+function SubscriptionStep() {
   const config = useConfig();
   const hasValidKey = Boolean(config?.license_info?.valid_key);
 
@@ -65,40 +65,36 @@ function SubscriptionStep({ i18n }) {
       {!hasValidKey && (
         <>
           <b>
-            {i18n._(t`Welcome to Red Hat Ansible Automation Platform!
-              Please complete the steps below to activate your subscription.`)}
+            {t`Welcome to Red Hat Ansible Automation Platform!
+              Please complete the steps below to activate your subscription.`}
           </b>
           <p>
-            {i18n._(t`If you do not have a subscription, you can visit
-            Red Hat to obtain a trial subscription.`)}
+            {t`If you do not have a subscription, you can visit
+            Red Hat to obtain a trial subscription.`}
           </p>
           <Button
-            aria-label={i18n._(t`Request subscription`)}
+            aria-label={t`Request subscription`}
             component="a"
             href={LICENSELINK}
             ouiaId="request-subscription-button"
             target="_blank"
             variant="secondary"
           >
-            {i18n._(t`Request subscription`)}
+            {t`Request subscription`}
           </Button>
           <Divider />
         </>
       )}
-      <p>
-        {i18n._(
-          t`Select your Ansible Automation Platform subscription to use.`
-        )}
-      </p>
+      <p>{t`Select your Ansible Automation Platform subscription to use.`}</p>
       <ToggleGroup>
         <ToggleGroupItem
-          text={i18n._(t`Subscription manifest`)}
+          text={t`Subscription manifest`}
           isSelected={isSelected === 'uploadManifest'}
           onChange={() => setIsSelected('uploadManifest')}
           id="subscription-manifest"
         />
         <ToggleGroupItem
-          text={i18n._(t`Username / password`)}
+          text={t`Username / password`}
           isSelected={isSelected === 'selectSubscription'}
           onChange={() => setIsSelected('selectSubscription')}
           id="username-password"
@@ -126,11 +122,9 @@ function SubscriptionStep({ i18n }) {
           <FileUploadField
             fieldId="subscription-manifest"
             validated={manifestMeta.error ? 'error' : 'default'}
-            helperTextInvalid={i18n._(
-              t`Invalid file format. Please upload a valid Red Hat Subscription Manifest.`
-            )}
-            label={i18n._(t`Red Hat subscription manifest`)}
-            helperText={i18n._(t`Upload a .zip file`)}
+            helperTextInvalid={t`Invalid file format. Please upload a valid Red Hat Subscription Manifest.`}
+            label={t`Red Hat subscription manifest`}
+            helperText={t`Upload a .zip file`}
             labelIcon={
               <Popover
                 content={
@@ -172,7 +166,7 @@ function SubscriptionStep({ i18n }) {
               id="upload-manifest"
               value={manifest.value}
               filename={manifestFilename.value}
-              browseButtonText={i18n._(t`Browse`)}
+              browseButtonText={t`Browse`}
               isDisabled={!config?.me?.is_superuser}
               dropzoneProps={{
                 accept: '.zip',
@@ -205,10 +199,10 @@ function SubscriptionStep({ i18n }) {
       ) : (
         <>
           <p>
-            {i18n._(t`Provide your Red Hat or Red Hat Satellite credentials
+            {t`Provide your Red Hat or Red Hat Satellite credentials
                  below and you can choose from a list of your available subscriptions.
                  The credentials you use will be stored for future use in
-                 retrieving renewal or expanded subscriptions.`)}
+                 retrieving renewal or expanded subscriptions.`}
           </p>
           <Flex
             direction={{ default: 'column', md: 'row' }}
@@ -218,7 +212,7 @@ function SubscriptionStep({ i18n }) {
           >
             <FormField
               id="username-field"
-              label={i18n._(t`Username`)}
+              label={t`Username`}
               name="username"
               type="text"
               isDisabled={!config.me.is_superuser}
@@ -226,17 +220,17 @@ function SubscriptionStep({ i18n }) {
             <PasswordField
               id="password-field"
               name="password"
-              label={i18n._(t`Password`)}
+              label={t`Password`}
               isDisabled={!config.me.is_superuser}
             />
             <Button
-              aria-label={i18n._(t`Get subscriptions`)}
+              aria-label={t`Get subscriptions`}
               ouiaId="subscription-modal-button"
               onClick={toggleModal}
               style={{ maxWidth: 'fit-content' }}
               isDisabled={!(username.value && password.value)}
             >
-              {i18n._(t`Get subscription`)}
+              {t`Get subscription`}
             </Button>
             {isModalOpen && (
               <SubscriptionModal
@@ -256,17 +250,17 @@ function SubscriptionStep({ i18n }) {
               alignSelf={{ default: 'alignSelfFlexStart' }}
               spaceItems={{ default: 'spaceItemsMd' }}
             >
-              <b>{i18n._(t`Selected`)}</b>
+              <b>{t`Selected`}</b>
               <FlexItem>
                 <i>{subscription?.value?.subscription_name}</i>
                 <Tooltip
                   trigger="mouseenter focus click"
-                  content={i18n._(t`Clear subscription`)}
+                  content={t`Clear subscription`}
                 >
                   <Button
                     onClick={() => subscriptionHelpers.setValue(null)}
                     variant="plain"
-                    aria-label={i18n._(t`Clear subscription selection`)}
+                    aria-label={t`Clear subscription selection`}
                     ouiaId="clear-subscription-selection"
                   >
                     <TimesIcon />
@@ -280,4 +274,4 @@ function SubscriptionStep({ i18n }) {
     </Flex>
   );
 }
-export default withI18n()(SubscriptionStep);
+export default SubscriptionStep;
diff --git a/awx/ui_next/src/screens/Setting/TACACS/TACACS.jsx b/awx/ui_next/src/screens/Setting/TACACS/TACACS.jsx
index 99a5da7868..40370df5fa 100644
--- a/awx/ui_next/src/screens/Setting/TACACS/TACACS.jsx
+++ b/awx/ui_next/src/screens/Setting/TACACS/TACACS.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
 import TACACSDetail from './TACACSDetail';
 import TACACSEdit from './TACACSEdit';
 
-function TACACS({ i18n }) {
+function TACACS() {
   const baseURL = '/settings/tacacs';
   return (
     <PageSection>
@@ -22,9 +22,7 @@ function TACACS({ i18n }) {
           </Route>
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
-              <Link to={`${baseURL}/details`}>
-                {i18n._(t`View TACACS+ settings`)}
-              </Link>
+              <Link to={`${baseURL}/details`}>{t`View TACACS+ settings`}</Link>
             </ContentError>
           </Route>
         </Switch>
@@ -33,4 +31,4 @@ function TACACS({ i18n }) {
   );
 }
 
-export default withI18n()(TACACS);
+export default TACACS;
diff --git a/awx/ui_next/src/screens/Setting/TACACS/TACACSDetail/TACACSDetail.jsx b/awx/ui_next/src/screens/Setting/TACACS/TACACSDetail/TACACSDetail.jsx
index 4f2bdaed77..257937d2a1 100644
--- a/awx/ui_next/src/screens/Setting/TACACS/TACACSDetail/TACACSDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/TACACS/TACACSDetail/TACACSDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -15,7 +15,7 @@ import { useConfig } from '../../../../contexts/Config';
 import { useSettings } from '../../../../contexts/Settings';
 import { SettingDetail } from '../../shared';
 
-function TACACSDetail({ i18n }) {
+function TACACSDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
 
@@ -36,14 +36,14 @@ function TACACSDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/tacacs/details`,
       id: 0,
     },
@@ -76,12 +76,12 @@ function TACACSDetail({ i18n }) {
         {me?.is_superuser && (
           <CardActionsRow>
             <Button
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/tacacs/edit"
               ouiaId="tacacs-detail-edit-button"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -90,4 +90,4 @@ function TACACSDetail({ i18n }) {
   );
 }
 
-export default withI18n()(TACACSDetail);
+export default TACACSDetail;
diff --git a/awx/ui_next/src/screens/Setting/UI/UI.jsx b/awx/ui_next/src/screens/Setting/UI/UI.jsx
index d7c308166d..eb2286fbe8 100644
--- a/awx/ui_next/src/screens/Setting/UI/UI.jsx
+++ b/awx/ui_next/src/screens/Setting/UI/UI.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { PageSection, Card } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
 import UIDetail from './UIDetail';
 import UIEdit from './UIEdit';
 
-function UI({ i18n }) {
+function UI() {
   const baseURL = '/settings/ui';
   return (
     <PageSection>
@@ -23,7 +23,7 @@ function UI({ i18n }) {
           <Route key="not-found" path={`${baseURL}/*`}>
             <ContentError isNotFound>
               <Link to={`${baseURL}/details`}>
-                {i18n._(t`View User Interface settings`)}
+                {t`View User Interface settings`}
               </Link>
             </ContentError>
           </Route>
@@ -33,4 +33,4 @@ function UI({ i18n }) {
   );
 }
 
-export default withI18n()(UI);
+export default UI;
diff --git a/awx/ui_next/src/screens/Setting/UI/UIDetail/UIDetail.jsx b/awx/ui_next/src/screens/Setting/UI/UIDetail/UIDetail.jsx
index 02e4873f59..d397a66c2d 100644
--- a/awx/ui_next/src/screens/Setting/UI/UIDetail/UIDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/UI/UIDetail/UIDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
@@ -16,7 +16,7 @@ import { useSettings } from '../../../../contexts/Settings';
 import { pluck } from '../../shared/settingUtils';
 import { SettingDetail } from '../../shared';
 
-function UIDetail({ i18n }) {
+function UIDetail() {
   const { me } = useConfig();
   const { GET: options } = useSettings();
 
@@ -45,14 +45,14 @@ function UIDetail({ i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Settings`)}
+          {t`Back to Settings`}
         </>
       ),
       link: `/settings`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/settings/ui/details`,
       id: 0,
     },
@@ -91,12 +91,12 @@ function UIDetail({ i18n }) {
         {me?.is_superuser && (
           <CardActionsRow>
             <Button
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to="/settings/ui/edit"
               ouiaId="ui-detail-edit-button"
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           </CardActionsRow>
         )}
@@ -105,4 +105,4 @@ function UIDetail({ i18n }) {
   );
 }
 
-export default withI18n()(UIDetail);
+export default UIDetail;
diff --git a/awx/ui_next/src/screens/Setting/shared/LoggingTestAlert.jsx b/awx/ui_next/src/screens/Setting/shared/LoggingTestAlert.jsx
index 4ec68182fc..a9e91673fa 100644
--- a/awx/ui_next/src/screens/Setting/shared/LoggingTestAlert.jsx
+++ b/awx/ui_next/src/screens/Setting/shared/LoggingTestAlert.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import {
@@ -8,23 +8,21 @@ import {
   AlertGroup,
 } from '@patternfly/react-core';
 
-function LoggingTestAlert({ i18n, successResponse, errorResponse, onClose }) {
+function LoggingTestAlert({ successResponse, errorResponse, onClose }) {
   let testMessage = null;
   if (successResponse) {
-    testMessage = i18n._(t`Log aggregator test sent successfully.`);
+    testMessage = t`Log aggregator test sent successfully.`;
   }
 
   let errorData = null;
   if (errorResponse) {
-    testMessage = i18n._(t`There was an error testing the log aggregator.`);
+    testMessage = t`There was an error testing the log aggregator.`;
     if (
       errorResponse?.response?.statusText &&
       errorResponse?.response?.status
     ) {
-      testMessage = i18n._(
-        t`${errorResponse.response.statusText}: ${errorResponse.response.status}`
-      );
-      errorData = i18n._(t`${errorResponse.response?.data?.error}`);
+      testMessage = t`${errorResponse.response.statusText}: ${errorResponse.response.status}`;
+      errorData = t`${errorResponse.response?.data?.error}`;
     }
   }
 
@@ -34,7 +32,7 @@ function LoggingTestAlert({ i18n, successResponse, errorResponse, onClose }) {
         <Alert
           actionClose={<AlertActionCloseButton onClose={onClose} />}
           ouiaId="logging-test-alert"
-          title={successResponse ? i18n._(t`Success`) : i18n._(t`Error`)}
+          title={successResponse ? t`Success` : t`Error`}
           variant={successResponse ? 'success' : 'danger'}
         >
           <b id="test-message">{testMessage}</b>
@@ -57,4 +55,4 @@ LoggingTestAlert.defaultProps = {
   onClose: () => {},
 };
 
-export default withI18n()(LoggingTestAlert);
+export default LoggingTestAlert;
diff --git a/awx/ui_next/src/screens/Setting/shared/RevertAllAlert.jsx b/awx/ui_next/src/screens/Setting/shared/RevertAllAlert.jsx
index 3622e0afd2..40b3d145fe 100644
--- a/awx/ui_next/src/screens/Setting/shared/RevertAllAlert.jsx
+++ b/awx/ui_next/src/screens/Setting/shared/RevertAllAlert.jsx
@@ -1,14 +1,14 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import AlertModal from '../../../components/AlertModal';
 
-function RevertAllAlert({ i18n, onClose, onRevertAll }) {
+function RevertAllAlert({ onClose, onRevertAll }) {
   return (
     <AlertModal
       isOpen
-      title={i18n._(t`Revert settings`)}
+      title={t`Revert settings`}
       variant="info"
       onClose={onClose}
       ouiaId="revert-all-modal"
@@ -17,26 +17,26 @@ function RevertAllAlert({ i18n, onClose, onRevertAll }) {
           ouiaId="revert-all-confirm-button"
           key="revert"
           variant="primary"
-          aria-label={i18n._(t`Confirm revert all`)}
+          aria-label={t`Confirm revert all`}
           onClick={onRevertAll}
         >
-          {i18n._(t`Revert all`)}
+          {t`Revert all`}
         </Button>,
         <Button
           ouiaId="revert-all-cancel-button"
           key="cancel"
           variant="link"
-          aria-label={i18n._(t`Cancel revert`)}
+          aria-label={t`Cancel revert`}
           onClick={onClose}
         >
-          {i18n._(t`Cancel`)}
+          {t`Cancel`}
         </Button>,
       ]}
     >
-      {i18n._(t`This will revert all configuration values on this page to
-      their factory defaults. Are you sure you want to proceed?`)}
+      {t`This will revert all configuration values on this page to
+      their factory defaults. Are you sure you want to proceed?`}
     </AlertModal>
   );
 }
 
-export default withI18n()(RevertAllAlert);
+export default RevertAllAlert;
diff --git a/awx/ui_next/src/screens/Setting/shared/RevertButton.jsx b/awx/ui_next/src/screens/Setting/shared/RevertButton.jsx
index a997388395..9002e77df5 100644
--- a/awx/ui_next/src/screens/Setting/shared/RevertButton.jsx
+++ b/awx/ui_next/src/screens/Setting/shared/RevertButton.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import { Button, Tooltip } from '@patternfly/react-core';
@@ -14,7 +14,6 @@ const ButtonWrapper = styled.div`
 `;
 
 function RevertButton({
-  i18n,
   id,
   defaultValue,
   isDisabled = false,
@@ -40,18 +39,18 @@ function RevertButton({
   }
 
   const revertTooltipContent = isRevertable
-    ? i18n._(t`Revert to factory default.`)
-    : i18n._(t`Restore initial value.`);
+    ? t`Revert to factory default.`
+    : t`Restore initial value.`;
   const tooltipContent =
     isDisabled || isMatch
-      ? i18n._(t`Setting matches factory default.`)
+      ? t`Setting matches factory default.`
       : revertTooltipContent;
 
   return (
     <Tooltip entryDelay={700} content={tooltipContent}>
       <ButtonWrapper>
         <Button
-          aria-label={isRevertable ? i18n._(t`Revert`) : i18n._(t`Undo`)}
+          aria-label={isRevertable ? t`Revert` : t`Undo`}
           ouiaId={`${id}-revert`}
           isInline
           isSmall
@@ -60,7 +59,7 @@ function RevertButton({
           variant="link"
           isDisabled={isDisabled || isMatch}
         >
-          {isRevertable ? i18n._(t`Revert`) : i18n._(t`Undo`)}
+          {isRevertable ? t`Revert` : t`Undo`}
         </Button>
       </ButtonWrapper>
     </Tooltip>
@@ -71,4 +70,4 @@ RevertButton.propTypes = {
   id: PropTypes.string.isRequired,
 };
 
-export default withI18n()(RevertButton);
+export default RevertButton;
diff --git a/awx/ui_next/src/screens/Setting/shared/RevertFormActionGroup.jsx b/awx/ui_next/src/screens/Setting/shared/RevertFormActionGroup.jsx
index 6a5a61b64c..1a067b7397 100644
--- a/awx/ui_next/src/screens/Setting/shared/RevertFormActionGroup.jsx
+++ b/awx/ui_next/src/screens/Setting/shared/RevertFormActionGroup.jsx
@@ -1,47 +1,41 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { ActionGroup, Button } from '@patternfly/react-core';
 import { FormFullWidthLayout } from '../../../components/FormLayout';
 
-const RevertFormActionGroup = ({
-  children,
-  onCancel,
-  onRevert,
-  onSubmit,
-  i18n,
-}) => {
+const RevertFormActionGroup = ({ children, onCancel, onRevert, onSubmit }) => {
   return (
     <FormFullWidthLayout>
       <ActionGroup>
         <Button
-          aria-label={i18n._(t`Save`)}
+          aria-label={t`Save`}
           variant="primary"
           type="button"
           onClick={onSubmit}
           ouiaId="save-button"
         >
-          {i18n._(t`Save`)}
+          {t`Save`}
         </Button>
         <Button
-          aria-label={i18n._(t`Revert all to default`)}
+          aria-label={t`Revert all to default`}
           variant="secondary"
           type="button"
           onClick={onRevert}
           ouiaId="revert-all-button"
         >
-          {i18n._(t`Revert all to default`)}
+          {t`Revert all to default`}
         </Button>
         {children}
         <Button
-          aria-label={i18n._(t`Cancel`)}
+          aria-label={t`Cancel`}
           variant="link"
           type="button"
           onClick={onCancel}
           ouiaId="cancel-button"
         >
-          {i18n._(t`Cancel`)}
+          {t`Cancel`}
         </Button>
       </ActionGroup>
     </FormFullWidthLayout>
@@ -54,4 +48,4 @@ RevertFormActionGroup.propTypes = {
   onSubmit: PropTypes.func.isRequired,
 };
 
-export default withI18n()(RevertFormActionGroup);
+export default RevertFormActionGroup;
diff --git a/awx/ui_next/src/screens/Setting/shared/SettingDetail.jsx b/awx/ui_next/src/screens/Setting/shared/SettingDetail.jsx
index fc6498b67e..f792d14776 100644
--- a/awx/ui_next/src/screens/Setting/shared/SettingDetail.jsx
+++ b/awx/ui_next/src/screens/Setting/shared/SettingDetail.jsx
@@ -1,120 +1,118 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Detail } from '../../../components/DetailList';
 import CodeDetail from '../../../components/DetailList/CodeDetail';
 
-export default withI18n()(
-  ({ i18n, helpText, id, label, type, unit = '', value }) => {
-    const dataType = value === '$encrypted$' ? 'encrypted' : type;
-    let detail = null;
+export default ({ helpText, id, label, type, unit = '', value }) => {
+  const dataType = value === '$encrypted$' ? 'encrypted' : type;
+  let detail = null;
 
-    switch (dataType) {
-      case 'nested object':
-        detail = (
-          <CodeDetail
-            dataCy={id}
-            helpText={helpText}
-            label={label}
-            mode="javascript"
-            rows={4}
-            value={JSON.stringify(value || {}, undefined, 2)}
-          />
-        );
-        break;
-      case 'list':
-        detail = (
-          <CodeDetail
-            dataCy={id}
-            helpText={helpText}
-            label={label}
-            mode="javascript"
-            rows={4}
-            value={JSON.stringify(value || [], undefined, 2)}
-          />
-        );
-        break;
-      case 'certificate':
-        detail = (
-          <CodeDetail
-            dataCy={id}
-            helpText={helpText}
-            label={label}
-            mode="javascript"
-            rows={4}
-            value={value}
-          />
-        );
-        break;
-      case 'image':
-        detail = (
-          <Detail
-            alwaysVisible
-            dataCy={id}
-            helpText={helpText}
-            isNotConfigured={!value}
-            label={label}
-            value={
-              !value ? (
-                i18n._(t`Not configured`)
-              ) : (
-                <img src={value} alt={label} height="40" width="40" />
-              )
-            }
-          />
-        );
-        break;
-      case 'encrypted':
-        detail = (
-          <Detail
-            alwaysVisible
-            dataCy={id}
-            helpText={helpText}
-            isEncrypted
-            label={label}
-            value={i18n._(t`Encrypted`)}
-          />
-        );
-        break;
-      case 'boolean':
-        detail = (
-          <Detail
-            alwaysVisible
-            dataCy={id}
-            helpText={helpText}
-            label={label}
-            value={value ? i18n._(t`On`) : i18n._(t`Off`)}
-          />
-        );
-        break;
-      case 'choice':
-      case 'field':
-      case 'string':
-        detail = (
-          <Detail
-            alwaysVisible
-            dataCy={id}
-            helpText={helpText}
-            isNotConfigured={!value}
-            label={label}
-            value={!value ? i18n._(t`Not configured`) : value}
-          />
-        );
-        break;
-      case 'integer':
-        detail = (
-          <Detail
-            alwaysVisible
-            dataCy={id}
-            helpText={helpText}
-            label={label}
-            value={unit ? `${value} ${unit}` : `${value}`}
-          />
-        );
-        break;
-      default:
-        detail = null;
-    }
-    return detail;
+  switch (dataType) {
+    case 'nested object':
+      detail = (
+        <CodeDetail
+          dataCy={id}
+          helpText={helpText}
+          label={label}
+          mode="javascript"
+          rows={4}
+          value={JSON.stringify(value || {}, undefined, 2)}
+        />
+      );
+      break;
+    case 'list':
+      detail = (
+        <CodeDetail
+          dataCy={id}
+          helpText={helpText}
+          label={label}
+          mode="javascript"
+          rows={4}
+          value={JSON.stringify(value || [], undefined, 2)}
+        />
+      );
+      break;
+    case 'certificate':
+      detail = (
+        <CodeDetail
+          dataCy={id}
+          helpText={helpText}
+          label={label}
+          mode="javascript"
+          rows={4}
+          value={value}
+        />
+      );
+      break;
+    case 'image':
+      detail = (
+        <Detail
+          alwaysVisible
+          dataCy={id}
+          helpText={helpText}
+          isNotConfigured={!value}
+          label={label}
+          value={
+            !value ? (
+              t`Not configured`
+            ) : (
+              <img src={value} alt={label} height="40" width="40" />
+            )
+          }
+        />
+      );
+      break;
+    case 'encrypted':
+      detail = (
+        <Detail
+          alwaysVisible
+          dataCy={id}
+          helpText={helpText}
+          isEncrypted
+          label={label}
+          value={t`Encrypted`}
+        />
+      );
+      break;
+    case 'boolean':
+      detail = (
+        <Detail
+          alwaysVisible
+          dataCy={id}
+          helpText={helpText}
+          label={label}
+          value={value ? t`On` : t`Off`}
+        />
+      );
+      break;
+    case 'choice':
+    case 'field':
+    case 'string':
+      detail = (
+        <Detail
+          alwaysVisible
+          dataCy={id}
+          helpText={helpText}
+          isNotConfigured={!value}
+          label={label}
+          value={!value ? t`Not configured` : value}
+        />
+      );
+      break;
+    case 'integer':
+      detail = (
+        <Detail
+          alwaysVisible
+          dataCy={id}
+          helpText={helpText}
+          label={label}
+          value={unit ? `${value} ${unit}` : `${value}`}
+        />
+      );
+      break;
+    default:
+      detail = null;
   }
-);
+  return detail;
+};
diff --git a/awx/ui_next/src/screens/Setting/shared/SharedFields.jsx b/awx/ui_next/src/screens/Setting/shared/SharedFields.jsx
index 39ac04381e..ee73869bad 100644
--- a/awx/ui_next/src/screens/Setting/shared/SharedFields.jsx
+++ b/awx/ui_next/src/screens/Setting/shared/SharedFields.jsx
@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 import { shape, string } from 'prop-types';
-import { useLingui } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
 import {
@@ -47,7 +46,6 @@ const SettingGroup = ({
   popoverContent,
   validated,
 }) => {
-  const { i18n } = useLingui();
   return (
     <FormGroup
       fieldId={fieldId}
@@ -60,7 +58,7 @@ const SettingGroup = ({
         <>
           <Popover
             content={popoverContent}
-            ariaLabel={`${i18n._(t`More information for`)} ${label}`}
+            ariaLabel={`${t`More information for`} ${label}`}
           />
           <RevertButton
             id={fieldId}
@@ -77,7 +75,6 @@ const SettingGroup = ({
 };
 const BooleanField = ({ ariaLabel = '', name, config, disabled = false }) => {
   const [field, meta, helpers] = useField(name);
-  const { i18n } = useLingui();
 
   return config ? (
     <SettingGroup
@@ -93,8 +90,8 @@ const BooleanField = ({ ariaLabel = '', name, config, disabled = false }) => {
         ouiaId={name}
         isChecked={field.value}
         isDisabled={disabled}
-        label={i18n._(t`On`)}
-        labelOff={i18n._(t`Off`)}
+        label={t`On`}
+        labelOff={t`Off`}
         onChange={() => helpers.setValue(!field.value)}
         aria-label={ariaLabel || config.label}
       />
@@ -107,9 +104,7 @@ BooleanField.propTypes = {
 };
 
 const ChoiceField = ({ name, config, isRequired = false }) => {
-  const { i18n } = useLingui();
-
-  const validate = isRequired ? required(null, i18n) : null;
+  const validate = isRequired ? required(null) : null;
   const [field, meta] = useField({ name, validate });
   const isValid = !meta.error || !meta.touched;
 
@@ -143,9 +138,7 @@ ChoiceField.propTypes = {
 };
 
 const EncryptedField = ({ name, config, isRequired = false }) => {
-  const { i18n } = useLingui();
-
-  const validate = isRequired ? required(null, i18n) : null;
+  const validate = isRequired ? required(null) : null;
   const [, meta] = useField({ name, validate });
   const isValid = !(meta.touched && meta.error);
 
@@ -177,15 +170,13 @@ EncryptedField.propTypes = {
 };
 
 const InputField = ({ name, config, type = 'text', isRequired = false }) => {
-  const { i18n } = useLingui();
-
   const min_value = config?.min_value ?? Number.MIN_SAFE_INTEGER;
   const max_value = config?.max_value ?? Number.MAX_SAFE_INTEGER;
   const validators = [
-    ...(isRequired ? [required(null, i18n)] : []),
-    ...(type === 'url' ? [url(i18n)] : []),
+    ...(isRequired ? [required(null)] : []),
+    ...(type === 'url' ? [url()] : []),
     ...(type === 'number'
-      ? [integer(i18n), minMaxValue(min_value, max_value, i18n)]
+      ? [integer(), minMaxValue(min_value, max_value)]
       : []),
   ];
   const [field, meta] = useField({ name, validate: combine(validators) });
@@ -221,9 +212,7 @@ InputField.propTypes = {
 };
 
 const TextAreaField = ({ name, config, isRequired = false }) => {
-  const { i18n } = useLingui();
-
-  const validate = isRequired ? required(null, i18n) : null;
+  const validate = isRequired ? required(null) : null;
   const [field, meta] = useField({ name, validate });
   const isValid = !(meta.touched && meta.error);
 
@@ -258,9 +247,7 @@ TextAreaField.propTypes = {
 };
 
 const ObjectField = ({ name, config, isRequired = false }) => {
-  const { i18n } = useLingui();
-
-  const validate = isRequired ? required(null, i18n) : null;
+  const validate = isRequired ? required(null) : null;
   const [field, meta, helpers] = useField({ name, validate });
   const isValid = !(meta.touched && meta.error);
 
@@ -308,9 +295,7 @@ const FileUploadField = ({
   type = 'text',
   isRequired = false,
 }) => {
-  const { i18n } = useLingui();
-
-  const validate = isRequired ? required(null, i18n) : null;
+  const validate = isRequired ? required(null) : null;
   const [filename, setFilename] = useState('');
   const [fileIsUploading, setFileIsUploading] = useState(false);
   const [field, meta, helpers] = useField({ name, validate });
diff --git a/awx/ui_next/src/screens/Team/Team.jsx b/awx/ui_next/src/screens/Team/Team.jsx
index a846334ccb..454653b386 100644
--- a/awx/ui_next/src/screens/Team/Team.jsx
+++ b/awx/ui_next/src/screens/Team/Team.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Link,
@@ -20,7 +20,7 @@ import { TeamsAPI } from '../../api';
 import TeamRolesList from './TeamRoles';
 import { ResourceAccessList } from '../../components/ResourceAccessList';
 
-function Team({ i18n, setBreadcrumb }) {
+function Team({ setBreadcrumb }) {
   const [team, setTeam] = useState(null);
   const [contentError, setContentError] = useState(null);
   const [hasContentLoading, setHasContentLoading] = useState(true);
@@ -46,15 +46,15 @@ function Team({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Teams`)}
+          {t`Back to Teams`}
         </>
       ),
       link: `/teams`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `/teams/${id}/details`, id: 0 },
-    { name: i18n._(t`Access`), link: `/teams/${id}/access`, id: 1 },
-    { name: i18n._(t`Roles`), link: `/teams/${id}/roles`, id: 2 },
+    { name: t`Details`, link: `/teams/${id}/details`, id: 0 },
+    { name: t`Access`, link: `/teams/${id}/access`, id: 1 },
+    { name: t`Roles`, link: `/teams/${id}/roles`, id: 2 },
   ];
 
   let showCardHeader = true;
@@ -70,8 +70,8 @@ function Team({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response.status === 404 && (
               <span>
-                {i18n._(t`Team not found.`)}{' '}
-                <Link to="/teams">{i18n._(t`View all Teams.`)}</Link>
+                {t`Team not found.`}{' '}
+                <Link to="/teams">{t`View all Teams.`}</Link>
               </span>
             )}
           </ContentError>
@@ -113,7 +113,7 @@ function Team({ i18n, setBreadcrumb }) {
               <ContentError isNotFound>
                 {id && (
                   <Link to={`/teams/${id}/details`}>
-                    {i18n._(t`View Team Details`)}
+                    {t`View Team Details`}
                   </Link>
                 )}
               </ContentError>
@@ -125,5 +125,5 @@ function Team({ i18n, setBreadcrumb }) {
   );
 }
 
-export default withI18n()(Team);
+export default Team;
 export { Team as _Team };
diff --git a/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.jsx b/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.jsx
index b624d995e2..7edf91bf0e 100644
--- a/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.jsx
+++ b/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { Link, useHistory, useParams } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 
@@ -13,7 +13,7 @@ import { formatDateString } from '../../../util/dates';
 import { TeamsAPI } from '../../../api';
 import useRequest, { useDismissableError } from '../../../util/useRequest';
 
-function TeamDetail({ team, i18n }) {
+function TeamDetail({ team }) {
   const { name, description, created, modified, summary_fields } = team;
   const history = useHistory();
   const { id } = useParams();
@@ -30,47 +30,40 @@ function TeamDetail({ team, i18n }) {
   return (
     <CardBody>
       <DetailList>
+        <Detail label={t`Name`} value={name} dataCy="team-detail-name" />
+        <Detail label={t`Description`} value={description} />
         <Detail
-          label={i18n._(t`Name`)}
-          value={name}
-          dataCy="team-detail-name"
-        />
-        <Detail label={i18n._(t`Description`)} value={description} />
-        <Detail
-          label={i18n._(t`Organization`)}
+          label={t`Organization`}
           value={
             <Link to={`/organizations/${summary_fields.organization.id}`}>
               {summary_fields.organization.name}
             </Link>
           }
         />
-        <Detail label={i18n._(t`Created`)} value={formatDateString(created)} />
-        <Detail
-          label={i18n._(t`Last Modified`)}
-          value={formatDateString(modified)}
-        />
+        <Detail label={t`Created`} value={formatDateString(created)} />
+        <Detail label={t`Last Modified`} value={formatDateString(modified)} />
       </DetailList>
       <CardActionsRow>
         {summary_fields.user_capabilities &&
           summary_fields.user_capabilities.edit && (
             <Button
               ouiaId="team-detail-edit-button"
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
               component={Link}
               to={`/teams/${id}/edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
         {summary_fields.user_capabilities &&
           summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={name}
-              modalTitle={i18n._(t`Delete Team`)}
+              modalTitle={t`Delete Team`}
               onConfirm={deleteTeam}
               isDisabled={isLoading}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -78,10 +71,10 @@ function TeamDetail({ team, i18n }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete team.`)}
+          {t`Failed to delete team.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -89,4 +82,4 @@ function TeamDetail({ team, i18n }) {
   );
 }
 
-export default withI18n()(TeamDetail);
+export default TeamDetail;
diff --git a/awx/ui_next/src/screens/Team/TeamList/TeamList.jsx b/awx/ui_next/src/screens/Team/TeamList/TeamList.jsx
index 3e91b5a226..6bfbe89005 100644
--- a/awx/ui_next/src/screens/Team/TeamList/TeamList.jsx
+++ b/awx/ui_next/src/screens/Team/TeamList/TeamList.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useState, useEffect, useCallback } from 'react';
 import { useLocation, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 
@@ -27,7 +27,7 @@ const QS_CONFIG = getQSConfig('team', {
   order_by: 'name',
 });
 
-function TeamList({ i18n }) {
+function TeamList() {
   const location = useLocation();
   const match = useRouteMatch();
   const [selected, setSelected] = useState([]);
@@ -121,29 +121,29 @@ function TeamList({ i18n }) {
             hasContentLoading={hasContentLoading}
             items={teams}
             itemCount={itemCount}
-            pluralizedItemName={i18n._(t`Teams`)}
+            pluralizedItemName={t`Teams`}
             qsConfig={QS_CONFIG}
             onRowClick={handleSelect}
             toolbarSearchColumns={[
               {
-                name: i18n._(t`Name`),
+                name: t`Name`,
                 key: 'name__icontains',
                 isDefault: true,
               },
               {
-                name: i18n._(t`Description`),
+                name: t`Description`,
                 key: 'description__icontains',
               },
               {
-                name: i18n._(t`Organization Name`),
+                name: t`Organization Name`,
                 key: 'organization__name__icontains',
               },
               {
-                name: i18n._(t`Created By (Username)`),
+                name: t`Created By (Username)`,
                 key: 'created_by__username__icontains',
               },
               {
-                name: i18n._(t`Modified By (Username)`),
+                name: t`Modified By (Username)`,
                 key: 'modified_by__username__icontains',
               },
             ]}
@@ -151,9 +151,9 @@ function TeamList({ i18n }) {
             toolbarRelatedSearchableKeys={relatedSearchableKeys}
             headerRow={
               <HeaderRow qsConfig={QS_CONFIG}>
-                <HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell>
-                <HeaderCell>{i18n._(t`Organization`)}</HeaderCell>
-                <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
+                <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
+                <HeaderCell>{t`Organization`}</HeaderCell>
+                <HeaderCell>{t`Actions`}</HeaderCell>
               </HeaderRow>
             }
             renderToolbar={props => (
@@ -176,7 +176,7 @@ function TeamList({ i18n }) {
                     key="delete"
                     onDelete={handleTeamDelete}
                     itemsToDelete={selected}
-                    pluralizedItemName={i18n._(t`Teams`)}
+                    pluralizedItemName={t`Teams`}
                   />,
                 ]}
               />
@@ -202,14 +202,14 @@ function TeamList({ i18n }) {
       <AlertModal
         isOpen={deletionError}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={clearDeletionError}
       >
-        {i18n._(t`Failed to delete one or more teams.`)}
+        {t`Failed to delete one or more teams.`}
         <ErrorDetail error={deletionError} />
       </AlertModal>
     </Fragment>
   );
 }
 
-export default withI18n()(TeamList);
+export default TeamList;
diff --git a/awx/ui_next/src/screens/Team/TeamList/TeamListItem.jsx b/awx/ui_next/src/screens/Team/TeamList/TeamListItem.jsx
index e7135a1fa5..67498056de 100644
--- a/awx/ui_next/src/screens/Team/TeamList/TeamListItem.jsx
+++ b/awx/ui_next/src/screens/Team/TeamList/TeamListItem.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import { Tr, Td } from '@patternfly/react-table';
@@ -10,14 +10,7 @@ import { PencilAltIcon } from '@patternfly/react-icons';
 import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
 import { Team } from '../../../types';
 
-function TeamListItem({
-  team,
-  isSelected,
-  onSelect,
-  detailUrl,
-  rowIndex,
-  i18n,
-}) {
+function TeamListItem({ team, isSelected, onSelect, detailUrl, rowIndex }) {
   TeamListItem.propTypes = {
     team: Team.isRequired,
     detailUrl: string.isRequired,
@@ -35,14 +28,14 @@ function TeamListItem({
           isSelected,
           onSelect,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         <Link id={labelId} to={`${detailUrl}`}>
           <b>{team.name}</b>
         </Link>
       </Td>
-      <Td dataLabel={i18n._(t`Organization`)}>
+      <Td dataLabel={t`Organization`}>
         {team.summary_fields.organization && (
           <Link
             to={`/organizations/${team.summary_fields.organization.id}/details`}
@@ -51,14 +44,14 @@ function TeamListItem({
           </Link>
         )}
       </Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)}>
+      <ActionsTd dataLabel={t`Actions`}>
         <ActionItem
           visible={team.summary_fields.user_capabilities.edit}
-          tooltip={i18n._(t`Edit Team`)}
+          tooltip={t`Edit Team`}
         >
           <Button
             ouiaId={`${team.id}-edit-button`}
-            aria-label={i18n._(t`Edit Team`)}
+            aria-label={t`Edit Team`}
             variant="plain"
             component={Link}
             to={`/teams/${team.id}/edit`}
@@ -70,4 +63,4 @@ function TeamListItem({
     </Tr>
   );
 }
-export default withI18n()(TeamListItem);
+export default TeamListItem;
diff --git a/awx/ui_next/src/screens/Team/TeamRoles/TeamRoleListItem.jsx b/awx/ui_next/src/screens/Team/TeamRoles/TeamRoleListItem.jsx
index 7c32f50d60..2902057444 100644
--- a/awx/ui_next/src/screens/Team/TeamRoles/TeamRoleListItem.jsx
+++ b/awx/ui_next/src/screens/Team/TeamRoles/TeamRoleListItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   DataListItem,
@@ -11,33 +11,33 @@ import { Link } from 'react-router-dom';
 import { DetailList, Detail } from '../../../components/DetailList';
 import DataListCell from '../../../components/DataListCell';
 
-function TeamRoleListItem({ role, i18n, detailUrl, onSelect }) {
+function TeamRoleListItem({ role, detailUrl, onSelect }) {
   const labelId = `teamRole-${role.id}`;
   return (
     <DataListItem key={role.id} aria-labelledby={labelId} id={`${role.id}`}>
       <DataListItemRow>
         <DataListItemCells
           dataListCells={[
-            <DataListCell key="name" aria-label={i18n._(t`resource name`)}>
+            <DataListCell key="name" aria-label={t`resource name`}>
               <Link to={`${detailUrl}`} id={labelId}>
                 <b>{role.summary_fields.resource_name}</b>
               </Link>
             </DataListCell>,
-            <DataListCell key="type" aria-label={i18n._(t`resource type`)}>
+            <DataListCell key="type" aria-label={t`resource type`}>
               {role.summary_fields && (
                 <DetailList stacked>
                   <Detail
-                    label={i18n._(t`Type`)}
+                    label={t`Type`}
                     value={role.summary_fields.resource_type_display_name}
                   />
                 </DetailList>
               )}
             </DataListCell>,
-            <DataListCell key="role" aria-label={i18n._(t`resource role`)}>
+            <DataListCell key="role" aria-label={t`resource role`}>
               {role.name && (
                 <DetailList stacked>
                   <Detail
-                    label={i18n._(t`Role`)}
+                    label={t`Role`}
                     value={
                       <Chip
                         key={role.name}
@@ -60,4 +60,4 @@ function TeamRoleListItem({ role, i18n, detailUrl, onSelect }) {
     </DataListItem>
   );
 }
-export default withI18n()(TeamRoleListItem);
+export default TeamRoleListItem;
diff --git a/awx/ui_next/src/screens/Team/TeamRoles/TeamRolesList.jsx b/awx/ui_next/src/screens/Team/TeamRoles/TeamRolesList.jsx
index 8c55e2f687..ab7d449d2c 100644
--- a/awx/ui_next/src/screens/Team/TeamRoles/TeamRolesList.jsx
+++ b/awx/ui_next/src/screens/Team/TeamRoles/TeamRolesList.jsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 
-import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 
 import {
@@ -28,7 +27,7 @@ const QS_CONFIG = getQSConfig('roles', {
   order_by: 'id',
 });
 
-function TeamRolesList({ i18n, me, team }) {
+function TeamRolesList({ me, team }) {
   const { search } = useLocation();
   const [roleToDisassociate, setRoleToDisassociate] = useState(null);
 
@@ -123,12 +122,10 @@ function TeamRolesList({ i18n, me, team }) {
       <EmptyState variant="full">
         <EmptyStateIcon icon={CubesIcon} />
         <Title headingLevel="h5" size="lg">
-          {i18n._(t`System Administrator`)}
+          {t`System Administrator`}
         </Title>
         <EmptyStateBody>
-          {i18n._(
-            t`System administrators have unrestricted access to all resources.`
-          )}
+          {t`System administrators have unrestricted access to all resources.`}
         </EmptyStateBody>
       </EmptyState>
     );
@@ -141,18 +138,18 @@ function TeamRolesList({ i18n, me, team }) {
         hasContentLoading={isLoading || isDisassociateLoading}
         items={roles}
         itemCount={roleCount}
-        pluralizedItemName={i18n._(t`Team Roles`)}
+        pluralizedItemName={t`Team Roles`}
         qsConfig={QS_CONFIG}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Role`),
+            name: t`Role`,
             key: 'role_field__icontains',
             isDefault: true,
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`ID`),
+            name: t`ID`,
             key: 'id',
           },
         ]}
@@ -168,7 +165,7 @@ function TeamRolesList({ i18n, me, team }) {
                     <UserAndTeamAccessAdd
                       apiModel={TeamsAPI}
                       onFetchData={fetchRoles}
-                      title={i18n._(t`Add team permissions`)}
+                      title={t`Add team permissions`}
                     />,
                   ]
                 : []),
@@ -189,36 +186,34 @@ function TeamRolesList({ i18n, me, team }) {
 
       {roleToDisassociate && (
         <AlertModal
-          aria-label={i18n._(t`Disassociate role`)}
+          aria-label={t`Disassociate role`}
           isOpen={roleToDisassociate}
           variant="error"
-          title={i18n._(t`Disassociate role!`)}
+          title={t`Disassociate role!`}
           onClose={() => setRoleToDisassociate(null)}
           actions={[
             <Button
               ouiaId="disassociate-confirm-button"
               key="disassociate"
               variant="danger"
-              aria-label={i18n._(t`confirm disassociate`)}
+              aria-label={t`confirm disassociate`}
               onClick={() => disassociateRole()}
             >
-              {i18n._(t`Disassociate`)}
+              {t`Disassociate`}
             </Button>,
             <Button
               ouiaId="disassociate-cancel-button"
               key="cancel"
               variant="link"
-              aria-label={i18n._(t`Cancel`)}
+              aria-label={t`Cancel`}
               onClick={() => setRoleToDisassociate(null)}
             >
-              {i18n._(t`Cancel`)}
+              {t`Cancel`}
             </Button>,
           ]}
         >
           <div>
-            {i18n._(
-              t`This action will disassociate the following role from ${roleToDisassociate.summary_fields.resource_name}:`
-            )}
+            {t`This action will disassociate the following role from ${roleToDisassociate.summary_fields.resource_name}:`}
             <br />
             <strong>{roleToDisassociate.name}</strong>
           </div>
@@ -228,14 +223,14 @@ function TeamRolesList({ i18n, me, team }) {
         <AlertModal
           isOpen={disassociationError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={clearDisassociationError}
         >
-          {i18n._(t`Failed to delete role.`)}
+          {t`Failed to delete role.`}
           <ErrorDetail error={disassociationError} />
         </AlertModal>
       )}
     </>
   );
 }
-export default withI18n()(TeamRolesList);
+export default TeamRolesList;
diff --git a/awx/ui_next/src/screens/Team/Teams.jsx b/awx/ui_next/src/screens/Team/Teams.jsx
index 0797a6685e..f3b55d3ed6 100644
--- a/awx/ui_next/src/screens/Team/Teams.jsx
+++ b/awx/ui_next/src/screens/Team/Teams.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { Route, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import { Config } from '../../contexts/Config';
@@ -9,31 +9,28 @@ import TeamList from './TeamList';
 import TeamAdd from './TeamAdd';
 import Team from './Team';
 
-function Teams({ i18n }) {
+function Teams() {
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/teams': i18n._(t`Teams`),
-    '/teams/add': i18n._(t`Create New Team`),
+    '/teams': t`Teams`,
+    '/teams/add': t`Create New Team`,
   });
 
-  const buildBreadcrumbConfig = useCallback(
-    team => {
-      if (!team) {
-        return;
-      }
+  const buildBreadcrumbConfig = useCallback(team => {
+    if (!team) {
+      return;
+    }
 
-      setBreadcrumbConfig({
-        '/teams': i18n._(t`Teams`),
-        '/teams/add': i18n._(t`Create New Team`),
-        [`/teams/${team.id}`]: `${team.name}`,
-        [`/teams/${team.id}/edit`]: i18n._(t`Edit Details`),
-        [`/teams/${team.id}/details`]: i18n._(t`Details`),
-        [`/teams/${team.id}/users`]: i18n._(t`Users`),
-        [`/teams/${team.id}/access`]: i18n._(t`Access`),
-        [`/teams/${team.id}/roles`]: i18n._(t`Roles`),
-      });
-    },
-    [i18n]
-  );
+    setBreadcrumbConfig({
+      '/teams': t`Teams`,
+      '/teams/add': t`Create New Team`,
+      [`/teams/${team.id}`]: `${team.name}`,
+      [`/teams/${team.id}/edit`]: t`Edit Details`,
+      [`/teams/${team.id}/details`]: t`Details`,
+      [`/teams/${team.id}/users`]: t`Users`,
+      [`/teams/${team.id}/access`]: t`Access`,
+      [`/teams/${team.id}/roles`]: t`Roles`,
+    });
+  }, []);
 
   return (
     <>
@@ -56,4 +53,4 @@ function Teams({ i18n }) {
 }
 
 export { Teams as _Teams };
-export default withI18n()(Teams);
+export default Teams;
diff --git a/awx/ui_next/src/screens/Team/shared/TeamForm.jsx b/awx/ui_next/src/screens/Team/shared/TeamForm.jsx
index 3d00969c41..762667f0cb 100644
--- a/awx/ui_next/src/screens/Team/shared/TeamForm.jsx
+++ b/awx/ui_next/src/screens/Team/shared/TeamForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik, useField, useFormikContext } from 'formik';
 import { Form } from '@patternfly/react-core';
@@ -10,14 +10,14 @@ import OrganizationLookup from '../../../components/Lookup/OrganizationLookup';
 import { required } from '../../../util/validators';
 import { FormColumnLayout } from '../../../components/FormLayout';
 
-function TeamFormFields({ team, i18n }) {
+function TeamFormFields({ team }) {
   const { setFieldValue } = useFormikContext();
   const [organization, setOrganization] = useState(
     team.summary_fields ? team.summary_fields.organization : null
   );
   const [, orgMeta, orgHelpers] = useField({
     name: 'organization',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   const onOrganizationChange = useCallback(
@@ -32,15 +32,15 @@ function TeamFormFields({ team, i18n }) {
     <>
       <FormField
         id="team-name"
-        label={i18n._(t`Name`)}
+        label={t`Name`}
         name="name"
         type="text"
-        validate={required(null, i18n)}
+        validate={required(null)}
         isRequired
       />
       <FormField
         id="team-description"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
         name="description"
         type="text"
       />
@@ -97,4 +97,4 @@ TeamForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(TeamForm);
+export default TeamForm;
diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
index 1a10abab11..743541b07c 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useCallback, useEffect } from 'react';
 import { Link, useHistory, useParams } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import {
   Button,
   Chip,
@@ -33,7 +33,7 @@ import useRequest, { useDismissableError } from '../../../util/useRequest';
 import ExecutionEnvironmentDetail from '../../../components/ExecutionEnvironmentDetail';
 import { relatedResourceDeleteRequests } from '../../../util/getRelatedResourceDeleteDetails';
 
-function JobTemplateDetail({ i18n, template }) {
+function JobTemplateDetail({ template }) {
   const {
     ask_inventory_on_launch,
     allow_simultaneous,
@@ -103,12 +103,12 @@ function JobTemplateDetail({ i18n, template }) {
   const canLaunch =
     summary_fields.user_capabilities && summary_fields.user_capabilities.start;
   const verbosityOptions = [
-    { verbosity: 0, details: i18n._(t`0 (Normal)`) },
-    { verbosity: 1, details: i18n._(t`1 (Verbose)`) },
-    { verbosity: 2, details: i18n._(t`2 (More Verbose)`) },
-    { verbosity: 3, details: i18n._(t`3 (Debug)`) },
-    { verbosity: 4, details: i18n._(t`4 (Connection Debug)`) },
-    { verbosity: 5, details: i18n._(t`5 (WinRM Debug)`) },
+    { verbosity: 0, details: t`0 (Normal)` },
+    { verbosity: 1, details: t`1 (Verbose)` },
+    { verbosity: 2, details: t`2 (More Verbose)` },
+    { verbosity: 3, details: t`3 (Debug)` },
+    { verbosity: 4, details: t`4 (Connection Debug)` },
+    { verbosity: 5, details: t`5 (WinRM Debug)` },
   ];
   const verbosityDetails = verbosityOptions.filter(
     option => option.verbosity === verbosity
@@ -121,22 +121,22 @@ function JobTemplateDetail({ i18n, template }) {
     <TextList component={TextListVariants.ul}>
       {become_enabled && (
         <TextListItem component={TextListItemVariants.li}>
-          {i18n._(t`Enable Privilege Escalation`)}
+          {t`Enable Privilege Escalation`}
         </TextListItem>
       )}
       {host_config_key && (
         <TextListItem component={TextListItemVariants.li}>
-          {i18n._(t`Allow Provisioning Callbacks`)}
+          {t`Allow Provisioning Callbacks`}
         </TextListItem>
       )}
       {allow_simultaneous && (
         <TextListItem component={TextListItemVariants.li}>
-          {i18n._(t`Enable Concurrent Jobs`)}
+          {t`Enable Concurrent Jobs`}
         </TextListItem>
       )}
       {use_fact_cache && (
         <TextListItem component={TextListItemVariants.li}>
-          {i18n._(t`Use Fact Storage`)}
+          {t`Use Fact Storage`}
         </TextListItem>
       )}
     </TextList>
@@ -150,7 +150,7 @@ function JobTemplateDetail({ i18n, template }) {
         <Link to={`/inventories/${inventorykind}/${id}/details`}>
           {summary_fields.inventory.name}
         </Link>
-        <span> {i18n._(t`(Prompt on launch)`)}</span>
+        <span> {t`(Prompt on launch)`}</span>
       </Fragment>
     ) : (
       <Link to={`/inventories/${inventorykind}/${id}/details`}>
@@ -170,12 +170,12 @@ function JobTemplateDetail({ i18n, template }) {
   return (
     <CardBody>
       <DetailList gutter="sm">
-        <Detail label={i18n._(t`Name`)} value={name} dataCy="jt-detail-name" />
-        <Detail label={i18n._(t`Description`)} value={description} />
-        <Detail label={i18n._(t`Job Type`)} value={job_type} />
+        <Detail label={t`Name`} value={name} dataCy="jt-detail-name" />
+        <Detail label={t`Description`} value={description} />
+        <Detail label={t`Job Type`} value={job_type} />
         {summary_fields.organization ? (
           <Detail
-            label={i18n._(t`Organization`)}
+            label={t`Organization`}
             value={
               <Link
                 to={`/organizations/${summary_fields.organization.id}/details`}
@@ -185,24 +185,22 @@ function JobTemplateDetail({ i18n, template }) {
             }
           />
         ) : (
-          <DeletedDetail label={i18n._(t`Organization`)} />
+          <DeletedDetail label={t`Organization`} />
         )}
         {summary_fields.inventory ? (
           <Detail
-            label={i18n._(t`Inventory`)}
+            label={t`Inventory`}
             value={inventoryValue(
               summary_fields.inventory.kind,
               summary_fields.inventory.id
             )}
           />
         ) : (
-          !ask_inventory_on_launch && (
-            <DeletedDetail label={i18n._(t`Inventory`)} />
-          )
+          !ask_inventory_on_launch && <DeletedDetail label={t`Inventory`} />
         )}
         {summary_fields.project ? (
           <Detail
-            label={i18n._(t`Project`)}
+            label={t`Project`}
             value={
               <Link to={`/projects/${summary_fields.project.id}/details`}>
                 {summary_fields.project.name}
@@ -210,61 +208,45 @@ function JobTemplateDetail({ i18n, template }) {
             }
           />
         ) : (
-          <DeletedDetail label={i18n._(t`Project`)} />
+          <DeletedDetail label={t`Project`} />
         )}
         <ExecutionEnvironmentDetail
           virtualEnvironment={custom_virtualenv}
           executionEnvironment={summary_fields?.execution_environment}
         />
-        <Detail
-          label={i18n._(t`Source Control Branch`)}
-          value={template.scm_branch}
-        />
-        <Detail label={i18n._(t`Playbook`)} value={playbook} />
-        <Detail label={i18n._(t`Forks`)} value={forks || '0'} />
-        <Detail label={i18n._(t`Limit`)} value={limit} />
-        <Detail
-          label={i18n._(t`Verbosity`)}
-          value={verbosityDetails[0].details}
-        />
-        <Detail label={i18n._(t`Timeout`)} value={timeout || '0'} />
-        <Detail
-          label={i18n._(t`Show Changes`)}
-          value={diff_mode ? i18n._(t`On`) : i18n._(t`Off`)}
-        />
-        <Detail label={i18n._(t`Job Slicing`)} value={job_slice_count} />
+        <Detail label={t`Source Control Branch`} value={template.scm_branch} />
+        <Detail label={t`Playbook`} value={playbook} />
+        <Detail label={t`Forks`} value={forks || '0'} />
+        <Detail label={t`Limit`} value={limit} />
+        <Detail label={t`Verbosity`} value={verbosityDetails[0].details} />
+        <Detail label={t`Timeout`} value={timeout || '0'} />
+        <Detail label={t`Show Changes`} value={diff_mode ? t`On` : t`Off`} />
+        <Detail label={t`Job Slicing`} value={job_slice_count} />
         {host_config_key && (
           <React.Fragment>
+            <Detail label={t`Host Config Key`} value={host_config_key} />
             <Detail
-              label={i18n._(t`Host Config Key`)}
-              value={host_config_key}
-            />
-            <Detail
-              label={i18n._(t`Provisioning Callback URL`)}
+              label={t`Provisioning Callback URL`}
               value={generateCallBackUrl}
             />
           </React.Fragment>
         )}
         {webhook_service && (
           <Detail
-            label={i18n._(t`Webhook Service`)}
-            value={
-              webhook_service === 'github'
-                ? i18n._(t`GitHub`)
-                : i18n._(t`GitLab`)
-            }
+            label={t`Webhook Service`}
+            value={webhook_service === 'github' ? t`GitHub` : t`GitLab`}
           />
         )}
         {webhook_receiver && (
           <Detail
-            label={i18n._(t`Webhook URL`)}
+            label={t`Webhook URL`}
             value={`${document.location.origin}${webhook_receiver}`}
           />
         )}
-        <Detail label={i18n._(t`Webhook Key`)} value={webhook_key} />
+        <Detail label={t`Webhook Key`} value={webhook_key} />
         {summary_fields.webhook_credential && (
           <Detail
-            label={i18n._(t`Webhook Credential`)}
+            label={t`Webhook Credential`}
             value={
               <Link
                 to={`/credentials/${summary_fields.webhook_credential.id}/details`}
@@ -275,22 +257,22 @@ function JobTemplateDetail({ i18n, template }) {
           />
         )}
         {renderOptionsField && (
-          <Detail label={i18n._(t`Options`)} value={renderOptions} />
+          <Detail label={t`Options`} value={renderOptions} />
         )}
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={created}
           user={summary_fields.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={modified}
           user={summary_fields.modified_by}
         />
         {summary_fields.credentials && summary_fields.credentials.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Credentials`)}
+            label={t`Credentials`}
             value={
               <ChipGroup
                 numChips={5}
@@ -306,7 +288,7 @@ function JobTemplateDetail({ i18n, template }) {
         {summary_fields.labels && summary_fields.labels.results.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Labels`)}
+            label={t`Labels`}
             value={
               <ChipGroup
                 numChips={5}
@@ -324,7 +306,7 @@ function JobTemplateDetail({ i18n, template }) {
         {instanceGroups.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Instance Groups`)}
+            label={t`Instance Groups`}
             value={
               <ChipGroup numChips={5} totalChips={instanceGroups.length}>
                 {instanceGroups.map(ig => (
@@ -339,7 +321,7 @@ function JobTemplateDetail({ i18n, template }) {
         {job_tags && job_tags.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Job Tags`)}
+            label={t`Job Tags`}
             value={
               <ChipGroup numChips={5} totalChips={job_tags.split(',').length}>
                 {job_tags.split(',').map(jobTag => (
@@ -354,7 +336,7 @@ function JobTemplateDetail({ i18n, template }) {
         {skip_tags && skip_tags.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Skip Tags`)}
+            label={t`Skip Tags`}
             value={
               <ChipGroup numChips={5} totalChips={skip_tags.split(',').length}>
                 {skip_tags.split(',').map(skipTag => (
@@ -369,7 +351,7 @@ function JobTemplateDetail({ i18n, template }) {
         <VariablesDetail
           value={extra_vars}
           rows={4}
-          label={i18n._(t`Variables`)}
+          label={t`Variables`}
           dataCy={`jt-details-${template.id}`}
         />
       </DetailList>
@@ -380,13 +362,13 @@ function JobTemplateDetail({ i18n, template }) {
               ouiaId="job-template-detail-edit-button"
               component={Link}
               to={`/templates/job_template/${templateId}/edit`}
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
         {canLaunch && (
-          <LaunchButton resource={template} aria-label={i18n._(t`Launch`)}>
+          <LaunchButton resource={template} aria-label={t`Launch`}>
             {({ handleLaunch, isLaunching }) => (
               <Button
                 ouiaId="job-template-detail-launch-button"
@@ -395,7 +377,7 @@ function JobTemplateDetail({ i18n, template }) {
                 onClick={handleLaunch}
                 isDisabled={isLaunching}
               >
-                {i18n._(t`Launch`)}
+                {t`Launch`}
               </Button>
             )}
           </LaunchButton>
@@ -405,15 +387,13 @@ function JobTemplateDetail({ i18n, template }) {
             <DeleteButton
               ouiaId="job-template-detail-delete-button"
               name={name}
-              modalTitle={i18n._(t`Delete Job Template`)}
+              modalTitle={t`Delete Job Template`}
               onConfirm={deleteJobTemplate}
               isDisabled={isDeleteLoading}
               deleteDetailsRequests={deleteDetailsRequests}
-              deleteMessage={i18n._(
-                t`This job template is currently being used by other resources. Are you sure you want to delete it?`
-              )}
+              deleteMessage={t`This job template is currently being used by other resources. Are you sure you want to delete it?`}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -422,10 +402,10 @@ function JobTemplateDetail({ i18n, template }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete job template.`)}
+          {t`Failed to delete job template.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -434,4 +414,4 @@ function JobTemplateDetail({ i18n, template }) {
 }
 
 export { JobTemplateDetail as _JobTemplateDetail };
-export default withI18n()(JobTemplateDetail);
+export default JobTemplateDetail;
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyList.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyList.jsx
index 939b08e0ce..55a6e9a68d 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyList.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyList.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { useRouteMatch } from 'react-router-dom';
 import {
@@ -32,7 +32,6 @@ function SurveyList({
   updateSurvey,
   deleteSurvey,
   canEdit,
-  i18n,
 }) {
   const match = useRouteMatch();
 
@@ -88,9 +87,7 @@ function SurveyList({
   const deleteModal = (
     <AlertModal
       variant="danger"
-      title={
-        isAllSelected ? i18n._(t`Delete Survey`) : i18n._(t`Delete Questions`)
-      }
+      title={isAllSelected ? t`Delete Survey` : t`Delete Questions`}
       isOpen={isDeleteModalOpen}
       onClose={() => {
         setIsDeleteModalOpen(false);
@@ -101,26 +98,26 @@ function SurveyList({
           ouiaId="delete-confirm-button"
           key="delete"
           variant="danger"
-          aria-label={i18n._(t`confirm delete`)}
+          aria-label={t`confirm delete`}
           onClick={handleDelete}
         >
-          {i18n._(t`Delete`)}
+          {t`Delete`}
         </Button>,
         <Button
           ouiaId="delete-cancel-button"
           key="cancel"
           variant="link"
-          aria-label={i18n._(t`cancel delete`)}
+          aria-label={t`cancel delete`}
           onClick={() => {
             setIsDeleteModalOpen(false);
             setSelected([]);
           }}
         >
-          {i18n._(t`Cancel`)}
+          {t`Cancel`}
         </Button>,
       ]}
     >
-      <div>{i18n._(t`This action will delete the following:`)}</div>
+      <div>{t`This action will delete the following:`}</div>
       {selected.map(question => (
         <span key={question.variable}>
           <strong>{question.question_name}</strong>
@@ -135,7 +132,7 @@ function SurveyList({
     content = <ContentLoading />;
   } else {
     content = (
-      <DataList aria-label={i18n._(t`Survey List`)}>
+      <DataList aria-label={t`Survey List`}>
         {questions?.map((question, index) => (
           <SurveyListItem
             key={question.variable}
@@ -160,9 +157,9 @@ function SurveyList({
         <Button
           onClick={() => setIsPreviewModalOpen(true)}
           variant="primary"
-          aria-label={i18n._(t`Preview`)}
+          aria-label={t`Preview`}
         >
-          {i18n._(t`Preview`)}
+          {t`Preview`}
         </Button>
       </DataList>
     );
@@ -173,11 +170,9 @@ function SurveyList({
       <EmptyState variant="full">
         <EmptyStateIcon icon={CubesIcon} />
         <Title size="lg" headingLevel="h3">
-          {i18n._(t`No survey questions found.`)}
+          {t`No survey questions found.`}
         </Title>
-        <EmptyStateBody>
-          {i18n._(t`Please add survey questions.`)}
-        </EmptyStateBody>
+        <EmptyStateBody>{t`Please add survey questions.`}</EmptyStateBody>
         <ToolbarAddButton isDisabled={!canEdit} linkTo={`${match.url}/add`} />
       </EmptyState>
     );
@@ -198,4 +193,4 @@ function SurveyList({
   );
 }
 
-export default withI18n()(SurveyList);
+export default SurveyList;
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx
index b5bebc3b87..6626ff73cd 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { Link } from 'react-router-dom';
 import {
   Button as _Button,
@@ -44,7 +44,7 @@ const Label = styled.b`
 function SurveyListItem({
   canEdit,
   question,
-  i18n,
+
   isLast,
   isFirst,
   isChecked,
@@ -54,21 +54,21 @@ function SurveyListItem({
 }) {
   return (
     <DataListItem
-      aria-labelledby={i18n._(t`Survey questions`)}
+      aria-labelledby={t`Survey questions`}
       id={`survey-list-item-${question.variable}`}
     >
       <DataListItemRow css="padding-left:16px">
         <DataListAction
           id="sortQuestions"
-          aria-labelledby={i18n._(t`Sort question order`)}
-          aria-label={i18n._(t`Sort question order`)}
+          aria-labelledby={t`Sort question order`}
+          aria-label={t`Sort question order`}
         >
           <Stack>
             <StackItem>
               <Button
                 ouiaId={`${question.variable}-move-up-button`}
                 variant="plain"
-                aria-label={i18n._(t`move up`)}
+                aria-label={t`move up`}
                 isDisabled={isFirst || !canEdit}
                 onClick={() => onMoveUp(question)}
               >
@@ -79,7 +79,7 @@ function SurveyListItem({
               <Button
                 ouiaId={`${question.variable}-move-down-button`}
                 variant="plain"
-                aria-label={i18n._(t`move down`)}
+                aria-label={t`move down`}
                 isDisabled={isLast || !canEdit}
                 onClick={() => onMoveDown(question)}
               >
@@ -103,7 +103,7 @@ function SurveyListItem({
                 </Link>
                 {question.required && (
                   <Required
-                    aria-label={i18n._(t`Required`)}
+                    aria-label={t`Required`}
                     className="pf-c-form__label-required"
                     aria-hidden="true"
                   >
@@ -114,13 +114,13 @@ function SurveyListItem({
             </DataListCell>,
 
             <DataListCell key="type">
-              <Label>{i18n._(t`Type`)}</Label>
+              <Label>{t`Type`}</Label>
               {question.type}
             </DataListCell>,
             <DataListCell key="default">
-              <Label>{i18n._(t`Default`)}</Label>
+              <Label>{t`Default`}</Label>
               {[question.type].includes('password') && (
-                <span>{i18n._(t`encrypted`).toUpperCase()}</span>
+                <span>{t`encrypted`.toUpperCase()}</span>
               )}
               {[question.type].includes('multiselect') &&
                 question.default.length > 0 && (
@@ -147,4 +147,4 @@ function SurveyListItem({
   );
 }
 
-export default withI18n()(SurveyListItem);
+export default SurveyListItem;
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.jsx
index 0a1e57d0c9..ae45e15bb3 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyPreviewModal.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik } from 'formik';
 
@@ -19,7 +19,6 @@ function SurveyPreviewModal({
   questions,
   isPreviewModalOpen,
   onToggleModalOpen,
-  i18n,
 }) {
   const initialValues = {};
   questions.forEach(q => {
@@ -29,8 +28,8 @@ function SurveyPreviewModal({
 
   return (
     <Modal
-      title={i18n._(t`Survey Preview`)}
-      aria-label={i18n._(t`Survey preview modal`)}
+      title={t`Survey Preview`}
+      aria-label={t`Survey preview modal`}
       isOpen={isPreviewModalOpen}
       onClose={() => onToggleModalOpen(false)}
       variant="small"
@@ -50,7 +49,7 @@ function SurveyPreviewModal({
                       id={`survey-preview-text-${q.variable}`}
                       value={q.default}
                       isDisabled
-                      aria-label={i18n._(t`Text`)}
+                      aria-label={t`Text`}
                     />
                   </FormGroup>
                 )}
@@ -64,7 +63,7 @@ function SurveyPreviewModal({
                       id={`survey-preview-textArea-${q.variable}`}
                       type={`survey-preview-textArea-${q.variable}`}
                       value={q.default}
-                      aria-label={i18n._(t`Text Area`)}
+                      aria-label={t`Text Area`}
                       isDisabled
                     />
                   </FormGroup>
@@ -87,8 +86,8 @@ function SurveyPreviewModal({
                     <Select
                       id={`survey-preview-multipleChoice-${q.variable}`}
                       isDisabled
-                      aria-label={i18n._(t`Multiple Choice`)}
-                      typeAheadAriaLabel={i18n._(t`Multiple Choice`)}
+                      aria-label={t`Multiple Choice`}
+                      typeAheadAriaLabel={t`Multiple Choice`}
                       placeholderText={q.default}
                       onToggle={() => {}}
                     />
@@ -109,8 +108,8 @@ function SurveyPreviewModal({
                         q.default.length > 0 ? q.default.split('\n') : []
                       }
                       onToggle={() => {}}
-                      aria-label={i18n._(t`Multi-Select`)}
-                      typeAheadAriaLabel={i18n._(t`Multi-Select`)}
+                      aria-label={t`Multi-Select`}
+                      typeAheadAriaLabel={t`Multi-Select`}
                       id={`survey-preview-multiSelect-${q.variable}`}
                     >
                       {q.choices.length > 0 &&
@@ -130,4 +129,4 @@ function SurveyPreviewModal({
     </Modal>
   );
 }
-export default withI18n()(SurveyPreviewModal);
+export default SurveyPreviewModal;
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx
index eed2a7584d..93f47aba77 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyQuestionForm.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { func, string, bool, number, shape } from 'prop-types';
 import { Formik, useField } from 'formik';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Form, FormGroup } from '@patternfly/react-core';
 import { FormColumnLayout } from '../../../components/FormLayout';
@@ -22,22 +22,20 @@ import {
   number as numberValidator,
 } from '../../../util/validators';
 
-function AnswerTypeField({ i18n }) {
+function AnswerTypeField() {
   const [field] = useField({
     name: 'type',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
 
   return (
     <FormGroup
-      label={i18n._(t`Answer type`)}
+      label={t`Answer type`}
       labelIcon={
         <Popover
-          content={i18n._(
-            t`Choose an answer type or format you want as the prompt for the user.
-          Refer to the Documentation for more additional
-          information about each option.`
-          )}
+          content={t`Choose an answer type or format you want as the prompt for the user.
+          Refer to the Ansible Tower Documentation for more additional
+          information about each option.`}
         />
       }
       isRequired
@@ -47,21 +45,21 @@ function AnswerTypeField({ i18n }) {
         id="question-type"
         {...field}
         data={[
-          { key: 'text', value: 'text', label: i18n._(t`Text`) },
-          { key: 'textarea', value: 'textarea', label: i18n._(t`Textarea`) },
-          { key: 'password', value: 'password', label: i18n._(t`Password`) },
+          { key: 'text', value: 'text', label: t`Text` },
+          { key: 'textarea', value: 'textarea', label: t`Textarea` },
+          { key: 'password', value: 'password', label: t`Password` },
           {
             key: 'multiplechoice',
             value: 'multiplechoice',
-            label: i18n._(t`Multiple Choice (single select)`),
+            label: t`Multiple Choice (single select)`,
           },
           {
             key: 'multiselect',
             value: 'multiselect',
-            label: i18n._(t`Multiple Choice (multiple select)`),
+            label: t`Multiple Choice (multiple select)`,
           },
-          { key: 'integer', value: 'integer', label: i18n._(t`Integer`) },
-          { key: 'float', value: 'float', label: i18n._(t`Float`) },
+          { key: 'integer', value: 'integer', label: t`Integer` },
+          { key: 'float', value: 'float', label: t`Float` },
         ]}
       />
     </FormGroup>
@@ -73,7 +71,6 @@ function SurveyQuestionForm({
   handleSubmit,
   handleCancel,
   submitError,
-  i18n,
 }) {
   const defaultIsNotAvailable = choices => {
     return defaultValue => {
@@ -81,9 +78,7 @@ function SurveyQuestionForm({
       const found = [...defaultValue].every(dA => choices.indexOf(dA) > -1);
 
       if (!found) {
-        errorMessage = i18n._(
-          t`Default choice must be answered from the choices listed.`
-        );
+        errorMessage = t`Default choice must be answered from the choices listed.`;
       }
       return errorMessage;
     };
@@ -113,34 +108,32 @@ function SurveyQuestionForm({
               id="question-name"
               name="question_name"
               type="text"
-              label={i18n._(t`Question`)}
-              validate={required(null, i18n)}
+              label={t`Question`}
+              validate={required(null)}
               isRequired
             />
             <FormField
               id="question-description"
               name="question_description"
               type="text"
-              label={i18n._(t`Description`)}
+              label={t`Description`}
             />
             <FormField
               id="question-variable"
               name="variable"
               type="text"
-              label={i18n._(t`Answer variable name`)}
-              validate={combine([noWhiteSpace(i18n), required(null, i18n)])}
+              label={t`Answer variable name`}
+              validate={combine([noWhiteSpace(), required(null)])}
               isRequired
-              tooltip={i18n._(
-                t`The suggested format for variable names is lowercase and
+              tooltip={t`The suggested format for variable names is lowercase and
                 underscore-separated (for example, foo_bar, user_id, host_name,
-                etc.). Variable names with spaces are not allowed.`
-              )}
+                etc.). Variable names with spaces are not allowed.`}
             />
-            <AnswerTypeField i18n={i18n} />
+            <AnswerTypeField />
             <CheckboxField
               id="question-required"
               name="required"
-              label={i18n._(t`Required`)}
+              label={t`Required`}
             />
           </FormColumnLayout>
           <FormColumnLayout>
@@ -150,13 +143,13 @@ function SurveyQuestionForm({
                   id="question-min"
                   name="min"
                   type="number"
-                  label={i18n._(t`Minimum length`)}
+                  label={t`Minimum length`}
                 />
                 <FormField
                   id="question-max"
                   name="max"
                   type="number"
-                  label={i18n._(t`Maximum length`)}
+                  label={t`Maximum length`}
                 />
               </>
             )}
@@ -166,13 +159,13 @@ function SurveyQuestionForm({
                   id="question-min"
                   name="min"
                   type="number"
-                  label={i18n._(t`Minimum`)}
+                  label={t`Minimum`}
                 />
                 <FormField
                   id="question-max"
                   name="max"
                   type="number"
-                  label={i18n._(t`Maximum`)}
+                  label={t`Maximum`}
                 />
               </>
             )}
@@ -182,15 +175,15 @@ function SurveyQuestionForm({
                 name="default"
                 validate={
                   {
-                    text: maxLength(formik.values.max, i18n),
-                    integer: integer(i18n),
-                    float: numberValidator(i18n),
+                    text: maxLength(formik.values.max),
+                    integer: integer(),
+                    float: numberValidator(),
                   }[formik.values.type]
                 }
                 min={formik.values.min}
                 max={formik.values.max}
                 type={formik.values.type === 'text' ? 'text' : 'number'}
-                label={i18n._(t`Default answer`)}
+                label={t`Default answer`}
               />
             )}
             {formik.values.type === 'textarea' && (
@@ -198,14 +191,14 @@ function SurveyQuestionForm({
                 id="question-default"
                 name="default"
                 type="textarea"
-                label={i18n._(t`Default answer`)}
+                label={t`Default answer`}
               />
             )}
             {formik.values.type === 'password' && (
               <PasswordField
                 id="question-default"
                 name="default"
-                label={i18n._(t`Default answer`)}
+                label={t`Default answer`}
               />
             )}
             {['multiplechoice', 'multiselect'].includes(formik.values.type) && (
@@ -214,24 +207,22 @@ function SurveyQuestionForm({
                   id="question-options"
                   name="choices"
                   type="textarea"
-                  label={i18n._(t`Multiple Choice Options`)}
-                  validate={required(null, i18n)}
-                  tooltip={i18n._(
-                    t`Each answer choice must be on a separate line.`
-                  )}
+                  label={t`Multiple Choice Options`}
+                  validate={required(null)}
+                  tooltip={t`Each answer choice must be on a separate line.`}
                   isRequired
                   rows="10"
                 />
                 <FormField
                   id="question-default"
                   name="default"
-                  validate={defaultIsNotAvailable(formik.values.choices, i18n)}
+                  validate={defaultIsNotAvailable(formik.values.choices)}
                   type={
                     formik.values.type === 'multiplechoice'
                       ? 'text'
                       : 'textarea'
                   }
-                  label={i18n._(t`Default answer`)}
+                  label={t`Default answer`}
                 />
               </>
             )}
@@ -266,4 +257,4 @@ SurveyQuestionForm.defaultProps = {
   submitError: null,
 };
 
-export default withI18n()(SurveyQuestionForm);
+export default SurveyQuestionForm;
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx
index 53be234309..ae4d47bc0f 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useRouteMatch } from 'react-router-dom';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import styled from 'styled-components';
 
 import {
@@ -23,7 +23,7 @@ function SurveyToolbar({
   canEdit,
   isAllSelected,
   onSelectAll,
-  i18n,
+
   surveyEnabled,
   onToggleSurvey,
   isDeleteDisabled,
@@ -41,16 +41,16 @@ function SurveyToolbar({
             onChange={isChecked => {
               onSelectAll(isChecked);
             }}
-            aria-label={i18n._(t`Select all`)}
+            aria-label={t`Select all`}
             id="select-all"
           />
         </ToolbarItem>
         <ToolbarItem>
           <Switch
-            aria-label={i18n._(t`Survey Toggle`)}
+            aria-label={t`Survey Toggle`}
             id="survey-toggle"
-            label={i18n._(t`On`)}
-            labelOff={i18n._(t`Off`)}
+            label={t`On`}
+            labelOff={t`Off`}
             isChecked={surveyEnabled}
             isDisabled={!canEdit}
             onChange={() => onToggleSurvey(!surveyEnabled)}
@@ -70,7 +70,7 @@ function SurveyToolbar({
               isDisabled={isDeleteDisabled}
               onClick={() => onToggleDeleteModal(true)}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </Button>
           </ToolbarItem>
         </ToolbarGroup>
@@ -79,4 +79,4 @@ function SurveyToolbar({
   );
 }
 
-export default withI18n()(SurveyToolbar);
+export default SurveyToolbar;
diff --git a/awx/ui_next/src/screens/Template/Template.jsx b/awx/ui_next/src/screens/Template/Template.jsx
index dddd151170..277d8eb925 100644
--- a/awx/ui_next/src/screens/Template/Template.jsx
+++ b/awx/ui_next/src/screens/Template/Template.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 import {
@@ -25,7 +25,7 @@ import JobTemplateEdit from './JobTemplateEdit';
 import { JobTemplatesAPI, OrganizationsAPI } from '../../api';
 import TemplateSurvey from './TemplateSurvey';
 
-function Template({ i18n, setBreadcrumb }) {
+function Template({ setBreadcrumb }) {
   const match = useRouteMatch();
   const location = useLocation();
   const { id: templateId } = useParams();
@@ -135,37 +135,37 @@ function Template({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Templates`)}
+          {t`Back to Templates`}
         </>
       ),
       link: `/templates`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `${match.url}/details` },
-    { name: i18n._(t`Access`), link: `${match.url}/access` },
+    { name: t`Details`, link: `${match.url}/details` },
+    { name: t`Access`, link: `${match.url}/access` },
   ];
 
   if (canSeeNotificationsTab) {
     tabsArray.push({
-      name: i18n._(t`Notifications`),
+      name: t`Notifications`,
       link: `${match.url}/notifications`,
     });
   }
 
   if (template) {
     tabsArray.push({
-      name: i18n._(t`Schedules`),
+      name: t`Schedules`,
       link: `${match.url}/schedules`,
     });
   }
 
   tabsArray.push(
     {
-      name: i18n._(t`Jobs`),
+      name: t`Jobs`,
       link: `${match.url}/jobs`,
     },
     {
-      name: canAddAndEditSurvey ? i18n._(t`Survey`) : i18n._(t`View Survey`),
+      name: canAddAndEditSurvey ? t`Survey` : t`View Survey`,
       link: `${match.url}/survey`,
     }
   );
@@ -181,8 +181,8 @@ function Template({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response?.status === 404 && (
               <span>
-                {i18n._(t`Template not found.`)}{' '}
-                <Link to="/templates">{i18n._(t`View all Templates.`)}</Link>
+                {t`Template not found.`}{' '}
+                <Link to="/templates">{t`View all Templates.`}</Link>
               </span>
             )}
           </ContentError>
@@ -262,7 +262,7 @@ function Template({ i18n, setBreadcrumb }) {
                     <Link
                       to={`/templates/${match?.params?.templateType}/${templateId}/details`}
                     >
-                      {i18n._(t`View Template Details`)}
+                      {t`View Template Details`}
                     </Link>
                   )}
                 </ContentError>
@@ -276,4 +276,4 @@ function Template({ i18n, setBreadcrumb }) {
 }
 
 export { Template as _Template };
-export default withI18n()(Template);
+export default Template;
diff --git a/awx/ui_next/src/screens/Template/TemplateSurvey.jsx b/awx/ui_next/src/screens/Template/TemplateSurvey.jsx
index c3701baa33..60531837b9 100644
--- a/awx/ui_next/src/screens/Template/TemplateSurvey.jsx
+++ b/awx/ui_next/src/screens/Template/TemplateSurvey.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { Switch, Route, useParams } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { JobTemplatesAPI, WorkflowJobTemplatesAPI } from '../../api';
 import ContentError from '../../components/ContentError';
@@ -9,7 +9,7 @@ import ErrorDetail from '../../components/ErrorDetail';
 import useRequest, { useDismissableError } from '../../util/useRequest';
 import { SurveyList, SurveyQuestionAdd, SurveyQuestionEdit } from './Survey';
 
-function TemplateSurvey({ template, canEdit, i18n }) {
+function TemplateSurvey({ template, canEdit }) {
   const [surveyEnabled, setSurveyEnabled] = useState(template.survey_enabled);
 
   const { templateType, id: templateId } = useParams();
@@ -127,10 +127,10 @@ function TemplateSurvey({ template, canEdit, i18n }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to update survey.`)}
+          {t`Failed to update survey.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -138,4 +138,4 @@ function TemplateSurvey({ template, canEdit, i18n }) {
   );
 }
 
-export default withI18n()(TemplateSurvey);
+export default TemplateSurvey;
diff --git a/awx/ui_next/src/screens/Template/Templates.jsx b/awx/ui_next/src/screens/Template/Templates.jsx
index 4deeeb32b3..d58e3a9e54 100644
--- a/awx/ui_next/src/screens/Template/Templates.jsx
+++ b/awx/ui_next/src/screens/Template/Templates.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useRef } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Route, withRouter, Switch } from 'react-router-dom';
 import { PageSection } from '@patternfly/react-core';
@@ -11,13 +11,11 @@ import WorkflowJobTemplate from './WorkflowJobTemplate';
 import JobTemplateAdd from './JobTemplateAdd';
 import WorkflowJobTemplateAdd from './WorkflowJobTemplateAdd';
 
-function Templates({ i18n }) {
+function Templates() {
   const initScreenHeader = useRef({
-    '/templates': i18n._(t`Templates`),
-    '/templates/job_template/add': i18n._(t`Create New Job Template`),
-    '/templates/workflow_job_template/add': i18n._(
-      t`Create New Workflow Template`
-    ),
+    '/templates': t`Templates`,
+    '/templates/job_template/add': t`Create New Job Template`,
+    '/templates/workflow_job_template/add': t`Create New Workflow Template`,
   });
   const [breadcrumbConfig, setScreenHeader] = useState(
     initScreenHeader.current
@@ -41,24 +39,22 @@ function Templates({ i18n }) {
       setScreenHeader({
         ...initScreenHeader.current,
         [templatePath]: `${template.name}`,
-        [`${templatePath}/details`]: i18n._(t`Details`),
-        [`${templatePath}/edit`]: i18n._(t`Edit Details`),
-        [`${templatePath}/access`]: i18n._(t`Access`),
-        [`${templatePath}/notifications`]: i18n._(t`Notifications`),
-        [`${templatePath}/jobs`]: i18n._(t`Jobs`),
-        [surveyPath]: i18n._(t`Survey`),
-        [`${surveyPath}/add`]: i18n._(t`Add Question`),
-        [`${surveyPath}/edit`]: i18n._(t`Edit Question`),
-        [schedulesPath]: i18n._(t`Schedules`),
-        [`${schedulesPath}/add`]: i18n._(t`Create New Schedule`),
+        [`${templatePath}/details`]: t`Details`,
+        [`${templatePath}/edit`]: t`Edit Details`,
+        [`${templatePath}/access`]: t`Access`,
+        [`${templatePath}/notifications`]: t`Notifications`,
+        [`${templatePath}/jobs`]: t`Jobs`,
+        [surveyPath]: t`Survey`,
+        [`${surveyPath}/add`]: t`Add Question`,
+        [`${surveyPath}/edit`]: t`Edit Question`,
+        [schedulesPath]: t`Schedules`,
+        [`${schedulesPath}/add`]: t`Create New Schedule`,
         [`${schedulesPath}/${schedule?.id}`]: `${schedule?.name}`,
-        [`${schedulesPath}/${schedule?.id}/details`]: i18n._(
-          t`Schedule Details`
-        ),
-        [`${schedulesPath}/${schedule?.id}/edit`]: i18n._(t`Edit Schedule`),
+        [`${schedulesPath}/${schedule?.id}/details`]: t`Schedule Details`,
+        [`${schedulesPath}/${schedule?.id}/edit`]: t`Edit Schedule`,
       });
     },
-    [i18n, template, schedule]
+    [template, schedule]
   );
 
   return (
@@ -91,4 +87,4 @@ function Templates({ i18n }) {
 }
 
 export { Templates as _Templates };
-export default withI18n()(withRouter(Templates));
+export default withRouter(Templates);
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx
index 237ea084bb..b080c8f768 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import { Card, PageSection } from '@patternfly/react-core';
 import {
@@ -29,7 +29,7 @@ import TemplateSurvey from './TemplateSurvey';
 import { Visualizer } from './WorkflowJobTemplateVisualizer';
 import ContentLoading from '../../components/ContentLoading';
 
-function WorkflowJobTemplate({ i18n, setBreadcrumb }) {
+function WorkflowJobTemplate({ setBreadcrumb }) {
   const location = useLocation();
   const match = useRouteMatch();
   const { id: templateId } = useParams();
@@ -112,41 +112,41 @@ function WorkflowJobTemplate({ i18n, setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Templates`)}
+          {t`Back to Templates`}
         </>
       ),
       link: `/templates`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `${match.url}/details` },
-    { name: i18n._(t`Access`), link: `${match.url}/access` },
+    { name: t`Details`, link: `${match.url}/details` },
+    { name: t`Access`, link: `${match.url}/access` },
   ];
 
   if (canSeeNotificationsTab) {
     tabsArray.push({
-      name: i18n._(t`Notifications`),
+      name: t`Notifications`,
       link: `${match.url}/notifications`,
     });
   }
 
   if (template) {
     tabsArray.push({
-      name: i18n._(t`Schedules`),
+      name: t`Schedules`,
       link: `${match.url}/schedules`,
     });
   }
 
   tabsArray.push(
     {
-      name: i18n._(t`Visualizer`),
+      name: t`Visualizer`,
       link: `${match.url}/visualizer`,
     },
     {
-      name: i18n._(t`Jobs`),
+      name: t`Jobs`,
       link: `${match.url}/jobs`,
     },
     {
-      name: canAddAndEditSurvey ? i18n._(t`Survey`) : i18n._(t`View Survey`),
+      name: canAddAndEditSurvey ? t`Survey` : t`View Survey`,
       link: `${match.url}/survey`,
     }
   );
@@ -176,8 +176,8 @@ function WorkflowJobTemplate({ i18n, setBreadcrumb }) {
           <ContentError error={contentError}>
             {contentError.response.status === 404 && (
               <span>
-                {i18n._(t`Template not found.`)}{' '}
-                <Link to="/templates">{i18n._(t`View all Templates.`)}</Link>
+                {t`Template not found.`}{' '}
+                <Link to="/templates">{t`View all Templates.`}</Link>
               </span>
             )}
           </ContentError>
@@ -276,7 +276,7 @@ function WorkflowJobTemplate({ i18n, setBreadcrumb }) {
                   <Link
                     to={`/templates/${match.params.templateType}/${match.params.id}/details`}
                   >
-                    {i18n._(t`View Template Details`)}
+                    {t`View Template Details`}
                   </Link>
                 )}
               </ContentError>
@@ -289,4 +289,4 @@ function WorkflowJobTemplate({ i18n, setBreadcrumb }) {
 }
 
 export { WorkflowJobTemplate as _WorkflowJobTemplate };
-export default withI18n()(WorkflowJobTemplate);
+export default WorkflowJobTemplate;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
index f9cc6961a8..ed781f09c8 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Chip,
@@ -30,7 +30,7 @@ import { toTitleCase } from '../../../util/strings';
 import { relatedResourceDeleteRequests } from '../../../util/getRelatedResourceDeleteDetails';
 import useRequest, { useDismissableError } from '../../../util/useRequest';
 
-function WorkflowJobTemplateDetail({ template, i18n }) {
+function WorkflowJobTemplateDetail({ template }) {
   const {
     id,
     ask_inventory_on_launch,
@@ -56,12 +56,12 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
     <TextList component={TextListVariants.ul}>
       {template.allow_simultaneous && (
         <TextListItem component={TextListItemVariants.li}>
-          {i18n._(t`- Enable Concurrent Jobs`)}
+          {t`- Enable Concurrent Jobs`}
         </TextListItem>
       )}
       {template.webhook_service && (
         <TextListItem component={TextListItemVariants.li}>
-          {i18n._(t`- Enable Webhooks`)}
+          {t`- Enable Webhooks`}
         </TextListItem>
       )}
     </TextList>
@@ -88,7 +88,7 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
         <Link to={`/inventories/${inventorykind}/${inventoryId}/details`}>
           <Label>{summary_fields.inventory.name}</Label>
         </Link>
-        <span> {i18n._(t`(Prompt on launch)`)}</span>
+        <span> {t`(Prompt on launch)`}</span>
       </>
     ) : (
       <Link to={`/inventories/${inventorykind}/${inventoryId}/details`}>
@@ -110,17 +110,17 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
   return (
     <CardBody>
       <DetailList gutter="sm">
-        <Detail label={i18n._(t`Name`)} value={name} dataCy="jt-detail-name" />
-        <Detail label={i18n._(t`Description`)} value={description} />
+        <Detail label={t`Name`} value={name} dataCy="jt-detail-name" />
+        <Detail label={t`Description`} value={description} />
         {summary_fields.recent_jobs?.length > 0 && (
           <Detail
             value={<Sparkline jobs={recentPlaybookJobs} />}
-            label={i18n._(t`Activity`)}
+            label={t`Activity`}
           />
         )}
         {summary_fields.organization && (
           <Detail
-            label={i18n._(t`Organization`)}
+            label={t`Organization`}
             value={
               <Link
                 to={`/organizations/${summary_fields.organization.id}/details`}
@@ -132,7 +132,7 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
         )}
         {summary_fields?.execution_environment && (
           <Detail
-            label={i18n._(t`Execution Environment`)}
+            label={t`Execution Environment`}
             value={
               <Link
                 to={`/execution_environments/${summary_fields.execution_environment.id}/details`}
@@ -142,10 +142,10 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
             }
           />
         )}
-        <Detail label={i18n._(t`Job Type`)} value={toTitleCase(type)} />
+        <Detail label={t`Job Type`} value={toTitleCase(type)} />
         {summary_fields.inventory && (
           <Detail
-            label={i18n._(t`Inventory`)}
+            label={t`Inventory`}
             value={inventoryValue(
               summary_fields.inventory.kind,
               summary_fields.inventory.id
@@ -153,20 +153,20 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
           />
         )}
         <Detail
-          label={i18n._(t`Webhook Service`)}
+          label={t`Webhook Service`}
           value={toTitleCase(template.webhook_service)}
         />
         {related.webhook_receiver && (
           <Detail
-            label={i18n._(t`Webhook URL`)}
+            label={t`Webhook URL`}
             value={`${urlOrigin}${template.related.webhook_receiver}`}
           />
         )}
-        <Detail label={i18n._(t`Webhook Key`)} value={webhook_key} />
+        <Detail label={t`Webhook Key`} value={webhook_key} />
         {webhook_credential && (
           <Detail
             fullWidth
-            label={i18n._(t`Webhook Credentials`)}
+            label={t`Webhook Credentials`}
             value={
               <Link
                 to={`/credentials/${summary_fields.webhook_credential.id}/details`}
@@ -177,22 +177,22 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
           />
         )}
         {renderOptionsField && (
-          <Detail label={i18n._(t`Options`)} value={renderOptions} />
+          <Detail label={t`Options`} value={renderOptions} />
         )}
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={created}
           user={summary_fields.created_by}
         />
         <UserDateDetail
-          label={i18n._(t`Modified`)}
+          label={t`Modified`}
           date={modified}
           user={summary_fields.modified_by}
         />
         {summary_fields.labels?.results?.length > 0 && (
           <Detail
             fullWidth
-            label={i18n._(t`Labels`)}
+            label={t`Labels`}
             value={
               <ChipGroup
                 numChips={3}
@@ -207,11 +207,7 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
             }
           />
         )}
-        <VariablesDetail
-          label={i18n._(t`Variables`)}
-          value={extra_vars}
-          rows={4}
-        />
+        <VariablesDetail label={t`Variables`} value={extra_vars} rows={4} />
       </DetailList>
       <CardActionsRow>
         {summary_fields.user_capabilities &&
@@ -220,13 +216,13 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
               ouiaId="workflow-job-template-detail-edit-button"
               component={Link}
               to={`/templates/workflow_job_template/${id}/edit`}
-              aria-label={i18n._(t`Edit`)}
+              aria-label={t`Edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
         {canLaunch && (
-          <LaunchButton resource={template} aria-label={i18n._(t`Launch`)}>
+          <LaunchButton resource={template} aria-label={t`Launch`}>
             {({ handleLaunch, isLaunching }) => (
               <Button
                 ouiaId="workflow-job-template-detail-launch-button"
@@ -235,7 +231,7 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
                 onClick={handleLaunch}
                 isDisabled={isLaunching}
               >
-                {i18n._(t`Launch`)}
+                {t`Launch`}
               </Button>
             )}
           </LaunchButton>
@@ -244,15 +240,13 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
           summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={name}
-              modalTitle={i18n._(t`Delete Workflow Job Template`)}
+              modalTitle={t`Delete Workflow Job Template`}
               onConfirm={deleteWorkflowJobTemplate}
               isDisabled={isLoading}
               deleteDetailsRequests={deleteDetailsRequests}
-              deleteMessage={i18n._(
-                t`This workflow job template is currently being used by other resources. Are you sure you want to delete it?`
-              )}
+              deleteMessage={t`This workflow job template is currently being used by other resources. Are you sure you want to delete it?`}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -260,10 +254,10 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete workflow job template.`)}
+          {t`Failed to delete workflow job template.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -271,4 +265,4 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
   );
 }
 export { WorkflowJobTemplateDetail as _WorkflowJobTemplateDetail };
-export default withI18n()(WorkflowJobTemplateDetail);
+export default WorkflowJobTemplateDetail;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/DeleteAllNodesModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/DeleteAllNodesModal.jsx
index 99fc39810f..0a22801ead 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/DeleteAllNodesModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/DeleteAllNodesModal.jsx
@@ -1,11 +1,11 @@
 import React, { useContext } from 'react';
 import { Button } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { WorkflowDispatchContext } from '../../../../contexts/Workflow';
 import AlertModal from '../../../../components/AlertModal';
 
-function DeleteAllNodesModal({ i18n }) {
+function DeleteAllNodesModal() {
   const dispatch = useContext(WorkflowDispatchContext);
   return (
     <AlertModal
@@ -15,34 +15,32 @@ function DeleteAllNodesModal({ i18n }) {
           id="confirm-delete-all-nodes"
           key="remove"
           variant="danger"
-          aria-label={i18n._(t`Confirm removal of all nodes`)}
+          aria-label={t`Confirm removal of all nodes`}
           onClick={() => dispatch({ type: 'DELETE_ALL_NODES' })}
         >
-          {i18n._(t`Remove`)}
+          {t`Remove`}
         </Button>,
         <Button
           ouiaId="delete-all-cancel-button"
           id="cancel-delete-all-nodes"
           key="cancel"
           variant="link"
-          aria-label={i18n._(t`Cancel node removal`)}
+          aria-label={t`Cancel node removal`}
           onClick={() => dispatch({ type: 'TOGGLE_DELETE_ALL_NODES_MODAL' })}
         >
-          {i18n._(t`Cancel`)}
+          {t`Cancel`}
         </Button>,
       ]}
       isOpen
       onClose={() => dispatch({ type: 'TOGGLE_DELETE_ALL_NODES_MODAL' })}
-      title={i18n._(t`Remove All Nodes`)}
+      title={t`Remove All Nodes`}
       variant="danger"
     >
       <p>
-        {i18n._(
-          t`Are you sure you want to remove all the nodes in this workflow?`
-        )}
+        {t`Are you sure you want to remove all the nodes in this workflow?`}
       </p>
     </AlertModal>
   );
 }
 
-export default withI18n()(DeleteAllNodesModal);
+export default DeleteAllNodesModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx
index 5d7baf4099..fe2d85c1f1 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx
@@ -1,17 +1,17 @@
 import React, { useContext } from 'react';
 import { Title } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { WorkflowDispatchContext } from '../../../../../contexts/Workflow';
 import LinkModal from './LinkModal';
 
-function LinkAddModal({ i18n }) {
+function LinkAddModal() {
   const dispatch = useContext(WorkflowDispatchContext);
   return (
     <LinkModal
       header={
         <Title headingLevel="h1" size="xl">
-          {i18n._(t`Add Link`)}
+          {t`Add Link`}
         </Title>
       }
       onConfirm={linkType => dispatch({ type: 'CREATE_LINK', linkType })}
@@ -19,4 +19,4 @@ function LinkAddModal({ i18n }) {
   );
 }
 
-export default withI18n()(LinkAddModal);
+export default LinkAddModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkDeleteModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkDeleteModal.jsx
index d0863a76fa..b350b92ce8 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkDeleteModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkDeleteModal.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useContext } from 'react';
 import { Button } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   WorkflowDispatchContext,
@@ -8,46 +8,44 @@ import {
 } from '../../../../../contexts/Workflow';
 import AlertModal from '../../../../../components/AlertModal';
 
-function LinkDeleteModal({ i18n }) {
+function LinkDeleteModal() {
   const dispatch = useContext(WorkflowDispatchContext);
   const { linkToDelete } = useContext(WorkflowStateContext);
   return (
     <AlertModal
       variant="danger"
-      title={i18n._(t`Remove Link`)}
+      title={t`Remove Link`}
       isOpen={linkToDelete}
       onClose={() => dispatch({ type: 'SET_LINK_TO_DELETE', value: null })}
       actions={[
         <Button
           ouiaId="link-remove-confirm-button"
           id="confirm-link-removal"
-          aria-label={i18n._(t`Confirm link removal`)}
+          aria-label={t`Confirm link removal`}
           key="remove"
           onClick={() => dispatch({ type: 'DELETE_LINK' })}
           variant="danger"
         >
-          {i18n._(t`Remove`)}
+          {t`Remove`}
         </Button>,
         <Button
           ouiaId="link-remove-cancel-button"
           id="cancel-link-removal"
-          aria-label={i18n._(t`Cancel link removal`)}
+          aria-label={t`Cancel link removal`}
           key="cancel"
           onClick={() => dispatch({ type: 'SET_LINK_TO_DELETE', value: null })}
           variant="link"
         >
-          {i18n._(t`Cancel`)}
+          {t`Cancel`}
         </Button>,
       ]}
     >
-      <p>{i18n._(t`Are you sure you want to remove this link?`)}</p>
+      <p>{t`Are you sure you want to remove this link?`}</p>
       {!linkToDelete.isConvergenceLink && (
         <Fragment>
           <br />
           <p>
-            {i18n._(
-              t`Removing this link will orphan the rest of the branch and cause it to be executed immediately on launch.`
-            )}
+            {t`Removing this link will orphan the rest of the branch and cause it to be executed immediately on launch.`}
           </p>
         </Fragment>
       )}
@@ -55,4 +53,4 @@ function LinkDeleteModal({ i18n }) {
   );
 }
 
-export default withI18n()(LinkDeleteModal);
+export default LinkDeleteModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx
index 8c4259b73a..be3ba0a697 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx
@@ -1,17 +1,17 @@
 import React, { useContext } from 'react';
 import { Title } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { WorkflowDispatchContext } from '../../../../../contexts/Workflow';
 import LinkModal from './LinkModal';
 
-function LinkEditModal({ i18n }) {
+function LinkEditModal() {
   const dispatch = useContext(WorkflowDispatchContext);
   return (
     <LinkModal
       header={
         <Title headingLevel="h1" size="xl">
-          {i18n._(t`Edit Link`)}
+          {t`Edit Link`}
         </Title>
       }
       onConfirm={linkType => dispatch({ type: 'UPDATE_LINK', linkType })}
@@ -19,4 +19,4 @@ function LinkEditModal({ i18n }) {
   );
 }
 
-export default withI18n()(LinkEditModal);
+export default LinkEditModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx
index fcf8d0129d..41d869bb9e 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx
@@ -1,6 +1,6 @@
 import React, { useContext, useState } from 'react';
 import { Button, FormGroup, Modal } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { func } from 'prop-types';
 import {
@@ -9,7 +9,7 @@ import {
 } from '../../../../../contexts/Workflow';
 import AnsibleSelect from '../../../../../components/AnsibleSelect';
 
-function LinkModal({ header, i18n, onConfirm }) {
+function LinkModal({ header, onConfirm }) {
   const dispatch = useContext(WorkflowDispatchContext);
   const { linkToEdit } = useContext(WorkflowStateContext);
   const [linkType, setLinkType] = useState(
@@ -20,8 +20,8 @@ function LinkModal({ header, i18n, onConfirm }) {
       width={600}
       header={header}
       isOpen
-      title={i18n._(t`Workflow Link`)}
-      aria-label={i18n._(t`Workflow link modal`)}
+      title={t`Workflow Link`}
+      aria-label={t`Workflow link modal`}
       onClose={() => dispatch({ type: 'CANCEL_LINK_MODAL' })}
       actions={[
         <Button
@@ -29,24 +29,24 @@ function LinkModal({ header, i18n, onConfirm }) {
           id="link-confirm"
           key="save"
           variant="primary"
-          aria-label={i18n._(t`Save link changes`)}
+          aria-label={t`Save link changes`}
           onClick={() => onConfirm(linkType)}
         >
-          {i18n._(t`Save`)}
+          {t`Save`}
         </Button>,
         <Button
           ouiaId="link-cancel-button"
           id="link-cancel"
           key="cancel"
           variant="link"
-          aria-label={i18n._(t`Cancel link changes`)}
+          aria-label={t`Cancel link changes`}
           onClick={() => dispatch({ type: 'CANCEL_LINK_MODAL' })}
         >
-          {i18n._(t`Cancel`)}
+          {t`Cancel`}
         </Button>,
       ]}
     >
-      <FormGroup fieldId="link-select" label={i18n._(t`Run`)}>
+      <FormGroup fieldId="link-select" label={t`Run`}>
         <AnsibleSelect
           id="link-select"
           name="linkType"
@@ -55,17 +55,17 @@ function LinkModal({ header, i18n, onConfirm }) {
             {
               value: 'always',
               key: 'always',
-              label: i18n._(t`Always`),
+              label: t`Always`,
             },
             {
               value: 'success',
               key: 'success',
-              label: i18n._(t`On Success`),
+              label: t`On Success`,
             },
             {
               value: 'failure',
               key: 'failure',
-              label: i18n._(t`On Failure`),
+              label: t`On Failure`,
             },
           ]}
           onChange={(event, value) => {
@@ -81,4 +81,4 @@ LinkModal.propTypes = {
   onConfirm: func.isRequired,
 };
 
-export default withI18n()(LinkModal);
+export default LinkModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeAddModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeAddModal.jsx
index 736a40dddd..47dc2b3348 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeAddModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeAddModal.jsx
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   WorkflowDispatchContext,
@@ -8,7 +8,7 @@ import {
 import NodeModal from './NodeModal';
 import { getAddedAndRemoved } from '../../../../../util/lists';
 
-function NodeAddModal({ i18n }) {
+function NodeAddModal() {
   const dispatch = useContext(WorkflowDispatchContext);
   const { addNodeSource } = useContext(WorkflowStateContext);
 
@@ -67,9 +67,9 @@ function NodeAddModal({ i18n }) {
     <NodeModal
       askLinkType={addNodeSource !== 1}
       onSave={addNode}
-      title={i18n._(t`Add Node`)}
+      title={t`Add Node`}
     />
   );
 }
 
-export default withI18n()(NodeAddModal);
+export default NodeAddModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeDeleteModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeDeleteModal.jsx
index 9c05eb063a..1367e563f6 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeDeleteModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeDeleteModal.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { Fragment, useContext } from 'react';
 import { Button } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   WorkflowDispatchContext,
@@ -9,13 +9,13 @@ import {
 } from '../../../../../contexts/Workflow';
 import AlertModal from '../../../../../components/AlertModal';
 
-function NodeDeleteModal({ i18n }) {
+function NodeDeleteModal() {
   const dispatch = useContext(WorkflowDispatchContext);
   const { nodeToDelete } = useContext(WorkflowStateContext);
   return (
     <AlertModal
       variant="danger"
-      title={i18n._(t`Remove Node`)}
+      title={t`Remove Node`}
       isOpen={nodeToDelete}
       onClose={() => dispatch({ type: 'SET_NODE_TO_DELETE', value: null })}
       actions={[
@@ -24,36 +24,36 @@ function NodeDeleteModal({ i18n }) {
           id="confirm-node-removal"
           key="remove"
           variant="danger"
-          aria-label={i18n._(t`Confirm node removal`)}
+          aria-label={t`Confirm node removal`}
           onClick={() => dispatch({ type: 'DELETE_NODE' })}
         >
-          {i18n._(t`Remove`)}
+          {t`Remove`}
         </Button>,
         <Button
           ouiaId="node-removal-cancel-button"
           id="cancel-node-removal"
           key="cancel"
           variant="link"
-          aria-label={i18n._(t`Cancel node removal`)}
+          aria-label={t`Cancel node removal`}
           onClick={() => dispatch({ type: 'SET_NODE_TO_DELETE', value: null })}
         >
-          {i18n._(t`Cancel`)}
+          {t`Cancel`}
         </Button>,
       ]}
     >
       {nodeToDelete && nodeToDelete.unifiedJobTemplate ? (
         <Fragment>
-          <p>{i18n._(t`Are you sure you want to remove the node below:`)}</p>
+          <p>{t`Are you sure you want to remove the node below:`}</p>
           <br />
           <strong css="color: var(--pf-global--danger-color--100)">
             {nodeToDelete.unifiedJobTemplate.name}
           </strong>
         </Fragment>
       ) : (
-        <p>{i18n._(t`Are you sure you want to remove this node?`)}</p>
+        <p>{t`Are you sure you want to remove this node?`}</p>
       )}
     </AlertModal>
   );
 }
 
-export default withI18n()(NodeDeleteModal);
+export default NodeDeleteModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeEditModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeEditModal.jsx
index 8298294324..a09d70f34a 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeEditModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeEditModal.jsx
@@ -1,10 +1,10 @@
 import React, { useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { WorkflowDispatchContext } from '../../../../../contexts/Workflow';
 import NodeModal from './NodeModal';
 
-function NodeEditModal({ i18n }) {
+function NodeEditModal() {
   const dispatch = useContext(WorkflowDispatchContext);
 
   const updateNode = (values, config) => {
@@ -53,12 +53,8 @@ function NodeEditModal({ i18n }) {
   };
 
   return (
-    <NodeModal
-      askLinkType={false}
-      onSave={updateNode}
-      title={i18n._(t`Edit Node`)}
-    />
+    <NodeModal askLinkType={false} onSave={updateNode} title={t`Edit Node`} />
   );
 }
 
-export default withI18n()(NodeEditModal);
+export default NodeEditModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.jsx
index 631ee9cc31..e289bd508e 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { useContext, useState, useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik, useFormikContext } from 'formik';
 import yaml from 'js-yaml';
@@ -34,7 +34,7 @@ import NodeNextButton from './NodeNextButton';
 
 function NodeModalForm({
   askLinkType,
-  i18n,
+
   onSave,
   title,
   credentialError,
@@ -68,7 +68,7 @@ function NodeModalForm({
   } = useWorkflowNodeSteps(
     launchConfig,
     surveyConfig,
-    i18n,
+
     values.nodeResource,
     askLinkType,
     resourceDefaultCredentials
@@ -116,8 +116,8 @@ function NodeModalForm({
   const nextButtonText = activeStep =>
     activeStep.id === promptSteps[promptSteps?.length - 1]?.id ||
     activeStep.name === 'Preview'
-      ? i18n._(t`Save`)
-      : i18n._(t`Next`);
+      ? t`Save`
+      : t`Next`;
 
   const CustomFooter = (
     <WizardFooter>
@@ -138,20 +138,20 @@ function NodeModalForm({
                 ouiaId="node-modal-back-button"
                 id="back-node-modal"
                 variant="secondary"
-                aria-label={i18n._(t`Back`)}
+                aria-label={t`Back`}
                 onClick={onBack}
               >
-                {i18n._(t`Back`)}
+                {t`Back`}
               </Button>
             )}
             <Button
               ouiaId="node-modal-cancel-button"
               id="cancel-node-modal"
               variant="link"
-              aria-label={i18n._(t`Cancel`)}
+              aria-label={t`Cancel`}
               onClick={handleCancel}
             >
-              {i18n._(t`Cancel`)}
+              {t`Cancel`}
             </Button>
           </>
         )}
@@ -164,7 +164,7 @@ function NodeModalForm({
       <AlertModal
         isOpen={error}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => {
           dismissError();
         }}
@@ -179,7 +179,7 @@ function NodeModalForm({
       <AlertModal
         isOpen={error}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => {
           dismissError();
         }}
@@ -222,7 +222,7 @@ function NodeModalForm({
   );
 }
 
-const NodeModalInner = ({ i18n, title, ...rest }) => {
+const NodeModalInner = ({ title, ...rest }) => {
   const { values } = useFormikContext();
 
   const wizardTitle = values.nodeResource
@@ -304,7 +304,7 @@ const NodeModalInner = ({ i18n, title, ...rest }) => {
       <AlertModal
         isOpen={error}
         variant="error"
-        title={i18n._(t`Error!`)}
+        title={t`Error!`}
         onClose={() => {
           dismissError();
         }}
@@ -320,7 +320,7 @@ const NodeModalInner = ({ i18n, title, ...rest }) => {
         isOpen
         steps={[
           {
-            name: i18n._(t`Loading`),
+            name: t`Loading`,
             component: <ContentLoading />,
           },
         ]}
@@ -338,12 +338,11 @@ const NodeModalInner = ({ i18n, title, ...rest }) => {
       resourceDefaultCredentials={resourceDefaultCredentials}
       isLaunchLoading={isLoading}
       title={wizardTitle}
-      i18n={i18n}
     />
   );
 };
 
-const NodeModal = ({ onSave, i18n, askLinkType, title }) => {
+const NodeModal = ({ onSave, askLinkType, title }) => {
   const { nodeToEdit } = useContext(WorkflowStateContext);
   const onSaveForm = (values, config) => {
     onSave(values, config);
@@ -367,7 +366,6 @@ const NodeModal = ({ onSave, i18n, askLinkType, title }) => {
         <Form autoComplete="off" onSubmit={formik.handleSubmit}>
           <NodeModalInner
             onSave={onSaveForm}
-            i18n={i18n}
             title={title}
             askLinkType={askLinkType}
           />
@@ -383,4 +381,4 @@ NodeModal.propTypes = {
   title: node.isRequired,
 };
 
-export default withI18n()(NodeModal);
+export default NodeModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.jsx
index f5d0ce4dda..fb27d2521a 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import { InventorySourcesAPI } from '../../../../../../api';
@@ -16,7 +16,7 @@ const QS_CONFIG = getQSConfig('inventory-sources', {
   order_by: 'name',
 });
 
-function InventorySourcesList({ i18n, nodeResource, onUpdateNodeResource }) {
+function InventorySourcesList({ nodeResource, onUpdateNodeResource }) {
   const location = useLocation();
 
   const {
@@ -78,30 +78,30 @@ function InventorySourcesList({ i18n, nodeResource, onUpdateNodeResource }) {
       renderToolbar={props => <DataListToolbar {...props} fillWidth />}
       toolbarSearchColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Source`),
+          name: t`Source`,
           key: 'or__source',
           options: [
-            [`file`, i18n._(t`File, directory or script`)],
-            [`scm`, i18n._(t`Sourced from a project`)],
-            [`ec2`, i18n._(t`Amazon EC2`)],
-            [`gce`, i18n._(t`Google Compute Engine`)],
-            [`azure_rm`, i18n._(t`Microsoft Azure Resource Manager`)],
-            [`vmware`, i18n._(t`VMware vCenter`)],
-            [`satellite6`, i18n._(t`Red Hat Satellite 6`)],
-            [`openstack`, i18n._(t`OpenStack`)],
-            [`rhv`, i18n._(t`Red Hat Virtualization`)],
-            [`tower`, i18n._(t`Ansible Tower`)],
+            [`file`, t`File, directory or script`],
+            [`scm`, t`Sourced from a project`],
+            [`ec2`, t`Amazon EC2`],
+            [`gce`, t`Google Compute Engine`],
+            [`azure_rm`, t`Microsoft Azure Resource Manager`],
+            [`vmware`, t`VMware vCenter`],
+            [`satellite6`, t`Red Hat Satellite 6`],
+            [`openstack`, t`OpenStack`],
+            [`rhv`, t`Red Hat Virtualization`],
+            [`tower`, t`Ansible Tower`],
           ],
         },
       ]}
       toolbarSortColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ]}
@@ -120,4 +120,4 @@ InventorySourcesList.defaultProps = {
   nodeResource: null,
 };
 
-export default withI18n()(InventorySourcesList);
+export default InventorySourcesList;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.jsx
index 3d4f226580..ede270eee1 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import { JobTemplatesAPI } from '../../../../../../api';
@@ -16,7 +16,7 @@ const QS_CONFIG = getQSConfig('job-templates', {
   order_by: 'name',
 });
 
-function JobTemplatesList({ i18n, nodeResource, onUpdateNodeResource }) {
+function JobTemplatesList({ nodeResource, onUpdateNodeResource }) {
   const location = useLocation();
 
   const {
@@ -80,26 +80,26 @@ function JobTemplatesList({ i18n, nodeResource, onUpdateNodeResource }) {
       showPageSizeOptions={false}
       toolbarSearchColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Playbook name`),
+          name: t`Playbook name`,
           key: 'playbook__icontains',
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
       ]}
       toolbarSortColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ]}
@@ -118,4 +118,4 @@ JobTemplatesList.defaultProps = {
   nodeResource: null,
 };
 
-export default withI18n()(JobTemplatesList);
+export default JobTemplatesList;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/NodeTypeStep.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/NodeTypeStep.jsx
index 59d0872826..2fd7a84732 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/NodeTypeStep.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/NodeTypeStep.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import styled from 'styled-components';
 import { useField } from 'formik';
@@ -45,7 +45,7 @@ const TimeoutLabel = styled.p`
   margin-left: 10px;
 `;
 
-function NodeTypeStep({ i18n }) {
+function NodeTypeStep() {
   const [nodeTypeField, , nodeTypeHelpers] = useField('nodeType');
   const [nodeResourceField, nodeResourceMeta, nodeResourceHelpers] = useField(
     'nodeResource'
@@ -74,40 +74,40 @@ function NodeTypeStep({ i18n }) {
         />
       )}
       <div css="display: flex; align-items: center; margin-bottom: 20px;">
-        <b css="margin-right: 24px">{i18n._(t`Node Type`)}</b>
+        <b css="margin-right: 24px">{t`Node Type`}</b>
         <div>
           <AnsibleSelect
             id="nodeResource-select"
-            label={i18n._(t`Select a Node Type`)}
+            label={t`Select a Node Type`}
             data={[
               {
                 key: 'workflow_approval_template',
                 value: 'workflow_approval_template',
-                label: i18n._(t`Approval`),
+                label: t`Approval`,
                 isDisabled: false,
               },
               {
                 key: 'inventory_source',
                 value: 'inventory_source',
-                label: i18n._(t`Inventory Source Sync`),
+                label: t`Inventory Source Sync`,
                 isDisabled: false,
               },
               {
                 key: 'job_template',
                 value: 'job_template',
-                label: i18n._(t`Job Template`),
+                label: t`Job Template`,
                 isDisabled: false,
               },
               {
                 key: 'project',
                 value: 'project',
-                label: i18n._(t`Project Sync`),
+                label: t`Project Sync`,
                 isDisabled: false,
               },
               {
                 key: 'workflow_job_template',
                 value: 'workflow_job_template',
-                label: i18n._(t`Workflow Job Template`),
+                label: t`Workflow Job Template`,
                 isDisabled: false,
               },
             ]}
@@ -156,24 +156,24 @@ function NodeTypeStep({ i18n }) {
                 name="approvalName"
                 id="approval-name"
                 isRequired
-                validate={required(null, i18n)}
+                validate={required(null)}
                 validated={isValid ? 'default' : 'error'}
-                label={i18n._(t`Name`)}
+                label={t`Name`}
               />
               <FormField
                 name="approvalDescription"
                 id="approval-description"
-                label={i18n._(t`Description`)}
+                label={t`Description`}
               />
               <FormGroup
-                label={i18n._(t`Timeout`)}
+                label={t`Timeout`}
                 fieldId="approval-timeout"
                 name="timeout"
               >
                 <div css="display: flex;align-items: center;">
                   <TimeoutInput
                     {...timeoutMinutesField}
-                    aria-label={i18n._(t`Timeout minutes`)}
+                    aria-label={t`Timeout minutes`}
                     id="approval-timeout-minutes"
                     min="0"
                     onChange={(value, event) => {
@@ -187,7 +187,7 @@ function NodeTypeStep({ i18n }) {
                   </TimeoutLabel>
                   <TimeoutInput
                     {...timeoutSecondsField}
-                    aria-label={i18n._(t`Timeout seconds`)}
+                    aria-label={t`Timeout seconds`}
                     id="approval-timeout-seconds"
                     min="0"
                     onChange={(value, event) => {
@@ -205,15 +205,13 @@ function NodeTypeStep({ i18n }) {
           )}
           <FormGroup
             fieldId="convergence"
-            label={i18n._(t`Convergence`)}
+            label={t`Convergence`}
             isRequired
             labelIcon={
               <Popover
                 content={
                   <>
-                    {i18n._(
-                      t`Preconditions for running this node when there are multiple parents. Refer to the`
-                    )}{' '}
+                    {t`Preconditions for running this node when there are multiple parents. Refer to the`}{' '}
                     <a
                       href={`${getDocsBaseUrl(
                         config
@@ -221,9 +219,9 @@ function NodeTypeStep({ i18n }) {
                       target="_blank"
                       rel="noopener noreferrer"
                     >
-                      {i18n._(t`documentation`)}
+                      {t`documentation`}
                     </a>{' '}
-                    {i18n._(t`for more info.`)}
+                    {t`for more info.`}
                   </>
                 }
               />
@@ -238,16 +236,16 @@ function NodeTypeStep({ i18n }) {
                 convergenceFieldHelpers.setValue(selection);
                 setIsConvergenceOpen(false);
               }}
-              aria-label={i18n._(t`Convergence select`)}
-              typeAheadAriaLabel={i18n._(t`Convergence select`)}
+              aria-label={t`Convergence select`}
+              typeAheadAriaLabel={t`Convergence select`}
               className="convergenceSelect"
               ouiaId="convergenceSelect"
             >
               <SelectOption key="any" value="any" id="select-option-any">
-                {i18n._(t`Any`)}
+                {t`Any`}
               </SelectOption>
               <SelectOption key="all" value="all" id="select-option-all">
-                {i18n._(t`All`)}
+                {t`All`}
               </SelectOption>
             </Select>
           </FormGroup>
@@ -256,4 +254,4 @@ function NodeTypeStep({ i18n }) {
     </>
   );
 }
-export default withI18n()(NodeTypeStep);
+export default NodeTypeStep;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/ProjectsList.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/ProjectsList.jsx
index 34fc52bef2..73d79b3bb3 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/ProjectsList.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/ProjectsList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import { ProjectsAPI } from '../../../../../../api';
@@ -16,7 +16,7 @@ const QS_CONFIG = getQSConfig('projects', {
   order_by: 'name',
 });
 
-function ProjectsList({ i18n, nodeResource, onUpdateNodeResource }) {
+function ProjectsList({ nodeResource, onUpdateNodeResource }) {
   const location = useLocation();
 
   const {
@@ -78,37 +78,37 @@ function ProjectsList({ i18n, nodeResource, onUpdateNodeResource }) {
       showPageSizeOptions={false}
       toolbarSearchColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Type`),
+          name: t`Type`,
           key: 'or__scm_type',
           options: [
-            [``, i18n._(t`Manual`)],
-            [`git`, i18n._(t`Git`)],
-            [`svn`, i18n._(t`Subversion`)],
-            [`archive`, i18n._(t`Remote Archive`)],
-            [`insights`, i18n._(t`Red Hat Insights`)],
+            [``, t`Manual`],
+            [`git`, t`Git`],
+            [`svn`, t`Subversion`],
+            [`archive`, t`Remote Archive`],
+            [`insights`, t`Red Hat Insights`],
           ],
         },
         {
-          name: i18n._(t`Source Control URL`),
+          name: t`Source Control URL`,
           key: 'scm_url__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
       ]}
       toolbarSortColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ]}
@@ -127,4 +127,4 @@ ProjectsList.defaultProps = {
   nodeResource: null,
 };
 
-export default withI18n()(ProjectsList);
+export default ProjectsList;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/WorkflowJobTemplatesList.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/WorkflowJobTemplatesList.jsx
index aac3f669d0..56a6642c28 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/WorkflowJobTemplatesList.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/WorkflowJobTemplatesList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { func, shape } from 'prop-types';
 import { WorkflowJobTemplatesAPI } from '../../../../../../api';
@@ -16,11 +16,7 @@ const QS_CONFIG = getQSConfig('workflow-job-templates', {
   order_by: 'name',
 });
 
-function WorkflowJobTemplatesList({
-  i18n,
-  nodeResource,
-  onUpdateNodeResource,
-}) {
+function WorkflowJobTemplatesList({ nodeResource, onUpdateNodeResource }) {
   const location = useLocation();
 
   const {
@@ -89,30 +85,30 @@ function WorkflowJobTemplatesList({
       showPageSizeOptions={false}
       toolbarSearchColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name__icontains',
           isDefault: true,
         },
         {
-          name: i18n._(t`Organization (Name)`),
+          name: t`Organization (Name)`,
           key: 'organization__name__icontains',
         },
         {
-          name: i18n._(t`Inventory (Name)`),
+          name: t`Inventory (Name)`,
           key: 'inventory__name__icontains',
         },
         {
-          name: i18n._(t`Created By (Username)`),
+          name: t`Created By (Username)`,
           key: 'created_by__username__icontains',
         },
         {
-          name: i18n._(t`Modified By (Username)`),
+          name: t`Modified By (Username)`,
           key: 'modified_by__username__icontains',
         },
       ]}
       toolbarSortColumns={[
         {
-          name: i18n._(t`Name`),
+          name: t`Name`,
           key: 'name',
         },
       ]}
@@ -131,4 +127,4 @@ WorkflowJobTemplatesList.defaultProps = {
   nodeResource: null,
 };
 
-export default withI18n()(WorkflowJobTemplatesList);
+export default WorkflowJobTemplatesList;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/useNodeTypeStep.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/useNodeTypeStep.jsx
index 5931d2041b..8f83c025df 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/useNodeTypeStep.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/useNodeTypeStep.jsx
@@ -6,7 +6,7 @@ import StepName from '../../../../../../components/LaunchPrompt/steps/StepName';
 
 const STEP_ID = 'nodeType';
 
-export default function useNodeTypeStep(launchConfig, i18n) {
+export default function useNodeTypeStep() {
   const [, meta] = useField('nodeType');
   const [approvalNameField] = useField('approvalName');
   const [nodeTypeField, ,] = useField('nodeType');
@@ -20,9 +20,7 @@ export default function useNodeTypeStep(launchConfig, i18n) {
           ((!value?.inventory || value?.inventory === null) &&
             !value?.ask_inventory_on_launch))
       ) {
-        return i18n._(
-          t`Job Templates with a missing inventory or project cannot be selected when creating or editing nodes.  Select another template or fix the missing fields to proceed.`
-        );
+        return t`Job Templates with a missing inventory or project cannot be selected when creating or editing nodes.  Select another template or fix the missing fields to proceed.`;
       }
       return undefined;
     },
@@ -32,7 +30,6 @@ export default function useNodeTypeStep(launchConfig, i18n) {
 
   return {
     step: getStep(
-      i18n,
       nodeTypeField,
       approvalNameField,
       nodeResourceField,
@@ -49,7 +46,6 @@ export default function useNodeTypeStep(launchConfig, i18n) {
   };
 }
 function getStep(
-  i18n,
   nodeTypeField,
   approvalNameField,
   nodeResourceField,
@@ -71,10 +67,10 @@ function getStep(
     id: STEP_ID,
     name: (
       <StepName hasErrors={formError} id="node-type-step">
-        {i18n._(t`Node type`)}
+        {t`Node type`}
       </StepName>
     ),
-    component: <NodeTypeStep i18n={i18n} />,
+    component: <NodeTypeStep />,
     enableNext: isEnabled(),
   };
 }
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.jsx
index d3288e4750..3cc3423d4c 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.jsx
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Modal } from '@patternfly/react-core';
 import {
@@ -15,7 +15,7 @@ import { jsonToYaml } from '../../../../../util/yaml';
 import { JobTemplatesAPI, WorkflowJobTemplatesAPI } from '../../../../../api';
 import getNodeType from '../../shared/WorkflowJobTemplateVisualizerUtils';
 
-function NodeViewModal({ i18n, readOnly }) {
+function NodeViewModal({ readOnly }) {
   const dispatch = useContext(WorkflowDispatchContext);
   const { nodeToView } = useContext(WorkflowStateContext);
   const {
@@ -123,10 +123,10 @@ function NodeViewModal({ i18n, readOnly }) {
   } else if (!fullUnifiedJobTemplate) {
     Content = (
       <p>
-        {i18n._(t`The resource associated with this node has been deleted.`)}
+        {t`The resource associated with this node has been deleted.`}
         &nbsp;&nbsp;
         {!readOnly
-          ? i18n._(t`Click the Edit button below to reconfigure the node.`)
+          ? t`Click the Edit button below to reconfigure the node.`
           : ''}
       </p>
     );
@@ -191,8 +191,8 @@ function NodeViewModal({ i18n, readOnly }) {
     <Modal
       variant="large"
       isOpen
-      title={fullUnifiedJobTemplate?.name || i18n._(t`Resource deleted`)}
-      aria-label={i18n._(t`Workflow node view modal`)}
+      title={fullUnifiedJobTemplate?.name || t`Resource deleted`}
+      aria-label={t`Workflow node view modal`}
       onClose={() => dispatch({ type: 'SET_NODE_TO_VIEW', value: null })}
       actions={
         readOnly
@@ -202,10 +202,10 @@ function NodeViewModal({ i18n, readOnly }) {
                 ouiaId="node-view-edit-button"
                 id="node-view-edit-button"
                 key="edit"
-                aria-label={i18n._(t`Edit Node`)}
+                aria-label={t`Edit Node`}
                 onClick={handleEdit}
               >
-                {i18n._(t`Edit`)}
+                {t`Edit`}
               </Button>,
             ]
       }
@@ -215,4 +215,4 @@ function NodeViewModal({ i18n, readOnly }) {
   );
 }
 
-export default withI18n()(NodeViewModal);
+export default NodeViewModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/RunStep.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/RunStep.jsx
index da08b9ad71..ba5c9a08f8 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/RunStep.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/RunStep.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { useField } from 'formik';
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
@@ -16,48 +16,40 @@ const Grid = styled.div`
   width: 100%;
 `;
 
-function RunStep({ i18n }) {
+function RunStep() {
   const [field, , helpers] = useField('linkType');
   return (
     <>
       <Title headingLevel="h1" size="xl">
-        {i18n._(t`Run`)}
+        {t`Run`}
       </Title>
       <p>
-        {i18n._(
-          t`Specify the conditions under which this node should be executed`
-        )}
+        {t`Specify the conditions under which this node should be executed`}
       </p>
       <Grid>
         <SelectableCard
           id="link-type-success"
           isSelected={field.value === 'success'}
-          label={i18n._(t`On Success`)}
-          description={i18n._(
-            t`Execute when the parent node results in a successful state.`
-          )}
+          label={t`On Success`}
+          description={t`Execute when the parent node results in a successful state.`}
           onClick={() => helpers.setValue('success')}
         />
         <SelectableCard
           id="link-type-failure"
           isSelected={field.value === 'failure'}
-          label={i18n._(t`On Failure`)}
-          description={i18n._(
-            t`Execute when the parent node results in a failure state.`
-          )}
+          label={t`On Failure`}
+          description={t`Execute when the parent node results in a failure state.`}
           onClick={() => helpers.setValue('failure')}
         />
         <SelectableCard
           id="link-type-always"
           isSelected={field.value === 'always'}
-          label={i18n._(t`Always`)}
-          description={i18n._(
-            t`Execute regardless of the parent node's final state.`
-          )}
+          label={t`Always`}
+          description={t`Execute regardless of the parent node's final state.`}
           onClick={() => helpers.setValue('always')}
         />
       </Grid>
     </>
   );
 }
-export default withI18n()(RunStep);
+export default RunStep;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useRunTypeStep.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useRunTypeStep.jsx
index 2ee6098fb7..a6fc249399 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useRunTypeStep.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useRunTypeStep.jsx
@@ -6,11 +6,11 @@ import StepName from '../../../../../components/LaunchPrompt/steps/StepName';
 
 const STEP_ID = 'runType';
 
-export default function useRunTypeStep(i18n, askLinkType) {
+export default function useRunTypeStep(askLinkType) {
   const [, meta] = useField('linkType');
 
   return {
-    step: getStep(askLinkType, meta, i18n),
+    step: getStep(askLinkType, meta),
     initialValues: askLinkType ? { linkType: 'success' } : {},
     isReady: true,
     contentError: null,
@@ -21,7 +21,7 @@ export default function useRunTypeStep(i18n, askLinkType) {
     validate: () => {},
   };
 }
-function getStep(askLinkType, meta, i18n) {
+function getStep(askLinkType, meta) {
   if (!askLinkType) {
     return null;
   }
@@ -29,7 +29,7 @@ function getStep(askLinkType, meta, i18n) {
     id: STEP_ID,
     name: (
       <StepName hasErrors={false} id="run-type-step">
-        {i18n._(t`Run type`)}
+        {t`Run type`}
       </StepName>
     ),
     component: <RunStep />,
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js
index 9d60376c64..771c8dad1f 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js
@@ -187,7 +187,7 @@ const getNodeToEditDefaultValues = (
 export default function useWorkflowNodeSteps(
   launchConfig,
   surveyConfig,
-  i18n,
+
   resource,
   askLinkType,
   resourceDefaultCredentials
@@ -201,17 +201,12 @@ export default function useWorkflowNodeSteps(
   const [visited, setVisited] = useState({});
 
   const steps = [
-    useRunTypeStep(i18n, askLinkType),
-    useNodeTypeStep(launchConfig, i18n),
-    useInventoryStep(launchConfig, resource, i18n, visited),
-    useCredentialsStep(
-      launchConfig,
-      resource,
-      resourceDefaultCredentials,
-      i18n
-    ),
-    useOtherPromptsStep(launchConfig, resource, i18n),
-    useSurveyStep(launchConfig, surveyConfig, resource, i18n, visited),
+    useRunTypeStep(askLinkType),
+    useNodeTypeStep(launchConfig),
+    useInventoryStep(launchConfig, resource, visited),
+    useCredentialsStep(launchConfig, resource, resourceDefaultCredentials),
+    useOtherPromptsStep(launchConfig, resource),
+    useSurveyStep(launchConfig, surveyConfig, resource, visited),
   ];
 
   const hasErrors = steps.some(step => step.hasError);
@@ -219,7 +214,7 @@ export default function useWorkflowNodeSteps(
   steps.push(
     usePreviewStep(
       launchConfig,
-      i18n,
+
       resource,
       surveyConfig,
       hasErrors,
@@ -263,9 +258,7 @@ export default function useWorkflowNodeSteps(
         !launchConfig?.ask_credential_on_launch &&
         launchConfig?.passwords_needed_to_start?.length > 0
       ) {
-        errors.nodeResource = i18n._(
-          t`Job Templates with credentials that prompt for passwords cannot be selected when creating or editing nodes`
-        );
+        errors.nodeResource = t`Job Templates with credentials that prompt for passwords cannot be selected when creating or editing nodes`;
       }
 
       if (initialValues.convergence === 'all') {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/UnsavedChangesModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/UnsavedChangesModal.jsx
index ce5c82b3e0..e57f04712c 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/UnsavedChangesModal.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/UnsavedChangesModal.jsx
@@ -1,18 +1,18 @@
 import React, { useContext } from 'react';
 import { Button, Modal } from '@patternfly/react-core';
-import { withI18n } from '@lingui/react';
+
 import { t, Trans } from '@lingui/macro';
 import { func } from 'prop-types';
 import { WorkflowDispatchContext } from '../../../../contexts/Workflow';
 
-function UnsavedChangesModal({ i18n, onSaveAndExit, onExit }) {
+function UnsavedChangesModal({ onSaveAndExit, onExit }) {
   const dispatch = useContext(WorkflowDispatchContext);
   return (
     <Modal
       width={600}
       isOpen
-      title={i18n._(t`Warning: Unsaved Changes`)}
-      aria-label={i18n._(t`Unsaved changes modal`)}
+      title={t`Warning: Unsaved Changes`}
+      aria-label={t`Unsaved changes modal`}
       onClose={() => dispatch({ type: 'TOGGLE_UNSAVED_CHANGES_MODAL' })}
       actions={[
         <Button
@@ -20,20 +20,20 @@ function UnsavedChangesModal({ i18n, onSaveAndExit, onExit }) {
           id="confirm-exit-without-saving"
           key="exit"
           variant="danger"
-          aria-label={i18n._(t`Exit Without Saving`)}
+          aria-label={t`Exit Without Saving`}
           onClick={onExit}
         >
-          {i18n._(t`Exit Without Saving`)}
+          {t`Exit Without Saving`}
         </Button>,
         <Button
           ouiaId="unsaved-changes-save-exit-button"
           id="confirm-save-and-exit"
           key="save"
           variant="primary"
-          aria-label={i18n._(t`Save & Exit`)}
+          aria-label={t`Save & Exit`}
           onClick={onSaveAndExit}
         >
-          {i18n._(t`Save & Exit`)}
+          {t`Save & Exit`}
         </Button>,
       ]}
     >
@@ -52,4 +52,4 @@ UnsavedChangesModal.propTypes = {
   onSaveAndExit: func.isRequired,
 };
 
-export default withI18n()(UnsavedChangesModal);
+export default UnsavedChangesModal;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.jsx
index b94bd7ac44..577488c2d0 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useReducer } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import styled from 'styled-components';
 import { shape } from 'prop-types';
 import { t } from '@lingui/macro';
@@ -109,7 +109,7 @@ const fetchWorkflowNodes = async (
   return workflowNodes.concat(data.results);
 };
 
-function Visualizer({ template, i18n }) {
+function Visualizer({ template }) {
   const history = useHistory();
   const [state, dispatch] = useReducer(workflowReducer, {
     addLinkSourceNode: null,
@@ -257,7 +257,6 @@ function Visualizer({ template, i18n }) {
         dispatch({
           type: 'GENERATE_NODES_AND_LINKS',
           nodes: workflowNodes,
-          i18n,
         });
       } catch (error) {
         dispatch({ type: 'SET_CONTENT_ERROR', value: error });
@@ -266,7 +265,7 @@ function Visualizer({ template, i18n }) {
       }
     }
     fetchData();
-  }, [template.id, i18n]);
+  }, [template.id]);
 
   // Update positions of nodes/links
   useEffect(() => {
@@ -593,11 +592,11 @@ function Visualizer({ template, i18n }) {
           <AlertModal
             isOpen
             variant="error"
-            title={i18n._(t`Error saving the workflow!`)}
+            title={t`Error saving the workflow!`}
             onClose={dismissNodeRequestError}
-            aria-label={i18n._(t`Error saving the workflow!`)}
+            aria-label={t`Error saving the workflow!`}
           >
-            {i18n._(t`There was an error saving the workflow.`)}
+            {t`There was an error saving the workflow.`}
             <ErrorDetail error={nodeRequestError} />
           </AlertModal>
         )}
@@ -610,4 +609,4 @@ Visualizer.propTypes = {
   template: shape().isRequired,
 };
 
-export default withI18n()(Visualizer);
+export default Visualizer;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerGraph.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerGraph.jsx
index 877979e711..a3c026b25c 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerGraph.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerGraph.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React, { useContext, useEffect, useRef, useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import { bool } from 'prop-types';
@@ -35,7 +35,7 @@ const WorkflowSVG = styled.svg`
   height: 100%;
 `;
 
-function VisualizerGraph({ i18n, readOnly }) {
+function VisualizerGraph({ readOnly }) {
   const [helpText, setHelpText] = useState(null);
   const [linkHelp, setLinkHelp] = useState();
   const [nodeHelp, setNodeHelp] = useState();
@@ -257,9 +257,7 @@ function VisualizerGraph({ i18n, readOnly }) {
             onMouseMove: e => drawPotentialLinkToCursor(e),
             onMouseOver: () =>
               setHelpText(
-                i18n._(
-                  t`Click an available node to create a new link.  Click outside the graph to cancel.`
-                )
+                t`Click an available node to create a new link.  Click outside the graph to cancel.`
               ),
             onMouseOut: () => setHelpText(null),
             onClick: () => handleBackgroundClick(),
@@ -339,4 +337,4 @@ VisualizerGraph.propTypes = {
   readOnly: bool.isRequired,
 };
 
-export default withI18n()(VisualizerGraph);
+export default VisualizerGraph;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerLink.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerLink.jsx
index cc00d9af9a..525b61a4c8 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerLink.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerLink.jsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { bool, func, shape } from 'prop-types';
 import { PencilAltIcon, PlusIcon, TrashAltIcon } from '@patternfly/react-icons';
@@ -22,13 +22,7 @@ const LinkG = styled.g`
   pointer-events: ${props => (props.ignorePointerEvents ? 'none' : 'auto')};
 `;
 
-function VisualizerLink({
-  i18n,
-  link,
-  updateLinkHelp,
-  readOnly,
-  updateHelpText,
-}) {
+function VisualizerLink({ link, updateLinkHelp, readOnly, updateHelpText }) {
   const ref = useRef(null);
   const [hovering, setHovering] = useState(false);
   const [pathD, setPathD] = useState();
@@ -52,7 +46,7 @@ function VisualizerLink({
         });
       }}
       onMouseEnter={() =>
-        updateHelpText(i18n._(t`Add a new node between these two nodes`))
+        updateHelpText(t`Add a new node between these two nodes`)
       }
       onMouseLeave={() => updateHelpText(null)}
     >
@@ -73,7 +67,7 @@ function VisualizerLink({
               setHovering(false);
               dispatch({ type: 'SET_LINK_TO_EDIT', value: link });
             }}
-            onMouseEnter={() => updateHelpText(i18n._(t`Edit this link`))}
+            onMouseEnter={() => updateHelpText(t`Edit this link`)}
             onMouseLeave={() => updateHelpText(null)}
           >
             <PencilAltIcon />
@@ -86,7 +80,7 @@ function VisualizerLink({
               setHovering(false);
               dispatch({ type: 'START_DELETE_LINK', link });
             }}
-            onMouseEnter={() => updateHelpText(i18n._(t`Delete this link`))}
+            onMouseEnter={() => updateHelpText(t`Delete this link`)}
             onMouseLeave={() => updateHelpText(null)}
           >
             <TrashAltIcon />
@@ -163,4 +157,4 @@ VisualizerLink.propTypes = {
   updateLinkHelp: func.isRequired,
 };
 
-export default withI18n()(VisualizerLink);
+export default VisualizerLink;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.jsx
index a92be897f8..73f96b116e 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.jsx
@@ -1,6 +1,6 @@
 import React, { useContext, useRef, useState } from 'react';
 import styled from 'styled-components';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { bool, func, shape } from 'prop-types';
 import {
@@ -53,7 +53,6 @@ const ConvergenceLabel = styled.p`
 NodeResourceName.displayName = 'NodeResourceName';
 
 function VisualizerNode({
-  i18n,
   node,
   onMouseOver,
   readOnly,
@@ -147,10 +146,8 @@ function VisualizerNode({
     if (addingLink) {
       updateHelpText(
         node.isInvalidLinkTarget
-          ? i18n._(
-              t`Invalid link target.  Unable to link to children or ancestor nodes.  Graph cycles are not supported.`
-            )
-          : i18n._(t`Click to create a new link to this node.`)
+          ? t`Invalid link target.  Unable to link to children or ancestor nodes.  Graph cycles are not supported.`
+          : t`Click to create a new link to this node.`
       );
       onMouseOver(node);
     }
@@ -174,7 +171,7 @@ function VisualizerNode({
       id="node-details"
       key="details"
       onClick={handleViewClick}
-      onMouseEnter={() => updateHelpText(i18n._(t`View node details`))}
+      onMouseEnter={() => updateHelpText(t`View node details`)}
       onMouseLeave={() => updateHelpText(null)}
     >
       <InfoIcon />
@@ -192,7 +189,7 @@ function VisualizerNode({
             setHovering(false);
             dispatch({ type: 'START_ADD_NODE', sourceNodeId: node.id });
           }}
-          onMouseEnter={() => updateHelpText(i18n._(t`Add a new node`))}
+          onMouseEnter={() => updateHelpText(t`Add a new node`)}
           onMouseLeave={() => updateHelpText(null)}
         >
           <PlusIcon />
@@ -202,7 +199,7 @@ function VisualizerNode({
           id="node-edit"
           key="edit"
           onClick={handleEditClick}
-          onMouseEnter={() => updateHelpText(i18n._(t`Edit this node`))}
+          onMouseEnter={() => updateHelpText(t`Edit this node`)}
           onMouseLeave={() => updateHelpText(null)}
         >
           <PencilAltIcon />
@@ -215,9 +212,7 @@ function VisualizerNode({
             setHovering(false);
             dispatch({ type: 'SELECT_SOURCE_FOR_LINKING', node });
           }}
-          onMouseEnter={() =>
-            updateHelpText(i18n._(t`Link to an available node`))
-          }
+          onMouseEnter={() => updateHelpText(t`Link to an available node`)}
           onMouseLeave={() => updateHelpText(null)}
         >
           <LinkIcon />
@@ -230,7 +225,7 @@ function VisualizerNode({
             setHovering(false);
             dispatch({ type: 'SET_NODE_TO_DELETE', value: node });
           }}
-          onMouseEnter={() => updateHelpText(i18n._(t`Delete this node`))}
+          onMouseEnter={() => updateHelpText(t`Delete this node`)}
           onMouseLeave={() => updateHelpText(null)}
         >
           <TrashAltIcon />
@@ -278,7 +273,7 @@ function VisualizerNode({
               x={wfConstants.nodeW / 2 - wfConstants.nodeW / 10 + 7}
               y={-wfConstants.nodeH / 4 - 1}
             >
-              <ConvergenceLabel>{i18n._(t`ALL`)}</ConvergenceLabel>
+              <ConvergenceLabel>{t`ALL`}</ConvergenceLabel>
             </foreignObject>
           </>
         )}
@@ -311,7 +306,7 @@ function VisualizerNode({
               {node?.fullUnifiedJobTemplate?.name ||
                 node?.originalNodeObject?.summary_fields?.unified_job_template
                   ?.name ||
-                i18n._(t`DELETED`)}
+                t`DELETED`}
             </NodeResourceName>
           </NodeContents>
         </foreignObject>
@@ -328,10 +323,10 @@ function VisualizerNode({
         <AlertModal
           isOpen={detailError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={handleDetailErrorClose}
         >
-          {i18n._(t`Failed to retrieve full node resource object.`)}
+          {t`Failed to retrieve full node resource object.`}
           <ErrorDetail error={detailError} />
         </AlertModal>
       )}
@@ -339,10 +334,10 @@ function VisualizerNode({
         <AlertModal
           isOpen={credentialsError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={handleCredentialsErrorClose}
         >
-          {i18n._(t`Failed to retrieve node credentials.`)}
+          {t`Failed to retrieve node credentials.`}
           <ErrorDetail error={credentialsError} />
         </AlertModal>
       )}
@@ -362,4 +357,4 @@ VisualizerNode.defaultProps = {
   onMouseOver: () => {},
 };
 
-export default withI18n()(VisualizerNode);
+export default VisualizerNode;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerStartScreen.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerStartScreen.jsx
index 66cebb6bf1..93b49502b2 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerStartScreen.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerStartScreen.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React, { useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button as PFButton } from '@patternfly/react-core';
 import styled from 'styled-components';
@@ -30,29 +30,27 @@ const StartPanelWrapper = styled.div`
   justify-content: center;
 `;
 
-function VisualizerStartScreen({ i18n, readOnly }) {
+function VisualizerStartScreen({ readOnly }) {
   const dispatch = useContext(WorkflowDispatchContext);
   return (
     <div css="flex: 1">
       <StartPanelWrapper>
         <StartPanel>
           {readOnly ? (
-            <p>
-              {i18n._(t`This workflow does not have any nodes configured.`)}
-            </p>
+            <p>{t`This workflow does not have any nodes configured.`}</p>
           ) : (
             <>
-              <p>{i18n._(t`Please click the Start button to begin.`)}</p>
+              <p>{t`Please click the Start button to begin.`}</p>
               <Button
                 ouiaId="visualizer-start-button"
                 id="visualizer-start"
-                aria-label={i18n._(t`Start`)}
+                aria-label={t`Start`}
                 onClick={() =>
                   dispatch({ type: 'START_ADD_NODE', sourceNodeId: 1 })
                 }
                 variant="primary"
               >
-                {i18n._(t`Start`)}
+                {t`Start`}
               </Button>
             </>
           )}
@@ -62,4 +60,4 @@ function VisualizerStartScreen({ i18n, readOnly }) {
   );
 }
 
-export default withI18n()(VisualizerStartScreen);
+export default VisualizerStartScreen;
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.jsx
index 0235bfd919..96f38aaed8 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.jsx
@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React, { useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { bool, func, shape } from 'prop-types';
 import {
@@ -50,7 +50,6 @@ const ActionButton = styled(Button)`
 ActionButton.displayName = 'ActionButton';
 
 function VisualizerToolbar({
-  i18n,
   onClose,
   onSave,
   template,
@@ -74,13 +73,13 @@ function VisualizerToolbar({
           {template.name}
         </Title>
         <div css="align-items: center; display: flex; flex: 1; justify-content: flex-end">
-          <div>{i18n._(t`Total Nodes`)}</div>
+          <div>{t`Total Nodes`}</div>
           <Badge id="visualizer-total-nodes-badge" isRead>
             {totalNodes}
           </Badge>
-          <Tooltip content={i18n._(t`Toggle legend`)} position="bottom">
+          <Tooltip content={t`Toggle legend`} position="bottom">
             <ActionButton
-              aria-label={i18n._(t`Toggle legend`)}
+              aria-label={t`Toggle legend`}
               id="visualizer-toggle-legend"
               isActive={totalNodes > 0 && showLegend}
               isDisabled={totalNodes === 0}
@@ -90,9 +89,9 @@ function VisualizerToolbar({
               <CompassIcon />
             </ActionButton>
           </Tooltip>
-          <Tooltip content={i18n._(t`Toggle tools`)} position="bottom">
+          <Tooltip content={t`Toggle tools`} position="bottom">
             <ActionButton
-              aria-label={i18n._(t`Toggle tools`)}
+              aria-label={t`Toggle tools`}
               id="visualizer-toggle-tools"
               isActive={totalNodes > 0 && showTools}
               isDisabled={totalNodes === 0}
@@ -102,12 +101,9 @@ function VisualizerToolbar({
               <WrenchIcon />
             </ActionButton>
           </Tooltip>
-          <Tooltip
-            content={i18n._(t`Workflow documentation`)}
-            position="bottom"
-          >
+          <Tooltip content={t`Workflow documentation`} position="bottom">
             <ActionButton
-              aria-label={i18n._(t`Workflow documentation`)}
+              aria-label={t`Workflow documentation`}
               id="visualizer-documentation"
               variant="plain"
               component="a"
@@ -120,11 +116,8 @@ function VisualizerToolbar({
             </ActionButton>
           </Tooltip>
           {template.summary_fields?.user_capabilities?.start && (
-            <Tooltip content={i18n._(t`Launch workflow`)} position="bottom">
-              <LaunchButton
-                resource={template}
-                aria-label={i18n._(t`Launch workflow`)}
-              >
+            <Tooltip content={t`Launch workflow`} position="bottom">
+              <LaunchButton resource={template} aria-label={t`Launch workflow`}>
                 {({ handleLaunch, isLaunching }) => (
                   <ActionButton
                     id="visualizer-launch"
@@ -142,10 +135,10 @@ function VisualizerToolbar({
           )}
           {!readOnly && (
             <>
-              <Tooltip content={i18n._(t`Delete all nodes`)} position="bottom">
+              <Tooltip content={t`Delete all nodes`} position="bottom">
                 <ActionButton
                   id="visualizer-delete-all"
-                  aria-label={i18n._(t`Delete all nodes`)}
+                  aria-label={t`Delete all nodes`}
                   isDisabled={totalNodes === 0}
                   onClick={() =>
                     dispatch({
@@ -162,18 +155,18 @@ function VisualizerToolbar({
                 ouiaId="visualizer-save-button"
                 id="visualizer-save"
                 css="margin: 0 32px"
-                aria-label={i18n._(t`Save`)}
+                aria-label={t`Save`}
                 variant="primary"
                 onClick={onSave}
               >
-                {i18n._(t`Save`)}
+                {t`Save`}
               </Button>
             </>
           )}
           <Button
             ouiaId="visualizer-close-button"
             id="visualizer-close"
-            aria-label={i18n._(t`Close`)}
+            aria-label={t`Close`}
             onClick={onClose}
             variant="plain"
           >
@@ -193,4 +186,4 @@ VisualizerToolbar.propTypes = {
   readOnly: bool.isRequired,
 };
 
-export default withI18n()(VisualizerToolbar);
+export default VisualizerToolbar;
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index b831c02c61..73929011f7 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { withFormik, useField } from 'formik';
 import {
@@ -55,7 +55,7 @@ function JobTemplateForm({
   handleSubmit,
   setFieldValue,
   submitError,
-  i18n,
+
   isOverrideDisabledLookup,
 }) {
   const [contentError, setContentError] = useState(false);
@@ -73,7 +73,7 @@ function JobTemplateForm({
   const [askInventoryOnLaunchField] = useField('ask_inventory_on_launch');
   const [jobTypeField, jobTypeMeta, jobTypeHelpers] = useField({
     name: 'job_type',
-    validate: required(null, i18n),
+    validate: required(null),
   });
   const [, inventoryMeta, inventoryHelpers] = useField('inventory');
   const [projectField, projectMeta, projectHelpers] = useField({
@@ -83,7 +83,7 @@ function JobTemplateForm({
   const [scmField, , scmHelpers] = useField('scm_branch');
   const [playbookField, playbookMeta, playbookHelpers] = useField({
     name: 'playbook',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
+    validate: required(t`Select a value for this field`),
   });
   const [credentialField, , credentialHelpers] = useField('credentials');
   const [labelsField, , labelsHelpers] = useField('labels');
@@ -150,10 +150,10 @@ function JobTemplateForm({
 
   const handleProjectValidation = project => {
     if (!project && projectMeta.touched) {
-      return i18n._(t`Select a value for this field`);
+      return t`Select a value for this field`;
     }
     if (project?.value?.status === 'never updated') {
-      return i18n._(t`This project needs to be updated`);
+      return t`This project needs to be updated`;
     }
     return undefined;
   };
@@ -171,23 +171,23 @@ function JobTemplateForm({
     {
       value: '',
       key: '',
-      label: i18n._(t`Choose a job type`),
+      label: t`Choose a job type`,
       isDisabled: true,
     },
-    { value: 'run', key: 'run', label: i18n._(t`Run`), isDisabled: false },
+    { value: 'run', key: 'run', label: t`Run`, isDisabled: false },
     {
       value: 'check',
       key: 'check',
-      label: i18n._(t`Check`),
+      label: t`Check`,
       isDisabled: false,
     },
   ];
   const verbosityOptions = [
-    { value: '0', key: '0', label: i18n._(t`0 (Normal)`) },
-    { value: '1', key: '1', label: i18n._(t`1 (Verbose)`) },
-    { value: '2', key: '2', label: i18n._(t`2 (More Verbose)`) },
-    { value: '3', key: '3', label: i18n._(t`3 (Debug)`) },
-    { value: '4', key: '4', label: i18n._(t`4 (Connection Debug)`) },
+    { value: '0', key: '0', label: t`0 (Normal)` },
+    { value: '1', key: '1', label: t`1 (Verbose)` },
+    { value: '2', key: '2', label: t`2 (More Verbose)` },
+    { value: '3', key: '3', label: t`3 (Debug)` },
+    { value: '4', key: '4', label: t`4 (Connection Debug)` },
   ];
   let callbackUrl;
   if (template?.related) {
@@ -210,26 +210,26 @@ function JobTemplateForm({
           id="template-name"
           name="name"
           type="text"
-          label={i18n._(t`Name`)}
-          validate={required(null, i18n)}
+          label={t`Name`}
+          validate={required(null)}
           isRequired
         />
         <FormField
           id="template-description"
           name="description"
           type="text"
-          label={i18n._(t`Description`)}
+          label={t`Description`}
         />
         <FieldWithPrompt
           fieldId="template-job-type"
           isRequired
-          label={i18n._(t`Job Type`)}
+          label={t`Job Type`}
           promptId="template-ask-job-type-on-launch"
           promptName="ask_job_type_on_launch"
-          tooltip={i18n._(t`For job templates, select run to execute
+          tooltip={t`For job templates, select run to execute
             the playbook. Select check to only check playbook syntax,
             test environment setup, and report problems without
-            executing the playbook.`)}
+            executing the playbook.`}
         >
           <AnsibleSelect
             {...jobTypeField}
@@ -258,8 +258,8 @@ function JobTemplateForm({
             promptId="template-ask-inventory-on-launch"
             promptName="ask_inventory_on_launch"
             isPromptableField
-            tooltip={i18n._(t`Select the inventory containing the hosts
-            you want this job to manage.`)}
+            tooltip={t`Select the inventory containing the hosts
+            you want this job to manage.`}
             onBlur={() => inventoryHelpers.setTouched()}
             onChange={value => {
               inventoryHelpers.setValue(value ? value.id : null);
@@ -275,8 +275,8 @@ function JobTemplateForm({
         <ProjectLookup
           value={projectField.value}
           onBlur={() => projectHelpers.setTouched()}
-          tooltip={i18n._(t`Select the project containing the playbook
-                  you want this job to execute.`)}
+          tooltip={t`Select the project containing the playbook
+                  you want this job to execute.`}
           isValid={
             !projectMeta.touched || !projectMeta.error || projectField.value
           }
@@ -295,12 +295,8 @@ function JobTemplateForm({
           onBlur={() => executionEnvironmentHelpers.setTouched()}
           value={executionEnvironmentField.value}
           onChange={value => executionEnvironmentHelpers.setValue(value)}
-          popoverContent={i18n._(
-            t`Select the execution environment for this job template.`
-          )}
-          tooltip={i18n._(
-            t`Select a project before editing the execution environment.`
-          )}
+          popoverContent={t`Select the execution environment for this job template.`}
+          tooltip={t`Select a project before editing the execution environment.`}
           globallyAvailable
           isDisabled={!projectField.value?.id}
           projectId={projectField.value?.id}
@@ -309,13 +305,11 @@ function JobTemplateForm({
         {projectField.value?.allow_override && (
           <FieldWithPrompt
             fieldId="template-scm-branch"
-            label={i18n._(t`Source Control Branch`)}
+            label={t`Source Control Branch`}
             promptId="template-ask-scm-branch-on-launch"
             promptName="ask_scm_branch_on_launch"
-            tooltip={i18n._(
-              t`Select a branch for the job template. This branch is applied to
-              all job template nodes that prompt for a branch.`
-            )}
+            tooltip={t`Select a branch for the job template. This branch is applied to
+              all job template nodes that prompt for a branch.`}
           >
             <TextInput
               id="template-scm-branch"
@@ -333,12 +327,10 @@ function JobTemplateForm({
             !playbookMeta.touched || !playbookMeta.error ? 'default' : 'error'
           }
           isRequired
-          label={i18n._(t`Playbook`)}
+          label={t`Playbook`}
           labelIcon={
             <Popover
-              content={i18n._(
-                t`Select the playbook to be executed by this job.`
-              )}
+              content={t`Select the playbook to be executed by this job.`}
             />
           }
         >
@@ -354,14 +346,14 @@ function JobTemplateForm({
         <FormFullWidthLayout>
           <FieldWithPrompt
             fieldId="template-credentials"
-            label={i18n._(t`Credentials`)}
+            label={t`Credentials`}
             promptId="template-ask-credential-on-launch"
             promptName="ask_credential_on_launch"
-            tooltip={i18n._(t`Select credentials for accessing the nodes this job will be ran
+            tooltip={t`Select credentials for accessing the nodes this job will be ran
                 against. You can only select one credential of each type. For machine credentials (SSH),
                 checking "Prompt on launch" without selecting credentials will require you to select a machine
                 credential at run time. If you select credentials and check "Prompt on launch", the selected
-                credential(s) become the defaults that can be updated at run time.`)}
+                credential(s) become the defaults that can be updated at run time.`}
           >
             <MultiCredentialsLookup
               value={credentialField.value}
@@ -372,12 +364,12 @@ function JobTemplateForm({
             />
           </FieldWithPrompt>
           <FormGroup
-            label={i18n._(t`Labels`)}
+            label={t`Labels`}
             labelIcon={
               <Popover
-                content={i18n._(t`Optional labels that describe this job template,
+                content={t`Optional labels that describe this job template,
                       such as 'dev' or 'test'. Labels can be used to group and filter
-                      job templates and completed jobs.`)}
+                      job templates and completed jobs.`}
               />
             }
             fieldId="template-labels"
@@ -386,20 +378,18 @@ function JobTemplateForm({
               value={labelsField.value}
               onChange={labels => labelsHelpers.setValue(labels)}
               onError={setContentError}
-              createText={i18n._(t`Create`)}
+              createText={t`Create`}
             />
           </FormGroup>
           <VariablesField
             id="template-variables"
             name="extra_vars"
-            label={i18n._(t`Variables`)}
+            label={t`Variables`}
             promptId="template-ask-variables-on-launch"
-            tooltip={i18n._(
-              t`Pass extra command line variables to the playbook. This is the
+            tooltip={t`Pass extra command line variables to the playbook. This is the
               -e or --extra-vars command line parameter for ansible-playbook.
               Provide key/value pairs using either YAML or JSON. Refer to the
-              documentation for example syntax.`
-            )}
+              documentation for example syntax.`}
           />
           <FormColumnLayout>
             <FormField
@@ -407,29 +397,29 @@ function JobTemplateForm({
               name="forks"
               type="number"
               min="0"
-              label={i18n._(t`Forks`)}
+              label={t`Forks`}
               tooltip={
                 <span>
-                  {i18n._(t`The number of parallel or simultaneous
+                  {t`The number of parallel or simultaneous
                     processes to use while executing the playbook. An empty value,
                     or a value less than 1 will use the Ansible default which is
                     usually 5. The default number of forks can be overwritten
-                    with a change to`)}{' '}
+                    with a change to`}{' '}
                   <code>ansible.cfg</code>.{' '}
-                  {i18n._(t`Refer to the Ansible documentation for details
-                        about the configuration file.`)}
+                  {t`Refer to the Ansible documentation for details
+                        about the configuration file.`}
                 </span>
               }
             />
             <FieldWithPrompt
               fieldId="template-limit"
-              label={i18n._(t`Limit`)}
+              label={t`Limit`}
               promptId="template-ask-limit-on-launch"
               promptName="ask_limit_on_launch"
-              tooltip={i18n._(t`Provide a host pattern to further constrain
+              tooltip={t`Provide a host pattern to further constrain
                   the list of hosts that will be managed or affected by the
                   playbook. Multiple patterns are allowed. Refer to Ansible
-                  documentation for more information and examples on patterns.`)}
+                  documentation for more information and examples on patterns.`}
             >
               <TextInput
                 id="template-limit"
@@ -444,11 +434,11 @@ function JobTemplateForm({
             </FieldWithPrompt>
             <FieldWithPrompt
               fieldId="template-verbosity"
-              label={i18n._(t`Verbosity`)}
+              label={t`Verbosity`}
               promptId="template-ask-verbosity-on-launch"
               promptName="ask_verbosity_on_launch"
-              tooltip={i18n._(t`Control the level of output ansible will
-                produce as the playbook executes.`)}
+              tooltip={t`Control the level of output ansible will
+                produce as the playbook executes.`}
             >
               <AnsibleSelect
                 id="template-verbosity"
@@ -461,33 +451,33 @@ function JobTemplateForm({
               name="job_slice_count"
               type="number"
               min="1"
-              label={i18n._(t`Job Slicing`)}
-              tooltip={i18n._(t`Divide the work done by this job template
+              label={t`Job Slicing`}
+              tooltip={t`Divide the work done by this job template
                   into the specified number of job slices, each running the
-                  same tasks against a portion of the inventory.`)}
+                  same tasks against a portion of the inventory.`}
             />
             <FormField
               id="template-timeout"
               name="timeout"
               type="number"
               min="0"
-              label={i18n._(t`Timeout`)}
-              tooltip={i18n._(t`The amount of time (in seconds) to run
+              label={t`Timeout`}
+              tooltip={t`The amount of time (in seconds) to run
                   before the job is canceled. Defaults to 0 for no job
-                  timeout.`)}
+                  timeout.`}
             />
             <FieldWithPrompt
               fieldId="template-diff-mode"
-              label={i18n._(t`Show Changes`)}
+              label={t`Show Changes`}
               promptId="template-ask-diff-mode-on-launch"
               promptName="ask_diff_mode_on_launch"
-              tooltip={i18n._(t`If enabled, show the changes made by
+              tooltip={t`If enabled, show the changes made by
                 Ansible tasks, where supported. This is equivalent
-                to Ansible's --diff mode.`)}
+                to Ansible's --diff mode.`}
             >
               <Switch
                 id="template-show-changes"
-                label={diffModeField.value ? i18n._(t`On`) : i18n._(t`Off`)}
+                label={diffModeField.value ? t`On` : t`Off`}
                 isChecked={diffModeField.value}
                 onChange={checked => diffModeHelpers.setValue(checked)}
               />
@@ -496,19 +486,19 @@ function JobTemplateForm({
               <InstanceGroupsLookup
                 value={instanceGroupsField.value}
                 onChange={value => instanceGroupsHelpers.setValue(value)}
-                tooltip={i18n._(t`Select the Instance Groups for this Organization
-                        to run on.`)}
+                tooltip={t`Select the Instance Groups for this Organization
+                        to run on.`}
               />
               <FieldWithPrompt
                 fieldId="template-tags"
-                label={i18n._(t`Job Tags`)}
+                label={t`Job Tags`}
                 promptId="template-ask-tags-on-launch"
                 promptName="ask_tags_on_launch"
-                tooltip={i18n._(t`Tags are useful when you have a large
+                tooltip={t`Tags are useful when you have a large
                     playbook, and you want to run a specific part of a
                     play or task. Use commas to separate multiple tags.
                     Refer to the documentation for details on
-                    the usage of tags.`)}
+                    the usage of tags.`}
               >
                 <TagMultiSelect
                   value={jobTagsField.value}
@@ -517,14 +507,14 @@ function JobTemplateForm({
               </FieldWithPrompt>
               <FieldWithPrompt
                 fieldId="template-skip-tags"
-                label={i18n._(t`Skip Tags`)}
+                label={t`Skip Tags`}
                 promptId="template-ask-skip-tags-on-launch"
                 promptName="ask_skip_tags_on_launch"
-                tooltip={i18n._(t`Skip tags are useful when you have a
+                tooltip={t`Skip tags are useful when you have a
                     large playbook, and you want to skip specific parts of a
                     play or task. Use commas to separate multiple tags. Refer
                     to the documentation for details on the usage
-                    of tags.`)}
+                    of tags.`}
               >
                 <TagMultiSelect
                   value={skipTagsField.value}
@@ -533,27 +523,27 @@ function JobTemplateForm({
               </FieldWithPrompt>
               <FormGroup
                 fieldId="template-option-checkboxes"
-                label={i18n._(t`Options`)}
+                label={t`Options`}
               >
                 <FormCheckboxLayout>
                   <CheckboxField
                     id="option-privilege-escalation"
                     name="become_enabled"
-                    label={i18n._(t`Privilege Escalation`)}
-                    tooltip={i18n._(t`If enabled, run this playbook as an
-                        administrator.`)}
+                    label={t`Privilege Escalation`}
+                    tooltip={t`If enabled, run this playbook as an
+                        administrator.`}
                   />
                   <Checkbox
-                    aria-label={i18n._(t`Provisioning Callbacks`)}
+                    aria-label={t`Provisioning Callbacks`}
                     label={
                       <span>
-                        {i18n._(t`Provisioning Callbacks`)}
+                        {t`Provisioning Callbacks`}
                         &nbsp;
                         <Popover
-                          content={i18n._(t`Enables creation of a provisioning
+                          content={t`Enables creation of a provisioning
                               callback URL. Using the URL a host can contact ${BrandName}
                               and request a configuration update using this job
-                              template.`)}
+                              template.`}
                         />
                       </span>
                     }
@@ -564,13 +554,13 @@ function JobTemplateForm({
                     }}
                   />
                   <Checkbox
-                    aria-label={i18n._(t`Enable Webhook`)}
+                    aria-label={t`Enable Webhook`}
                     label={
                       <span>
-                        {i18n._(t`Enable Webhook`)}
+                        {t`Enable Webhook`}
                         &nbsp;
                         <Popover
-                          content={i18n._(t`Enable webhook for this template.`)}
+                          content={t`Enable webhook for this template.`}
                         />
                       </span>
                     }
@@ -583,19 +573,17 @@ function JobTemplateForm({
                   <CheckboxField
                     id="option-concurrent"
                     name="allow_simultaneous"
-                    label={i18n._(t`Concurrent Jobs`)}
-                    tooltip={i18n._(t`If enabled, simultaneous runs of this job
-                        template will be allowed.`)}
+                    label={t`Concurrent Jobs`}
+                    tooltip={t`If enabled, simultaneous runs of this job
+                        template will be allowed.`}
                   />
                   <CheckboxField
                     id="option-fact-cache"
                     name="use_fact_cache"
-                    label={i18n._(t`Enable Fact Storage`)}
-                    tooltip={i18n._(
-                      t`If enabled, this will store gathered facts so they can
+                    label={t`Enable Fact Storage`}
+                    tooltip={t`If enabled, this will store gathered facts so they can
                       be viewed at the host level. Facts are persisted and
-                      injected into the fact cache at runtime.`
-                    )}
+                      injected into the fact cache at runtime.`}
                   />
                 </FormCheckboxLayout>
               </FormGroup>
@@ -607,12 +595,12 @@ function JobTemplateForm({
                   {allowCallbacks && (
                     <>
                       <Title size="md" headingLevel="h4">
-                        {i18n._(t`Provisioning Callback details`)}
+                        {t`Provisioning Callback details`}
                       </Title>
                       <FormColumnLayout>
                         {callbackUrl && (
                           <FormGroup
-                            label={i18n._(t`Provisioning Callback URL`)}
+                            label={t`Provisioning Callback URL`}
                             fieldId="template-callback-url"
                           >
                             <TextInput
@@ -625,10 +613,8 @@ function JobTemplateForm({
                         <FormField
                           id="template-host-config-key"
                           name="host_config_key"
-                          label={i18n._(t`Host Config Key`)}
-                          validate={
-                            allowCallbacks ? required(null, i18n) : null
-                          }
+                          label={t`Host Config Key`}
+                          validate={allowCallbacks ? required(null) : null}
                           isRequired={allowCallbacks}
                         />
                       </FormColumnLayout>
@@ -640,7 +626,7 @@ function JobTemplateForm({
                   {enableWebhooks && (
                     <>
                       <Title size="md" headingLevel="h4">
-                        {i18n._(t`Webhook details`)}
+                        {t`Webhook details`}
                       </Title>
                       <FormColumnLayout>
                         <WebhookSubForm templateType={template.type} />
@@ -687,7 +673,7 @@ JobTemplateForm.defaultProps = {
 };
 
 const FormikApp = withFormik({
-  mapPropsToValues({ template = {}, i18n }) {
+  mapPropsToValues({ template = {} }) {
     const {
       summary_fields = {
         labels: { results: [] },
@@ -734,10 +720,10 @@ const FormikApp = withFormik({
       webhook_service: template.webhook_service || '',
       webhook_url: template?.related?.webhook_receiver
         ? `${origin}${template.related.webhook_receiver}`
-        : i18n._(t`a new webhook url will be generated on save.`).toUpperCase(),
+        : t`a new webhook url will be generated on save.`.toUpperCase(),
       webhook_key:
         template.webhook_key ||
-        i18n._(t`a new webhook key will be generated on save.`).toUpperCase(),
+        t`a new webhook key will be generated on save.`.toUpperCase(),
       webhook_credential: template?.summary_fields?.webhook_credential || null,
       execution_environment:
         template.summary_fields?.execution_environment || null,
@@ -750,16 +736,14 @@ const FormikApp = withFormik({
       setErrors(errors);
     }
   },
-  validate: (values, { i18n }) => {
+  validate: values => {
     const errors = {};
 
     if (
       (!values.inventory || values.inventory === '') &&
       !values.ask_inventory_on_launch
     ) {
-      errors.inventory = i18n._(
-        t`Please select an Inventory or check the Prompt on Launch option.`
-      );
+      errors.inventory = t`Please select an Inventory or check the Prompt on Launch option.`;
     }
 
     return errors;
@@ -767,4 +751,4 @@ const FormikApp = withFormik({
 })(JobTemplateForm);
 
 export { JobTemplateForm as _JobTemplateForm };
-export default withI18n()(FormikApp);
+export default FormikApp;
diff --git a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
index 313a89fb40..9e1ff335c7 100644
--- a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
+++ b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { number, string, oneOfType } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { SelectVariant, Select, SelectOption } from '@patternfly/react-core';
 import { ProjectsAPI } from '../../../api';
@@ -13,7 +13,6 @@ function PlaybookSelect({
   onBlur,
   onError,
   onChange,
-  i18n,
 }) {
   const [isDisabled, setIsDisabled] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
@@ -55,8 +54,8 @@ function PlaybookSelect({
       variant={SelectVariant.typeahead}
       selections={selected}
       onToggle={setIsOpen}
-      placeholderText={i18n._(t`Select a playbook`)}
-      typeAheadAriaLabel={i18n._(t`Select a playbook`)}
+      placeholderText={t`Select a playbook`}
+      typeAheadAriaLabel={t`Select a playbook`}
       isCreateable={false}
       onSelect={(event, value) => {
         setIsOpen(false);
@@ -82,4 +81,4 @@ PlaybookSelect.defaultProps = {
 };
 
 export { PlaybookSelect as _PlaybookSelect };
-export default withI18n()(PlaybookSelect);
+export default PlaybookSelect;
diff --git a/awx/ui_next/src/screens/Template/shared/WebhookSubForm.jsx b/awx/ui_next/src/screens/Template/shared/WebhookSubForm.jsx
index 6a32857f43..4030518cc9 100644
--- a/awx/ui_next/src/screens/Template/shared/WebhookSubForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/WebhookSubForm.jsx
@@ -2,7 +2,7 @@ import React, { useEffect, useCallback } from 'react';
 import { SyncAltIcon } from '@patternfly/react-icons';
 import { useParams, useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import {
   FormGroup,
   TextInput,
@@ -23,7 +23,7 @@ import {
   CredentialTypesAPI,
 } from '../../../api';
 
-function WebhookSubForm({ i18n, templateType }) {
+function WebhookSubForm({ templateType }) {
   const { setFieldValue } = useFormikContext();
   const { id } = useParams();
   const { pathname } = useLocation();
@@ -99,19 +99,19 @@ function WebhookSubForm({ i18n, templateType }) {
     {
       value: '',
       key: '',
-      label: i18n._(t`Choose a Webhook Service`),
+      label: t`Choose a Webhook Service`,
       isDisabled: true,
     },
     {
       value: 'github',
       key: 'github',
-      label: i18n._(t`GitHub`),
+      label: t`GitHub`,
       isDisabled: false,
     },
     {
       value: 'gitlab',
       key: 'gitlab',
-      label: i18n._(t`GitLab`),
+      label: t`GitLab`,
       isDisabled: false,
     },
   ];
@@ -128,8 +128,8 @@ function WebhookSubForm({ i18n, templateType }) {
         name="webhook_service"
         fieldId="webhook_service"
         helperTextInvalid={webhookServiceMeta.error}
-        label={i18n._(t`Webhook Service`)}
-        labelIcon={<Popover content={i18n._(t`Select a webhook service.`)} />}
+        label={t`Webhook Service`}
+        labelIcon={<Popover content={t`Select a webhook service.`} />}
       >
         <AnsibleSelect
           {...webhookServiceField}
@@ -139,9 +139,7 @@ function WebhookSubForm({ i18n, templateType }) {
             webhookServiceHelpers.setValue(val);
             webhookUrlHelpers.setValue(
               pathname.endsWith('/add')
-                ? i18n
-                    ._(t`a new webhook url will be generated on save.`)
-                    .toUpperCase()
+                ? t`a new webhook url will be generated on save.`.toUpperCase()
                 : `${origin}/api/v2/${templateType}s/${id}/${val}/`
             );
             if (val === webhookServiceMeta.initialValue || val === '') {
@@ -151,9 +149,7 @@ function WebhookSubForm({ i18n, templateType }) {
               );
             } else {
               webhookKeyHelpers.setValue(
-                i18n
-                  ._(t`a new webhook key will be generated on save.`)
-                  .toUpperCase()
+                t`a new webhook key will be generated on save.`.toUpperCase()
               );
               webhookCredentialHelpers.setValue(null);
             }
@@ -164,30 +160,26 @@ function WebhookSubForm({ i18n, templateType }) {
         <FormGroup
           type="text"
           fieldId="jt-webhookURL"
-          label={i18n._(t`Webhook URL`)}
+          label={t`Webhook URL`}
           labelIcon={
             <Popover
-              content={i18n._(
-                t`Webhook services can launch jobs with this workflow job template by making a POST request to this URL.`
-              )}
+              content={t`Webhook services can launch jobs with this workflow job template by making a POST request to this URL.`}
             />
           }
           name="webhook_url"
         >
           <TextInput
             id="t-webhookURL"
-            aria-label={i18n._(t`Webhook URL`)}
+            aria-label={t`Webhook URL`}
             value={webhookUrlField.value}
             isReadOnly
           />
         </FormGroup>
         <FormGroup
-          label={i18n._(t`Webhook Key`)}
+          label={t`Webhook Key`}
           labelIcon={
             <Popover
-              content={i18n._(
-                t`Webhook services can use this as a shared secret.`
-              )}
+              content={t`Webhook services can use this as a shared secret.`}
             />
           }
           fieldId="template-webhook_key"
@@ -196,14 +188,14 @@ function WebhookSubForm({ i18n, templateType }) {
             <TextInput
               id="template-webhook_key"
               isReadOnly
-              aria-label={i18n._(t`workflow job template webhook key`)}
+              aria-label={t`workflow job template webhook key`}
               value={webhookKeyField.value}
             />
             <Button
               ouiaId="update-webhook-key-button"
               isDisabled={isUpdateKeyDisabled}
               variant="tertiary"
-              aria-label={i18n._(t`Update webhook key`)}
+              aria-label={t`Update webhook key`}
               onClick={changeWebhookKey}
             >
               <SyncAltIcon />
@@ -214,10 +206,8 @@ function WebhookSubForm({ i18n, templateType }) {
 
       {credTypeId && (
         <CredentialLookup
-          label={i18n._(t`Webhook Credential`)}
-          tooltip={i18n._(
-            t`Optionally select the credential to use to send status updates back to the webhook service.`
-          )}
+          label={t`Webhook Credential`}
+          tooltip={t`Optionally select the credential to use to send status updates back to the webhook service.`}
           credentialTypeId={credTypeId}
           onChange={onCredentialChange}
           isValid={!webhookCredentialMeta.error}
@@ -228,4 +218,4 @@ function WebhookSubForm({ i18n, templateType }) {
     </FormColumnLayout>
   );
 }
-export default withI18n()(WebhookSubForm);
+export default WebhookSubForm;
diff --git a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
index 5649a6f027..92e1358b26 100644
--- a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
@@ -2,7 +2,6 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { t } from '@lingui/macro';
 import PropTypes, { shape } from 'prop-types';
 
-import { withI18n } from '@lingui/react';
 import { useField, useFormikContext, withFormik } from 'formik';
 import {
   Form,
@@ -41,7 +40,7 @@ function WorkflowJobTemplateForm({
   template,
   handleSubmit,
   handleCancel,
-  i18n,
+
   submitError,
   isOrgAdmin,
 }) {
@@ -110,15 +109,15 @@ function WorkflowJobTemplateForm({
           id="wfjt-name"
           name="name"
           type="text"
-          label={i18n._(t`Name`)}
-          validate={required(null, i18n)}
+          label={t`Name`}
+          validate={required(null)}
           isRequired
         />
         <FormField
           id="wfjt-description"
           name="description"
           type="text"
-          label={i18n._(t`Description`)}
+          label={t`Description`}
         />
         <OrganizationLookup
           helperTextInvalid={organizationMeta.error}
@@ -135,9 +134,7 @@ function WorkflowJobTemplateForm({
           <InventoryLookup
             promptId="wfjt-ask-inventory-on-launch"
             promptName="ask_inventory_on_launch"
-            tooltip={i18n._(
-              t`Select an inventory for the workflow. This inventory is applied to all job template nodes that prompt for an inventory.`
-            )}
+            tooltip={t`Select an inventory for the workflow. This inventory is applied to all job template nodes that prompt for an inventory.`}
             fieldId="wfjt-inventory"
             isPromptableField
             value={inventoryField.value}
@@ -160,13 +157,13 @@ function WorkflowJobTemplateForm({
         </>
         <FieldWithPrompt
           fieldId="wfjt-limit"
-          label={i18n._(t`Limit`)}
+          label={t`Limit`}
           promptId="template-ask-limit-on-launch"
           promptName="ask_limit_on_launch"
-          tooltip={i18n._(t`Provide a host pattern to further constrain
+          tooltip={t`Provide a host pattern to further constrain
                   the list of hosts that will be managed or affected by the
                   playbook. Multiple patterns are allowed. Refer to Ansible
-                  documentation for more information and examples on patterns.`)}
+                  documentation for more information and examples on patterns.`}
         >
           <TextInput
             id="wfjt-limit"
@@ -182,12 +179,10 @@ function WorkflowJobTemplateForm({
 
         <FieldWithPrompt
           fieldId="wfjt-scm-branch"
-          label={i18n._(t`Source control branch`)}
+          label={t`Source control branch`}
           promptId="wfjt-ask-scm-branch-on-launch"
           promptName="ask_scm_branch_on_launch"
-          tooltip={i18n._(
-            t`Select a branch for the workflow. This branch is applied to all job template nodes that prompt for a branch.`
-          )}
+          tooltip={t`Select a branch for the workflow. This branch is applied to all job template nodes that prompt for a branch.`}
         >
           <TextInput
             id="wfjt-scm-branch"
@@ -205,21 +200,19 @@ function WorkflowJobTemplateForm({
           onBlur={() => executionEnvironmentHelpers.setTouched()}
           value={executionEnvironmentField.value}
           onChange={value => executionEnvironmentHelpers.setValue(value)}
-          tooltip={i18n._(
-            t`Select the default execution environment for this organization to run on.`
-          )}
+          tooltip={t`Select the default execution environment for this organization to run on.`}
           globallyAvailable
           organizationId={organizationField.value?.id}
         />
       </FormColumnLayout>
       <FormFullWidthLayout>
         <FormGroup
-          label={i18n._(t`Labels`)}
+          label={t`Labels`}
           labelIcon={
             <Popover
-              content={i18n._(t`Optional labels that describe this job template,
+              content={t`Optional labels that describe this job template,
                     such as 'dev' or 'test'. Labels can be used to group and filter
-                    job templates and completed jobs.`)}
+                    job templates and completed jobs.`}
             />
           }
           fieldId="template-labels"
@@ -228,7 +221,7 @@ function WorkflowJobTemplateForm({
             value={labelsField.value}
             onChange={labels => labelsHelpers.setValue(labels)}
             onError={setContentError}
-            createText={i18n._(t`Create`)}
+            createText={t`Create`}
           />
         </FormGroup>
       </FormFullWidthLayout>
@@ -236,25 +229,21 @@ function WorkflowJobTemplateForm({
         <VariablesField
           id="wfjt-variables"
           name="extra_vars"
-          label={i18n._(t`Variables`)}
+          label={t`Variables`}
           promptId="template-ask-variables-on-launch"
-          tooltip={i18n._(
-            t`Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON. Refer to the documentation for example syntax.`
-          )}
+          tooltip={t`Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentation for example syntax.`}
         />
       </FormFullWidthLayout>
-      <FormGroup fieldId="options" label={i18n._(t`Options`)}>
+      <FormGroup fieldId="options" label={t`Options`}>
         <FormCheckboxLayout isInline>
           <Checkbox
-            aria-label={i18n._(t`Enable Webhook`)}
+            aria-label={t`Enable Webhook`}
             label={
               <span>
-                {i18n._(t`Enable Webhook`)}
+                {t`Enable Webhook`}
                 &nbsp;
                 <Popover
-                  content={i18n._(
-                    t`Enable Webhook for this workflow job template.`
-                  )}
+                  content={t`Enable Webhook for this workflow job template.`}
                 />
               </span>
             }
@@ -267,10 +256,8 @@ function WorkflowJobTemplateForm({
           <CheckboxField
             name="allow_simultaneous"
             id="allow_simultaneous"
-            tooltip={i18n._(
-              t`If enabled, simultaneous runs of this workflow job template will be allowed.`
-            )}
-            label={i18n._(t`Enable Concurrent Jobs`)}
+            tooltip={t`If enabled, simultaneous runs of this workflow job template will be allowed.`}
+            label={t`Enable Concurrent Jobs`}
           />
         </FormCheckboxLayout>
       </FormGroup>
@@ -278,7 +265,7 @@ function WorkflowJobTemplateForm({
       {enableWebhooks && (
         <SubFormLayout>
           <Title size="md" headingLevel="h4">
-            {i18n._(t`Webhook details`)}
+            {t`Webhook details`}
           </Title>
           <WebhookSubForm templateType={template.type} />
         </SubFormLayout>
@@ -345,4 +332,4 @@ const FormikApp = withFormik({
 })(WorkflowJobTemplateForm);
 
 export { WorkflowJobTemplateForm as _WorkflowJobTemplateForm };
-export default withI18n()(FormikApp);
+export default FormikApp;
diff --git a/awx/ui_next/src/screens/User/User.jsx b/awx/ui_next/src/screens/User/User.jsx
index 7fd0647b33..ee3b00b8d7 100644
--- a/awx/ui_next/src/screens/User/User.jsx
+++ b/awx/ui_next/src/screens/User/User.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Switch,
@@ -22,7 +22,7 @@ import UserTeams from './UserTeams';
 import UserTokens from './UserTokens';
 import UserRolesList from './UserRoles/UserRolesList';
 
-function User({ i18n, setBreadcrumb, me }) {
+function User({ setBreadcrumb, me }) {
   const location = useLocation();
   const match = useRouteMatch('/users/:id');
   const userListUrl = `/users`;
@@ -54,25 +54,25 @@ function User({ i18n, setBreadcrumb, me }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Users`)}
+          {t`Back to Users`}
         </>
       ),
       link: `/users`,
       id: 99,
     },
-    { name: i18n._(t`Details`), link: `${match.url}/details`, id: 0 },
+    { name: t`Details`, link: `${match.url}/details`, id: 0 },
     {
-      name: i18n._(t`Organizations`),
+      name: t`Organizations`,
       link: `${match.url}/organizations`,
       id: 1,
     },
-    { name: i18n._(t`Teams`), link: `${match.url}/teams`, id: 2 },
-    { name: i18n._(t`Roles`), link: `${match.url}/roles`, id: 3 },
+    { name: t`Teams`, link: `${match.url}/teams`, id: 2 },
+    { name: t`Roles`, link: `${match.url}/roles`, id: 3 },
   ];
 
   if (me?.id === Number(match.params.id)) {
     tabsArray.push({
-      name: i18n._(t`Tokens`),
+      name: t`Tokens`,
       link: `${match.url}/tokens`,
       id: 4,
     });
@@ -92,8 +92,8 @@ function User({ i18n, setBreadcrumb, me }) {
           <ContentError error={contentError}>
             {contentError.response && contentError.response.status === 404 && (
               <span>
-                {i18n._(t`User not found.`)}{' '}
-                <Link to={userListUrl}>{i18n._(t`View all Users.`)}</Link>
+                {t`User not found.`}{' '}
+                <Link to={userListUrl}>{t`View all Users.`}</Link>
               </span>
             )}
           </ContentError>
@@ -137,7 +137,7 @@ function User({ i18n, setBreadcrumb, me }) {
               <ContentError isNotFound>
                 {match.params.id && (
                   <Link to={`/users/${match.params.id}/details`}>
-                    {i18n._(t`View User Details`)}
+                    {t`View User Details`}
                   </Link>
                 )}
               </ContentError>
@@ -149,4 +149,4 @@ function User({ i18n, setBreadcrumb, me }) {
   );
 }
 
-export default withI18n()(User);
+export default User;
diff --git a/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx b/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx
index 960ec5e154..46dff656f3 100644
--- a/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx
+++ b/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import { Button, Label } from '@patternfly/react-core';
@@ -13,7 +13,7 @@ import { formatDateString } from '../../../util/dates';
 import { UsersAPI } from '../../../api';
 import useRequest, { useDismissableError } from '../../../util/useRequest';
 
-function UserDetail({ user, i18n }) {
+function UserDetail({ user }) {
   const {
     id,
     username,
@@ -39,69 +39,64 @@ function UserDetail({ user, i18n }) {
 
   let user_type;
   if (is_superuser) {
-    user_type = i18n._(t`System Administrator`);
+    user_type = t`System Administrator`;
   } else if (is_system_auditor) {
-    user_type = i18n._(t`System Auditor`);
+    user_type = t`System Auditor`;
   } else {
-    user_type = i18n._(t`Normal User`);
+    user_type = t`Normal User`;
   }
 
   let userAuthType;
   if (user.ldap_dn) {
-    userAuthType = i18n._(t`LDAP`);
+    userAuthType = t`LDAP`;
   } else if (user.auth.length > 0) {
-    userAuthType = i18n._(t`SOCIAL`);
+    userAuthType = t`SOCIAL`;
   }
 
   return (
     <CardBody>
       <DetailList>
         <Detail
-          label={i18n._(t`Username`)}
+          label={t`Username`}
           value={username}
           dataCy="user-detail-username"
         />
-        <Detail label={i18n._(t`Email`)} value={email} />
-        <Detail label={i18n._(t`First Name`)} value={`${first_name}`} />
-        <Detail label={i18n._(t`Last Name`)} value={`${last_name}`} />
-        <Detail label={i18n._(t`User Type`)} value={`${user_type}`} />
+        <Detail label={t`Email`} value={email} />
+        <Detail label={t`First Name`} value={`${first_name}`} />
+        <Detail label={t`Last Name`} value={`${last_name}`} />
+        <Detail label={t`User Type`} value={`${user_type}`} />
         {userAuthType && (
           <Detail
-            label={i18n._(t`Type`)}
-            value={
-              <Label aria-label={i18n._(t`login type`)}>{userAuthType}</Label>
-            }
+            label={t`Type`}
+            value={<Label aria-label={t`login type`}>{userAuthType}</Label>}
           />
         )}
         {last_login && (
-          <Detail
-            label={i18n._(t`Last Login`)}
-            value={formatDateString(last_login)}
-          />
+          <Detail label={t`Last Login`} value={formatDateString(last_login)} />
         )}
-        <Detail label={i18n._(t`Created`)} value={formatDateString(created)} />
+        <Detail label={t`Created`} value={formatDateString(created)} />
       </DetailList>
       <CardActionsRow>
         {summary_fields.user_capabilities &&
           summary_fields.user_capabilities.edit && (
             <Button
               ouiaId="user-detail-edit-button"
-              aria-label={i18n._(t`edit`)}
+              aria-label={t`edit`}
               component={Link}
               to={`/users/${id}/edit`}
             >
-              {i18n._(t`Edit`)}
+              {t`Edit`}
             </Button>
           )}
         {summary_fields.user_capabilities &&
           summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={username}
-              modalTitle={i18n._(t`Delete User`)}
+              modalTitle={t`Delete User`}
               onConfirm={deleteUser}
               isDisabled={isLoading}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -109,10 +104,10 @@ function UserDetail({ user, i18n }) {
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to delete user.`)}
+          {t`Failed to delete user.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -120,4 +115,4 @@ function UserDetail({ user, i18n }) {
   );
 }
 
-export default withI18n()(UserDetail);
+export default UserDetail;
diff --git a/awx/ui_next/src/screens/User/UserEdit/UserEdit.jsx b/awx/ui_next/src/screens/User/UserEdit/UserEdit.jsx
index 96e159e02c..bb08f395ad 100644
--- a/awx/ui_next/src/screens/User/UserEdit/UserEdit.jsx
+++ b/awx/ui_next/src/screens/User/UserEdit/UserEdit.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useHistory } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { CardBody } from '../../../components/Card';
 import UserForm from '../shared/UserForm';
 import { UsersAPI } from '../../../api';
@@ -36,4 +36,4 @@ function UserEdit({ user }) {
   );
 }
 
-export default withI18n()(UserEdit);
+export default UserEdit;
diff --git a/awx/ui_next/src/screens/User/UserList/UserList.jsx b/awx/ui_next/src/screens/User/UserList/UserList.jsx
index 9a48938744..4ff7395e11 100644
--- a/awx/ui_next/src/screens/User/UserList/UserList.jsx
+++ b/awx/ui_next/src/screens/User/UserList/UserList.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { useLocation, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Card, PageSection } from '@patternfly/react-core';
 import { UsersAPI } from '../../../api';
@@ -26,7 +26,7 @@ const QS_CONFIG = getQSConfig('user', {
   order_by: 'username',
 });
 
-function UserList({ i18n }) {
+function UserList() {
   const location = useLocation();
   const match = useRouteMatch();
 
@@ -110,21 +110,21 @@ function UserList({ i18n }) {
             hasContentLoading={hasContentLoading}
             items={users}
             itemCount={itemCount}
-            pluralizedItemName={i18n._(t`Users`)}
+            pluralizedItemName={t`Users`}
             qsConfig={QS_CONFIG}
             onRowClick={handleSelect}
             toolbarSearchColumns={[
               {
-                name: i18n._(t`Username`),
+                name: t`Username`,
                 key: 'username__icontains',
                 isDefault: true,
               },
               {
-                name: i18n._(t`First Name`),
+                name: t`First Name`,
                 key: 'first_name__icontains',
               },
               {
-                name: i18n._(t`Last Name`),
+                name: t`Last Name`,
                 key: 'last_name__icontains',
               },
             ]}
@@ -152,24 +152,18 @@ function UserList({ i18n }) {
                     key="delete"
                     onDelete={handleUserDelete}
                     itemsToDelete={selected}
-                    pluralizedItemName={i18n._(t`Users`)}
+                    pluralizedItemName={t`Users`}
                   />,
                 ]}
               />
             )}
             headerRow={
               <HeaderRow qsConfig={QS_CONFIG}>
-                <HeaderCell sortKey="username">
-                  {i18n._(t`Username`)}
-                </HeaderCell>
-                <HeaderCell sortKey="first_name">
-                  {i18n._(t`First Name`)}
-                </HeaderCell>
-                <HeaderCell sortKey="last_name">
-                  {i18n._(t`Last Name`)}
-                </HeaderCell>
-                <HeaderCell>{i18n._(t`Role`)}</HeaderCell>
-                <HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
+                <HeaderCell sortKey="username">{t`Username`}</HeaderCell>
+                <HeaderCell sortKey="first_name">{t`First Name`}</HeaderCell>
+                <HeaderCell sortKey="last_name">{t`Last Name`}</HeaderCell>
+                <HeaderCell>{t`Role`}</HeaderCell>
+                <HeaderCell>{t`Actions`}</HeaderCell>
               </HeaderRow>
             }
             renderRow={(user, index) => (
@@ -194,10 +188,10 @@ function UserList({ i18n }) {
         <AlertModal
           isOpen={deletionError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={clearDeletionError}
         >
-          {i18n._(t`Failed to delete one or more users.`)}
+          {t`Failed to delete one or more users.`}
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
@@ -205,4 +199,4 @@ function UserList({ i18n }) {
   );
 }
 
-export default withI18n()(UserList);
+export default UserList;
diff --git a/awx/ui_next/src/screens/User/UserList/UserListItem.jsx b/awx/ui_next/src/screens/User/UserList/UserListItem.jsx
index 731d0eac2b..9c0eb312ae 100644
--- a/awx/ui_next/src/screens/User/UserList/UserListItem.jsx
+++ b/awx/ui_next/src/screens/User/UserList/UserListItem.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { Fragment } from 'react';
 import { string, bool, func } from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Button, Label } from '@patternfly/react-core';
 import { Tr, Td } from '@patternfly/react-table';
@@ -11,23 +11,16 @@ import { ActionsTd, ActionItem } from '../../../components/PaginatedTable';
 
 import { User } from '../../../types';
 
-function UserListItem({
-  user,
-  isSelected,
-  onSelect,
-  detailUrl,
-  rowIndex,
-  i18n,
-}) {
+function UserListItem({ user, isSelected, onSelect, detailUrl, rowIndex }) {
   const labelId = `check-action-${user.id}`;
 
   let user_type;
   if (user.is_superuser) {
-    user_type = i18n._(t`System Administrator`);
+    user_type = t`System Administrator`;
   } else if (user.is_system_auditor) {
-    user_type = i18n._(t`System Auditor`);
+    user_type = t`System Auditor`;
   } else {
-    user_type = i18n._(t`Normal User`);
+    user_type = t`Normal User`;
   }
 
   const ldapUser = user.ldap_dn;
@@ -42,48 +35,46 @@ function UserListItem({
           onSelect,
         }}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Username`)}>
+      <Td id={labelId} dataLabel={t`Username`}>
         <Link to={`${detailUrl}`}>
           <b>{user.username}</b>
         </Link>
         {ldapUser && (
           <span css="margin-left: 12px">
-            <Label aria-label={i18n._(t`ldap user`)}>{i18n._(t`LDAP`)}</Label>
+            <Label aria-label={t`ldap user`}>{t`LDAP`}</Label>
           </span>
         )}
         {socialAuthUser && (
           <span css="margin-left: 12px">
-            <Label aria-label={i18n._(t`social login`)}>
-              {i18n._(t`SOCIAL`)}
-            </Label>
+            <Label aria-label={t`social login`}>{t`SOCIAL`}</Label>
           </span>
         )}
       </Td>
-      <Td dataLabel={i18n._(t`First Name`)}>
+      <Td dataLabel={t`First Name`}>
         {user.first_name && (
           <Fragment>
-            <b css="margin-right: 24px">{i18n._(t`First Name`)}</b>
+            <b css="margin-right: 24px">{t`First Name`}</b>
             {user.first_name}
           </Fragment>
         )}
       </Td>
-      <Td dataLabel={i18n._(t`Last Name`)}>
+      <Td dataLabel={t`Last Name`}>
         {user.last_name && (
           <Fragment>
-            <b css="margin-right: 24px">{i18n._(t`Last Name`)}</b>
+            <b css="margin-right: 24px">{t`Last Name`}</b>
             {user.last_name}
           </Fragment>
         )}
       </Td>
-      <Td dataLabel={i18n._(t`Role`)}>{user_type}</Td>
-      <ActionsTd dataLabel={i18n._(t`Actions`)}>
+      <Td dataLabel={t`Role`}>{user_type}</Td>
+      <ActionsTd dataLabel={t`Actions`}>
         <ActionItem
           visible={user.summary_fields.user_capabilities.edit}
-          tooltip={i18n._(t`Edit User`)}
+          tooltip={t`Edit User`}
         >
           <Button
             ouiaId={`${user.id}-edit-button`}
-            aria-label={i18n._(t`Edit User`)}
+            aria-label={t`Edit User`}
             variant="plain"
             component={Link}
             to={`/users/${user.id}/edit`}
@@ -103,4 +94,4 @@ UserListItem.prototype = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(UserListItem);
+export default UserListItem;
diff --git a/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationsList.jsx b/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationsList.jsx
index 87f39a9f73..4b06dbca7b 100644
--- a/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationsList.jsx
+++ b/awx/ui_next/src/screens/User/UserOrganizations/UserOrganizationsList.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { useLocation, useParams } from 'react-router-dom';
 import { t } from '@lingui/macro';
 
@@ -16,7 +16,7 @@ const QS_CONFIG = getQSConfig('organizations', {
   type: 'organization',
 });
 
-function UserOrganizationsList({ i18n }) {
+function UserOrganizationsList() {
   const location = useLocation();
   const { id: userId } = useParams();
 
@@ -52,7 +52,7 @@ function UserOrganizationsList({ i18n }) {
       contentError={contentError}
       hasContentLoading={isLoading}
       itemCount={count}
-      pluralizedItemName={i18n._(t`Organizations`)}
+      pluralizedItemName={t`Organizations`}
       qsConfig={QS_CONFIG}
       renderItem={organization => (
         <UserOrganizationListItem
@@ -68,4 +68,4 @@ function UserOrganizationsList({ i18n }) {
   );
 }
 
-export default withI18n()(UserOrganizationsList);
+export default UserOrganizationsList;
diff --git a/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx b/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx
index 8ebbb97bd8..bd93777f83 100644
--- a/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx
+++ b/awx/ui_next/src/screens/User/UserRoles/UserRolesList.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Button,
@@ -29,7 +29,7 @@ const QS_CONFIG = getQSConfig('roles', {
 // TODO Figure out how to best conduct a search of this list.
 // Since we only have a role ID in the top level of each role object
 // we can't really search using the normal search parameters.
-function UserRolesList({ i18n, user }) {
+function UserRolesList({ user }) {
   const { search } = useLocation();
   const [roleToDisassociate, setRoleToDisassociate] = useState(null);
 
@@ -121,12 +121,10 @@ function UserRolesList({ i18n, user }) {
       <EmptyState variant="full">
         <EmptyStateIcon icon={CubesIcon} />
         <Title headingLevel="h5" size="lg">
-          {i18n._(t`System Administrator`)}
+          {t`System Administrator`}
         </Title>
         <EmptyStateBody>
-          {i18n._(
-            t`System administrators have unrestricted access to all resources.`
-          )}
+          {t`System administrators have unrestricted access to all resources.`}
         </EmptyStateBody>
       </EmptyState>
     );
@@ -138,18 +136,18 @@ function UserRolesList({ i18n, user }) {
         hasContentLoading={isLoading || isDisassociateLoading}
         items={roles}
         itemCount={roleCount}
-        pluralizedItemName={i18n._(t`User Roles`)}
+        pluralizedItemName={t`User Roles`}
         qsConfig={QS_CONFIG}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Role`),
+            name: t`Role`,
             key: 'role_field__icontains',
             isDefault: true,
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`ID`),
+            name: t`ID`,
             key: 'id',
           },
         ]}
@@ -179,7 +177,7 @@ function UserRolesList({ i18n, user }) {
                     <UserAndTeamAccessAdd
                       apiModel={UsersAPI}
                       onFetchData={fetchRoles}
-                      title={i18n._(t`Add user permissions`)}
+                      title={t`Add user permissions`}
                     />,
                   ]
                 : []),
@@ -189,36 +187,34 @@ function UserRolesList({ i18n, user }) {
       />
       {roleToDisassociate && (
         <AlertModal
-          aria-label={i18n._(t`Disassociate role`)}
+          aria-label={t`Disassociate role`}
           isOpen={roleToDisassociate}
           variant="error"
-          title={i18n._(t`Disassociate role!`)}
+          title={t`Disassociate role!`}
           onClose={() => setRoleToDisassociate(null)}
           actions={[
             <Button
               ouiaId="disassociate-confirm-button"
               key="disassociate"
               variant="danger"
-              aria-label={i18n._(t`Confirm disassociate`)}
+              aria-label={t`Confirm disassociate`}
               onClick={() => disassociateRole()}
             >
-              {i18n._(t`Disassociate`)}
+              {t`Disassociate`}
             </Button>,
             <Button
               ouiaId="disassociate-cancel-button"
               key="cancel"
               variant="link"
-              aria-label={i18n._(t`Cancel`)}
+              aria-label={t`Cancel`}
               onClick={() => setRoleToDisassociate(null)}
             >
-              {i18n._(t`Cancel`)}
+              {t`Cancel`}
             </Button>,
           ]}
         >
           <div>
-            {i18n._(
-              t`This action will disassociate the following role from ${roleToDisassociate.summary_fields.resource_name}:`
-            )}
+            {t`This action will disassociate the following role from ${roleToDisassociate.summary_fields.resource_name}:`}
             <br />
             <strong>{roleToDisassociate.name}</strong>
           </div>
@@ -228,14 +224,14 @@ function UserRolesList({ i18n, user }) {
         <AlertModal
           isOpen={disassociationError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={clearDisassociationError}
         >
-          {i18n._(t`Failed to delete role.`)}
+          {t`Failed to delete role.`}
           <ErrorDetail error={disassociationError} />
         </AlertModal>
       )}
     </>
   );
 }
-export default withI18n()(UserRolesList);
+export default UserRolesList;
diff --git a/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.jsx b/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.jsx
index 8f47315efa..1b93de5f6a 100644
--- a/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.jsx
+++ b/awx/ui_next/src/screens/User/UserRoles/UserRolesListItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   DataListItem,
@@ -11,37 +11,37 @@ import { Link } from 'react-router-dom';
 import { DetailList, Detail } from '../../../components/DetailList';
 import DataListCell from '../../../components/DataListCell';
 
-function UserRolesListItem({ role, i18n, detailUrl, onSelect }) {
+function UserRolesListItem({ role, detailUrl, onSelect }) {
   const labelId = `userRole-${role.id}`;
   return (
     <DataListItem key={role.id} aria-labelledby={labelId} id={`${role.id}`}>
       <DataListItemRow>
         <DataListItemCells
           dataListCells={[
-            <DataListCell key="name" aria-label={i18n._(t`Resource name`)}>
+            <DataListCell key="name" aria-label={t`Resource name`}>
               {role.summary_fields.resource_name ? (
                 <Link to={`${detailUrl}`} id={labelId}>
                   <b>{role.summary_fields.resource_name}</b>
                 </Link>
               ) : (
-                <b>{i18n._(t`System`)}</b>
+                <b>{t`System`}</b>
               )}
             </DataListCell>,
-            <DataListCell key="type" aria-label={i18n._(t`Resource type`)}>
+            <DataListCell key="type" aria-label={t`Resource type`}>
               {role.summary_fields && (
                 <DetailList stacked>
                   <Detail
-                    label={i18n._(t`Type`)}
+                    label={t`Type`}
                     value={role.summary_fields.resource_type_display_name}
                   />
                 </DetailList>
               )}
             </DataListCell>,
-            <DataListCell key="role" aria-label={i18n._(t`Resource role`)}>
+            <DataListCell key="role" aria-label={t`Resource role`}>
               {role.name && (
                 <DetailList stacked>
                   <Detail
-                    label={i18n._(t`Role`)}
+                    label={t`Role`}
                     value={
                       <Chip
                         key={role.name}
@@ -65,4 +65,4 @@ function UserRolesListItem({ role, i18n, detailUrl, onSelect }) {
   );
 }
 
-export default withI18n()(UserRolesListItem);
+export default UserRolesListItem;
diff --git a/awx/ui_next/src/screens/User/UserTeams/UserTeamList.jsx b/awx/ui_next/src/screens/User/UserTeams/UserTeamList.jsx
index df47f1c783..4b037cc908 100644
--- a/awx/ui_next/src/screens/User/UserTeams/UserTeamList.jsx
+++ b/awx/ui_next/src/screens/User/UserTeams/UserTeamList.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useEffect } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { useLocation, useParams } from 'react-router-dom';
 import { t } from '@lingui/macro';
 
@@ -27,7 +27,7 @@ const QS_CONFIG = getQSConfig('teams', {
   order_by: 'name',
 });
 
-function UserTeamList({ i18n }) {
+function UserTeamList() {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const location = useLocation();
   const { id: userId } = useParams();
@@ -173,7 +173,7 @@ function UserTeamList({ i18n }) {
         contentError={contentError}
         hasContentLoading={isLoading || isDisassociateLoading}
         itemCount={count}
-        pluralizedItemName={i18n._(t`Teams`)}
+        pluralizedItemName={t`Teams`}
         qsConfig={QS_CONFIG}
         onRowClick={handleSelect}
         renderItem={team => (
@@ -201,7 +201,7 @@ function UserTeamList({ i18n }) {
                     <ToolbarAddButton
                       key="associate"
                       onClick={() => setIsModalOpen(true)}
-                      defaultLabel={i18n._(t`Associate`)}
+                      defaultLabel={t`Associate`}
                     />,
                   ]
                 : []),
@@ -209,10 +209,8 @@ function UserTeamList({ i18n }) {
                 key="disassociate"
                 onDisassociate={handleDisassociate}
                 itemsToDisassociate={selected}
-                modalTitle={i18n._(t`Disassociate related team(s)?`)}
-                modalNote={i18n._(
-                  t`This action will disassociate all roles for this user from the selected teams.`
-                )}
+                modalTitle={t`Disassociate related team(s)?`}
+                modalNote={t`This action will disassociate all roles for this user from the selected teams.`}
               />,
             ]}
             emptyStateControls={
@@ -227,12 +225,12 @@ function UserTeamList({ i18n }) {
         )}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Name`),
+            name: t`Name`,
             key: 'name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Organization`),
+            name: t`Organization`,
             key: 'organization__name__icontains',
           },
         ]}
@@ -241,12 +239,12 @@ function UserTeamList({ i18n }) {
       />
       {isModalOpen && (
         <AssociateModal
-          header={i18n._(t`Teams`)}
+          header={t`Teams`}
           fetchRequest={fetchTeamsToAssociate}
           isModalOpen={isModalOpen}
           onAssociate={handleAssociate}
           onClose={() => setIsModalOpen(false)}
-          title={i18n._(t`Select Teams`)}
+          title={t`Select Teams`}
           optionsRequest={readTeamOptions}
         />
       )}
@@ -254,12 +252,12 @@ function UserTeamList({ i18n }) {
         <AlertModal
           isOpen={error}
           onClose={dismissError}
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           variant="error"
         >
           {associateError
-            ? i18n._(t`Failed to associate.`)
-            : i18n._(t`Failed to disassociate one or more teams.`)}
+            ? t`Failed to associate.`
+            : t`Failed to disassociate one or more teams.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -267,4 +265,4 @@ function UserTeamList({ i18n }) {
   );
 }
 
-export default withI18n()(UserTeamList);
+export default UserTeamList;
diff --git a/awx/ui_next/src/screens/User/UserTeams/UserTeamListItem.jsx b/awx/ui_next/src/screens/User/UserTeams/UserTeamListItem.jsx
index d6f09e6761..71b7657a6f 100644
--- a/awx/ui_next/src/screens/User/UserTeams/UserTeamListItem.jsx
+++ b/awx/ui_next/src/screens/User/UserTeams/UserTeamListItem.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { bool, func } from 'prop-types';
 import { Link } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   DataListItemCells,
@@ -14,7 +14,7 @@ import {
 import DataListCell from '../../../components/DataListCell';
 import { Team } from '../../../types';
 
-function UserTeamListItem({ team, isSelected, onSelect, i18n }) {
+function UserTeamListItem({ team, isSelected, onSelect }) {
   return (
     <DataListItem
       key={team.id}
@@ -39,7 +39,7 @@ function UserTeamListItem({ team, isSelected, onSelect, i18n }) {
               {team.summary_fields.organization && (
                 <Split hasGutter>
                   <SplitItem>
-                    <b>{i18n._(t`Organization`)}</b>{' '}
+                    <b>{t`Organization`}</b>{' '}
                   </SplitItem>
                   <SplitItem>
                     <Link
@@ -65,4 +65,4 @@ UserTeamListItem.prototype = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(UserTeamListItem);
+export default UserTeamListItem;
diff --git a/awx/ui_next/src/screens/User/UserToken/UserToken.jsx b/awx/ui_next/src/screens/User/UserToken/UserToken.jsx
index e42a98b5a4..57e4a7ee83 100644
--- a/awx/ui_next/src/screens/User/UserToken/UserToken.jsx
+++ b/awx/ui_next/src/screens/User/UserToken/UserToken.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   Link,
@@ -17,7 +17,7 @@ import { TokensAPI } from '../../../api';
 import useRequest from '../../../util/useRequest';
 import UserTokenDetail from '../UserTokenDetail';
 
-function UserToken({ i18n, setBreadcrumb, user }) {
+function UserToken({ setBreadcrumb, user }) {
   const location = useLocation();
   const { id, tokenId } = useParams();
   const {
@@ -44,14 +44,14 @@ function UserToken({ i18n, setBreadcrumb, user }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Tokens`)}
+          {t`Back to Tokens`}
         </>
       ),
       link: `/users/${id}/tokens`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `/users/${id}/tokens/${tokenId}/details`,
       id: 0,
     },
@@ -70,10 +70,8 @@ function UserToken({ i18n, setBreadcrumb, user }) {
           <ContentError error={error}>
             {error.response.status === 404 && (
               <span>
-                {i18n._(t`Token not found.`)}{' '}
-                <Link to="/users/:id/tokens">
-                  {i18n._(t`View all tokens.`)}
-                </Link>
+                {t`Token not found.`}{' '}
+                <Link to="/users/:id/tokens">{t`View all tokens.`}</Link>
               </span>
             )}
           </ContentError>
@@ -99,9 +97,7 @@ function UserToken({ i18n, setBreadcrumb, user }) {
         <Route key="not-found" path="*">
           {!isLoading && (
             <ContentError isNotFound>
-              {id && (
-                <Link to={`/users/${id}/tokens`}>{i18n._(t`View Tokens`)}</Link>
-              )}
+              {id && <Link to={`/users/${id}/tokens`}>{t`View Tokens`}</Link>}
             </ContentError>
           )}
         </Route>
@@ -110,4 +106,4 @@ function UserToken({ i18n, setBreadcrumb, user }) {
   );
 }
 
-export default withI18n()(UserToken);
+export default UserToken;
diff --git a/awx/ui_next/src/screens/User/UserTokenDetail/UserTokenDetail.jsx b/awx/ui_next/src/screens/User/UserTokenDetail/UserTokenDetail.jsx
index 9285d05b43..9c7c98fd30 100644
--- a/awx/ui_next/src/screens/User/UserTokenDetail/UserTokenDetail.jsx
+++ b/awx/ui_next/src/screens/User/UserTokenDetail/UserTokenDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useHistory, useParams } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import AlertModal from '../../../components/AlertModal';
@@ -17,7 +17,7 @@ import { formatDateString } from '../../../util/dates';
 import useRequest, { useDismissableError } from '../../../util/useRequest';
 import { toTitleCase } from '../../../util/strings';
 
-function UserTokenDetail({ token, i18n }) {
+function UserTokenDetail({ token }) {
   const {
     scope,
     description,
@@ -40,33 +40,33 @@ function UserTokenDetail({ token, i18n }) {
     <CardBody>
       <DetailList>
         <Detail
-          label={i18n._(t`Application`)}
+          label={t`Application`}
           value={summary_fields?.application?.name}
           dataCy="application-token-detail-name"
         />
         <Detail
-          label={i18n._(t`Description`)}
+          label={t`Description`}
           value={description}
           dataCy="application-token-detail-description"
         />
         <Detail
-          label={i18n._(t`Scope`)}
+          label={t`Scope`}
           value={toTitleCase(scope)}
           dataCy="application-token-detail-scope"
         />
         <Detail
-          label={i18n._(t`Expires`)}
+          label={t`Expires`}
           value={formatDateString(expires)}
           dataCy="application-token-detail-expires"
         />
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={created}
           user={summary_fields.user}
           dataCy="application-token-detail-created"
         />
         <UserDateDetail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           date={modified}
           user={summary_fields.user}
           dataCy="application-token-detail-last-modified"
@@ -75,21 +75,21 @@ function UserTokenDetail({ token, i18n }) {
       <CardActionsRow>
         <DeleteButton
           name={summary_fields?.application?.name}
-          modalTitle={i18n._(t`Delete User Token`)}
+          modalTitle={t`Delete User Token`}
           onConfirm={deleteToken}
           isDisabled={isLoading}
         >
-          {i18n._(t`Delete`)}
+          {t`Delete`}
         </DeleteButton>
       </CardActionsRow>
       {error && (
         <AlertModal
           isOpen={error}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissError}
         >
-          {i18n._(t`Failed to user token.`)}
+          {t`Failed to user token.`}
           <ErrorDetail error={error} />
         </AlertModal>
       )}
@@ -97,4 +97,4 @@ function UserTokenDetail({ token, i18n }) {
   );
 }
 
-export default withI18n()(UserTokenDetail);
+export default UserTokenDetail;
diff --git a/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.jsx b/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.jsx
index 72ba8b31c5..2c111d9be3 100644
--- a/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.jsx
+++ b/awx/ui_next/src/screens/User/UserTokenList/UserTokenList.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { getQSConfig, parseQueryString } from '../../../util/qs';
 import PaginatedDataList, {
@@ -20,7 +20,7 @@ const QS_CONFIG = getQSConfig('user', {
   page_size: 20,
   order_by: 'application__name',
 });
-function UserTokenList({ i18n }) {
+function UserTokenList() {
   const location = useLocation();
   const { id } = useParams();
 
@@ -103,39 +103,39 @@ function UserTokenList({ i18n }) {
         hasContentLoading={isLoading || isDeleteLoading}
         items={tokens}
         itemCount={itemCount}
-        pluralizedItemName={i18n._(t`Tokens`)}
+        pluralizedItemName={t`Tokens`}
         qsConfig={QS_CONFIG}
         onRowClick={handleSelect}
         toolbarSearchColumns={[
           {
-            name: i18n._(t`Application name`),
+            name: t`Application name`,
             key: 'application__name__icontains',
             isDefault: true,
           },
           {
-            name: i18n._(t`Description`),
+            name: t`Description`,
             key: 'description__icontains',
           },
         ]}
         toolbarSortColumns={[
           {
-            name: i18n._(t`Application name`),
+            name: t`Application name`,
             key: 'application__name',
           },
           {
-            name: i18n._(t`Scope`),
+            name: t`Scope`,
             key: 'scope',
           },
           {
-            name: i18n._(t`Expires`),
+            name: t`Expires`,
             key: 'expires',
           },
           {
-            name: i18n._(t`Created`),
+            name: t`Created`,
             key: 'created',
           },
           {
-            name: i18n._(t`Modified`),
+            name: t`Modified`,
             key: 'modified',
           },
         ]}
@@ -163,7 +163,7 @@ function UserTokenList({ i18n }) {
                 key="delete"
                 onDelete={handleDelete}
                 itemsToDelete={selected}
-                pluralizedItemName={i18n._(t`User tokens`)}
+                pluralizedItemName={t`User tokens`}
               />,
             ]}
           />
@@ -188,10 +188,10 @@ function UserTokenList({ i18n }) {
         <AlertModal
           isOpen={deletionError}
           variant="danger"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={clearDeletionError}
         >
-          {i18n._(t`Failed to delete one or more user tokens.`)}
+          {t`Failed to delete one or more user tokens.`}
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
@@ -199,4 +199,4 @@ function UserTokenList({ i18n }) {
   );
 }
 
-export default withI18n()(UserTokenList);
+export default UserTokenList;
diff --git a/awx/ui_next/src/screens/User/UserTokenList/UserTokenListItem.jsx b/awx/ui_next/src/screens/User/UserTokenList/UserTokenListItem.jsx
index 6ae8325723..5248802e1e 100644
--- a/awx/ui_next/src/screens/User/UserTokenList/UserTokenListItem.jsx
+++ b/awx/ui_next/src/screens/User/UserTokenList/UserTokenListItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link, useParams } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import {
   DataListItemCells,
@@ -22,7 +22,7 @@ const NameLabel = styled.b`
   margin-right: 5px;
 `;
 
-function UserTokenListItem({ i18n, token, isSelected, onSelect }) {
+function UserTokenListItem({ token, isSelected, onSelect }) {
   const { id } = useParams();
   const labelId = `check-action-${token.id}`;
   return (
@@ -36,20 +36,20 @@ function UserTokenListItem({ i18n, token, isSelected, onSelect }) {
         />
         <DataListItemCells
           dataListCells={[
-            <DataListCell aria-label={i18n._(t`Token type`)} key="type">
+            <DataListCell aria-label={t`Token type`} key="type">
               <Link to={`/users/${id}/tokens/${token.id}/details`}>
                 {token.summary_fields?.application
-                  ? i18n._(t`Application access token`)
-                  : i18n._(t`Personal access token`)}
+                  ? t`Application access token`
+                  : t`Personal access token`}
               </Link>
             </DataListCell>,
             <DataListCell
-              aria-label={i18n._(t`Application name`)}
+              aria-label={t`Application name`}
               key="applicationName"
             >
               {token.summary_fields?.application && (
                 <span>
-                  <NameLabel>{i18n._(t`Application`)}</NameLabel>
+                  <NameLabel>{t`Application`}</NameLabel>
                   <Link
                     to={`/applications/${token.summary_fields.application.id}/details`}
                   >
@@ -58,12 +58,12 @@ function UserTokenListItem({ i18n, token, isSelected, onSelect }) {
                 </span>
               )}
             </DataListCell>,
-            <DataListCell aria-label={i18n._(t`Scope`)} key="scope">
-              <Label>{i18n._(t`Scope`)}</Label>
+            <DataListCell aria-label={t`Scope`} key="scope">
+              <Label>{t`Scope`}</Label>
               {toTitleCase(token.scope)}
             </DataListCell>,
-            <DataListCell aria-label={i18n._(t`Expiration`)} key="expiration">
-              <Label>{i18n._(t`Expires`)}</Label>
+            <DataListCell aria-label={t`Expiration`} key="expiration">
+              <Label>{t`Expires`}</Label>
               {formatDateString(token.expires)}
             </DataListCell>,
           ]}
@@ -73,4 +73,4 @@ function UserTokenListItem({ i18n, token, isSelected, onSelect }) {
   );
 }
 
-export default withI18n()(UserTokenListItem);
+export default UserTokenListItem;
diff --git a/awx/ui_next/src/screens/User/UserTokens/UserTokens.jsx b/awx/ui_next/src/screens/User/UserTokens/UserTokens.jsx
index 450bd41822..a97955b18c 100644
--- a/awx/ui_next/src/screens/User/UserTokens/UserTokens.jsx
+++ b/awx/ui_next/src/screens/User/UserTokens/UserTokens.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import { Switch, Route, useParams } from 'react-router-dom';
@@ -19,7 +19,7 @@ const TokenAlert = styled(Alert)`
   margin-bottom: 20px;
 `;
 
-function UserTokens({ i18n, setBreadcrumb, user }) {
+function UserTokens({ setBreadcrumb, user }) {
   const [tokenModalSource, setTokenModalSource] = useState(null);
   const { id } = useParams();
 
@@ -46,23 +46,21 @@ function UserTokens({ i18n, setBreadcrumb, user }) {
       </Switch>
       {tokenModalSource && (
         <Modal
-          aria-label={i18n._(t`Token information`)}
+          aria-label={t`Token information`}
           isOpen
           variant="medium"
-          title={i18n._(t`Token information`)}
+          title={t`Token information`}
           onClose={() => setTokenModalSource(null)}
         >
           <TokenAlert
             variant="info"
             isInline
-            title={i18n._(
-              t`This is the only time the token value and associated refresh token value will be shown.`
-            )}
+            title={t`This is the only time the token value and associated refresh token value will be shown.`}
           />
           <DetailList stacked>
             {tokenModalSource.token && (
               <Detail
-                label={i18n._(t`Token`)}
+                label={t`Token`}
                 value={
                   <ClipboardCopy
                     isReadOnly
@@ -75,7 +73,7 @@ function UserTokens({ i18n, setBreadcrumb, user }) {
             )}
             {tokenModalSource.refresh_token && (
               <Detail
-                label={i18n._(t`Refresh Token`)}
+                label={t`Refresh Token`}
                 value={
                   <ClipboardCopy
                     isReadOnly
@@ -87,7 +85,7 @@ function UserTokens({ i18n, setBreadcrumb, user }) {
               />
             )}
             <Detail
-              label={i18n._(t`Expires`)}
+              label={t`Expires`}
               value={formatDateString(tokenModalSource.expires)}
             />
           </DetailList>
@@ -97,4 +95,4 @@ function UserTokens({ i18n, setBreadcrumb, user }) {
   );
 }
 
-export default withI18n()(UserTokens);
+export default UserTokens;
diff --git a/awx/ui_next/src/screens/User/Users.jsx b/awx/ui_next/src/screens/User/Users.jsx
index 323e8e37a4..99b75eeb20 100644
--- a/awx/ui_next/src/screens/User/Users.jsx
+++ b/awx/ui_next/src/screens/User/Users.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useState, useCallback } from 'react';
 import { Route, useRouteMatch, Switch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 
 import ScreenHeader from '../../components/ScreenHeader/ScreenHeader';
@@ -10,40 +10,33 @@ import UsersList from './UserList/UserList';
 import UserAdd from './UserAdd/UserAdd';
 import User from './User';
 
-function Users({ i18n }) {
+function Users() {
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/users': i18n._(t`Users`),
-    '/users/add': i18n._(t`Create New User`),
+    '/users': t`Users`,
+    '/users/add': t`Create New User`,
   });
   const match = useRouteMatch();
 
-  const addUserBreadcrumb = useCallback(
-    (user, token) => {
-      if (!user) {
-        return;
-      }
+  const addUserBreadcrumb = useCallback((user, token) => {
+    if (!user) {
+      return;
+    }
 
-      setBreadcrumbConfig({
-        '/users': i18n._(t`Users`),
-        '/users/add': i18n._(t`Create New User`),
-        [`/users/${user.id}`]: `${user.username}`,
-        [`/users/${user.id}/edit`]: i18n._(t`Edit Details`),
-        [`/users/${user.id}/details`]: i18n._(t`Details`),
-        [`/users/${user.id}/roles`]: i18n._(t`Roles`),
-        [`/users/${user.id}/teams`]: i18n._(t`Teams`),
-        [`/users/${user.id}/organizations`]: i18n._(t`Organizations`),
-        [`/users/${user.id}/tokens`]: i18n._(t`Tokens`),
-        [`/users/${user.id}/tokens/add`]: i18n._(t`Create user token`),
-        [`/users/${user.id}/tokens/${token && token.id}`]: i18n._(
-          t`Application Name`
-        ),
-        [`/users/${user.id}/tokens/${token && token.id}/details`]: i18n._(
-          t`Details`
-        ),
-      });
-    },
-    [i18n]
-  );
+    setBreadcrumbConfig({
+      '/users': t`Users`,
+      '/users/add': t`Create New User`,
+      [`/users/${user.id}`]: `${user.username}`,
+      [`/users/${user.id}/edit`]: t`Edit Details`,
+      [`/users/${user.id}/details`]: t`Details`,
+      [`/users/${user.id}/roles`]: t`Roles`,
+      [`/users/${user.id}/teams`]: t`Teams`,
+      [`/users/${user.id}/organizations`]: t`Organizations`,
+      [`/users/${user.id}/tokens`]: t`Tokens`,
+      [`/users/${user.id}/tokens/add`]: t`Create user token`,
+      [`/users/${user.id}/tokens/${token && token.id}`]: t`Application Name`,
+      [`/users/${user.id}/tokens/${token && token.id}/details`]: t`Details`,
+    });
+  }, []);
   return (
     <Fragment>
       <ScreenHeader streamType="user" breadcrumbConfig={breadcrumbConfig} />
@@ -67,4 +60,4 @@ function Users({ i18n }) {
 }
 
 export { Users as _Users };
-export default withI18n()(Users);
+export default Users;
diff --git a/awx/ui_next/src/screens/User/shared/UserForm.jsx b/awx/ui_next/src/screens/User/shared/UserForm.jsx
index 0449af1808..cd189b4cff 100644
--- a/awx/ui_next/src/screens/User/shared/UserForm.jsx
+++ b/awx/ui_next/src/screens/User/shared/UserForm.jsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useState } from 'react';
 import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik, useField, useFormikContext } from 'formik';
 import { Form, FormGroup } from '@patternfly/react-core';
@@ -14,7 +14,7 @@ import OrganizationLookup from '../../../components/Lookup/OrganizationLookup';
 import { required } from '../../../util/validators';
 import { FormColumnLayout } from '../../../components/FormLayout';
 
-function UserFormFields({ user, i18n }) {
+function UserFormFields({ user }) {
   const [organization, setOrganization] = useState(null);
   const { setFieldValue } = useFormikContext();
 
@@ -26,19 +26,19 @@ function UserFormFields({ user, i18n }) {
     {
       value: 'normal',
       key: 'normal',
-      label: i18n._(t`Normal User`),
+      label: t`Normal User`,
       isDisabled: false,
     },
     {
       value: 'auditor',
       key: 'auditor',
-      label: i18n._(t`System Auditor`),
+      label: t`System Auditor`,
       isDisabled: false,
     },
     {
       value: 'administrator',
       key: 'administrator',
-      label: i18n._(t`System Administrator`),
+      label: t`System Administrator`,
       isDisabled: false,
     },
   ];
@@ -46,7 +46,7 @@ function UserFormFields({ user, i18n }) {
   const [, organizationMeta, organizationHelpers] = useField({
     name: 'organization',
     validate: !user.id
-      ? required(i18n._(t`Select a value for this field`), i18n)
+      ? required(t`Select a value for this field`)
       : () => undefined,
   });
 
@@ -64,40 +64,35 @@ function UserFormFields({ user, i18n }) {
     <>
       <FormField
         id="user-username"
-        label={i18n._(t`Username`)}
+        label={t`Username`}
         name="username"
         type="text"
         validate={
-          !ldapUser && !externalAccount ? required(null, i18n) : () => undefined
+          !ldapUser && !externalAccount ? required(null) : () => undefined
         }
         isRequired={!ldapUser && !externalAccount}
       />
-      <FormField
-        id="user-email"
-        label={i18n._(t`Email`)}
-        name="email"
-        type="text"
-      />
+      <FormField id="user-email" label={t`Email`} name="email" type="text" />
       {!ldapUser && !(socialAuthUser && externalAccount) && (
         <>
           <PasswordField
             id="user-password"
-            label={i18n._(t`Password`)}
+            label={t`Password`}
             name="password"
             validate={
               !user.id
-                ? required(i18n._(t`This field must not be blank`), i18n)
+                ? required(t`This field must not be blank`)
                 : () => undefined
             }
             isRequired={!user.id}
           />
           <PasswordField
             id="user-confirm-password"
-            label={i18n._(t`Confirm Password`)}
+            label={t`Confirm Password`}
             name="confirm_password"
             validate={
               !user.id
-                ? required(i18n._(t`This field must not be blank`), i18n)
+                ? required(t`This field must not be blank`)
                 : () => undefined
             }
             isRequired={!user.id}
@@ -106,13 +101,13 @@ function UserFormFields({ user, i18n }) {
       )}
       <FormField
         id="user-first-name"
-        label={i18n._(t`First Name`)}
+        label={t`First Name`}
         name="first_name"
         type="text"
       />
       <FormField
         id="user-last-name"
-        label={i18n._(t`Last Name`)}
+        label={t`Last Name`}
         name="last_name"
         type="text"
       />
@@ -134,7 +129,7 @@ function UserFormFields({ user, i18n }) {
         validated={
           !userTypeMeta.touched || !userTypeMeta.error ? 'default' : 'error'
         }
-        label={i18n._(t`User Type`)}
+        label={t`User Type`}
       >
         <AnsibleSelect
           isValid={!userTypeMeta.touched || !userTypeMeta.error}
@@ -147,13 +142,11 @@ function UserFormFields({ user, i18n }) {
   );
 }
 
-function UserForm({ user, handleCancel, handleSubmit, submitError, i18n }) {
+function UserForm({ user, handleCancel, handleSubmit, submitError }) {
   const handleValidateAndSubmit = (values, { setErrors }) => {
     if (values.password !== values.confirm_password) {
       setErrors({
-        confirm_password: i18n._(
-          t`This value does not match the password you entered previously. Please confirm that password.`
-        ),
+        confirm_password: t`This value does not match the password you entered previously. Please confirm that password.`,
       });
     } else {
       values.is_superuser = values.user_type === 'administrator';
@@ -192,7 +185,7 @@ function UserForm({ user, handleCancel, handleSubmit, submitError, i18n }) {
       {formik => (
         <Form autoComplete="off" onSubmit={formik.handleSubmit}>
           <FormColumnLayout>
-            <UserFormFields user={user} i18n={i18n} />
+            <UserFormFields user={user} />
             <FormSubmitError error={submitError} />
             <FormActionGroup
               onCancel={handleCancel}
@@ -215,4 +208,4 @@ UserForm.defaultProps = {
   user: {},
 };
 
-export default withI18n()(UserForm);
+export default UserForm;
diff --git a/awx/ui_next/src/screens/User/shared/UserTokenForm.jsx b/awx/ui_next/src/screens/User/shared/UserTokenForm.jsx
index e718bfbb8e..2f59cc57f7 100644
--- a/awx/ui_next/src/screens/User/shared/UserTokenForm.jsx
+++ b/awx/ui_next/src/screens/User/shared/UserTokenForm.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Formik, useField } from 'formik';
 import { Form, FormGroup } from '@patternfly/react-core';
@@ -12,14 +12,14 @@ import { required } from '../../../util/validators';
 
 import { FormColumnLayout } from '../../../components/FormLayout';
 
-function UserTokenFormFields({ i18n }) {
+function UserTokenFormFields() {
   const [applicationField, applicationMeta, applicationHelpers] = useField(
     'application'
   );
 
   const [scopeField, scopeMeta, scopeHelpers] = useField({
     name: 'scope',
-    validate: required(i18n._(t`Please enter a value.`), i18n),
+    validate: required(t`Please enter a value.`),
   });
 
   return (
@@ -41,11 +41,9 @@ function UserTokenFormFields({ i18n }) {
           }}
           label={
             <span>
-              {i18n._(t`Application`)}
+              {t`Application`}
               <Popover
-                content={i18n._(
-                  t`Select the application that this token will belong to.`
-                )}
+                content={t`Select the application that this token will belong to.`}
               />
             </span>
           }
@@ -56,7 +54,7 @@ function UserTokenFormFields({ i18n }) {
         id="token-description"
         name="description"
         type="text"
-        label={i18n._(t`Description`)}
+        label={t`Description`}
       />
 
       <FormGroup
@@ -65,11 +63,9 @@ function UserTokenFormFields({ i18n }) {
         helperTextInvalid={scopeMeta.error}
         isRequired
         validated={!scopeMeta.touched || !scopeMeta.error ? 'default' : 'error'}
-        label={i18n._(t`Scope`)}
+        label={t`Scope`}
         labelIcon={
-          <Popover
-            content={i18n._(t`Specify a scope for the token's access`)}
-          />
+          <Popover content={t`Specify a scope for the token's access`} />
         }
       >
         <AnsibleSelect
@@ -77,8 +73,8 @@ function UserTokenFormFields({ i18n }) {
           id="token-scope"
           data={[
             { key: 'default', label: '', value: '' },
-            { key: 'read', value: 'read', label: i18n._(t`Read`) },
-            { key: 'write', value: 'write', label: i18n._(t`Write`) },
+            { key: 'read', value: 'read', label: t`Read` },
+            { key: 'write', value: 'write', label: t`Write` },
           ]}
           onChange={(event, value) => {
             scopeHelpers.setValue(value);
@@ -93,7 +89,7 @@ function UserTokenForm({
   handleCancel,
   handleSubmit,
   submitError,
-  i18n,
+
   token = {},
 }) {
   return (
@@ -108,7 +104,7 @@ function UserTokenForm({
       {formik => (
         <Form autoComplete="off" onSubmit={formik.handleSubmit}>
           <FormColumnLayout>
-            <UserTokenFormFields i18n={i18n} />
+            <UserTokenFormFields />
             {submitError && <FormSubmitError error={submitError} />}
             <FormActionGroup
               onCancel={handleCancel}
@@ -122,4 +118,4 @@ function UserTokenForm({
     </Formik>
   );
 }
-export default withI18n()(UserTokenForm);
+export default UserTokenForm;
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApproval.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApproval.jsx
index 066a566ec5..f6ce033684 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApproval.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApproval.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { t } from '@lingui/macro';
-import { withI18n } from '@lingui/react';
+
 import { Card, PageSection } from '@patternfly/react-core';
 import { CaretLeftIcon } from '@patternfly/react-icons';
 import {
@@ -18,7 +18,7 @@ import ContentError from '../../components/ContentError';
 import { WorkflowApprovalsAPI } from '../../api';
 import WorkflowApprovalDetail from './WorkflowApprovalDetail';
 
-function WorkflowApproval({ setBreadcrumb, i18n }) {
+function WorkflowApproval({ setBreadcrumb }) {
   const { id: workflowApprovalId } = useParams();
   const match = useRouteMatch();
   const location = useLocation();
@@ -49,9 +49,9 @@ function WorkflowApproval({ setBreadcrumb, i18n }) {
           <ContentError error={error}>
             {error.response.status === 404 && (
               <span>
-                {i18n._(t`Workflow Approval not found.`)}{' '}
+                {t`Workflow Approval not found.`}{' '}
                 <Link to="/workflow_approvals">
-                  {i18n._(t`View all Workflow Approvals.`)}
+                  {t`View all Workflow Approvals.`}
                 </Link>
               </span>
             )}
@@ -66,14 +66,14 @@ function WorkflowApproval({ setBreadcrumb, i18n }) {
       name: (
         <>
           <CaretLeftIcon />
-          {i18n._(t`Back to Workflow Approvals`)}
+          {t`Back to Workflow Approvals`}
         </>
       ),
       link: `/workflow_approvals`,
       id: 99,
     },
     {
-      name: i18n._(t`Details`),
+      name: t`Details`,
       link: `${match.url}/details`,
       id: 0,
     },
@@ -101,7 +101,7 @@ function WorkflowApproval({ setBreadcrumb, i18n }) {
               <ContentError isNotFound>
                 {match.params.id && (
                   <Link to={`/workflow_approvals/${match.params.id}/details`}>
-                    {i18n._(t`View Workflow Approval Details`)}
+                    {t`View Workflow Approval Details`}
                   </Link>
                 )}
               </ContentError>
@@ -113,4 +113,4 @@ function WorkflowApproval({ setBreadcrumb, i18n }) {
   );
 }
 
-export default withI18n()(WorkflowApproval);
+export default WorkflowApproval;
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx
index bbc6d3c659..19790f8533 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Link, useHistory, useParams } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
@@ -18,7 +18,7 @@ import { WorkflowApprovalsAPI } from '../../../api';
 import useRequest, { useDismissableError } from '../../../util/useRequest';
 import { WorkflowApproval } from '../../../types';
 
-function WorkflowApprovalDetail({ i18n, workflowApproval }) {
+function WorkflowApprovalDetail({ workflowApproval }) {
   const { id: workflowApprovalId } = useParams();
   const history = useHistory();
   const {
@@ -83,29 +83,29 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
     <CardBody>
       <DetailList gutter="sm">
         <Detail
-          label={i18n._(t`Name`)}
+          label={t`Name`}
           value={workflowApproval.name}
           dataCy="wa-detail-name"
         />
         <Detail
-          label={i18n._(t`Description`)}
+          label={t`Description`}
           value={workflowApproval.description}
           dataCy="wa-detail-description"
         />
         {workflowApproval.status === 'pending' && (
           <Detail
-            label={i18n._(t`Expires`)}
+            label={t`Expires`}
             value={
               workflowApproval.approval_expiration
                 ? formatDateString(workflowApproval.approval_expiration)
-                : i18n._(t`Never`)
+                : t`Never`
             }
             dataCy="wa-detail-expires"
           />
         )}
         {workflowApproval.status !== 'pending' && (
           <Detail
-            label={i18n._(t`Status`)}
+            label={t`Status`}
             value={
               <WorkflowApprovalStatus workflowApproval={workflowApproval} />
             }
@@ -114,7 +114,7 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
         )}
         {workflowApproval.summary_fields.approved_or_denied_by && (
           <Detail
-            label={i18n._(t`Actor`)}
+            label={t`Actor`}
             value={
               <Link
                 to={`/users/${workflowApproval.summary_fields.approved_or_denied_by.id}`}
@@ -126,25 +126,25 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
           />
         )}
         <Detail
-          label={i18n._(t`Explanation`)}
+          label={t`Explanation`}
           value={workflowApproval.job_explanation}
           dataCy="wa-detail-explanation"
         />
         <Detail
-          label={i18n._(t`Workflow Job`)}
+          label={t`Workflow Job`}
           value={
             sourceWorkflowJob && sourceWorkflowJob?.id ? (
               <Link to={`/jobs/workflow/${sourceWorkflowJob?.id}`}>
                 {`${sourceWorkflowJob?.id} - ${sourceWorkflowJob?.name}`}
               </Link>
             ) : (
-              i18n._(t`Deleted`)
+              t`Deleted`
             )
           }
           dataCy="wa-detail-source-job"
         />
         <Detail
-          label={i18n._(t`Workflow Job Template`)}
+          label={t`Workflow Job Template`}
           value={
             sourceWorkflowJobTemplate && (
               <Link
@@ -157,28 +157,28 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
           dataCy="wa-detail-source-workflow"
         />
         <UserDateDetail
-          label={i18n._(t`Created`)}
+          label={t`Created`}
           date={workflowApproval.created}
           user={workflowApproval.summary_fields.created_by}
           dataCy="wa-detail-created-by"
         />
         <Detail
-          label={i18n._(t`Last Modified`)}
+          label={t`Last Modified`}
           value={formatDateString(workflowApproval.modified)}
           dataCy="wa-detail-last-modified"
         />
         <Detail
-          label={i18n._(t`Finished`)}
+          label={t`Finished`}
           value={formatDateString(workflowApproval.finished)}
           dataCy="wa-detail-finished"
         />
         <Detail
-          label={i18n._(t`Canceled`)}
+          label={t`Canceled`}
           value={formatDateString(workflowApproval.canceled_on)}
           dataCy="wa-detail-canceled"
         />
         <Detail
-          label={i18n._(t`Elapsed`)}
+          label={t`Elapsed`}
           value={secondsToHHMMSS(workflowApproval.elapsed)}
           dataCy="wa-detail-elapsed"
         />
@@ -188,21 +188,21 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
           <>
             <Button
               ouiaId={`${workflowApproval.id}-approve-button`}
-              aria-label={i18n._(t`Approve`)}
+              aria-label={t`Approve`}
               variant="primary"
               onClick={approveWorkflowApproval}
               isDisabled={isLoading}
             >
-              {i18n._(t`Approve`)}
+              {t`Approve`}
             </Button>
             <Button
               ouiaId={`${workflowApproval.id}-deny-button`}
-              aria-label={i18n._(t`Deny`)}
+              aria-label={t`Deny`}
               variant="danger"
               onClick={denyWorkflowApproval}
               isDisabled={isLoading}
             >
-              {i18n._(t`Deny`)}
+              {t`Deny`}
             </Button>
           </>
         )}
@@ -211,11 +211,11 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
           workflowApproval.summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={workflowApproval.name}
-              modalTitle={i18n._(t`Delete Workflow Approval`)}
+              modalTitle={t`Delete Workflow Approval`}
               onConfirm={deleteWorkflowApproval}
               isDisabled={isLoading}
             >
-              {i18n._(t`Delete`)}
+              {t`Delete`}
             </DeleteButton>
           )}
       </CardActionsRow>
@@ -223,10 +223,10 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
         <AlertModal
           isOpen={deleteError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissDeleteError}
         >
-          {i18n._(t`Failed to delete workflow approval.`)}
+          {t`Failed to delete workflow approval.`}
           <ErrorDetail error={deleteError} />
         </AlertModal>
       )}
@@ -234,10 +234,10 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
         <AlertModal
           isOpen={approveError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissApproveError}
         >
-          {i18n._(t`Failed to approve workflow approval.`)}
+          {t`Failed to approve workflow approval.`}
           <ErrorDetail error={approveError} />
         </AlertModal>
       )}
@@ -245,10 +245,10 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
         <AlertModal
           isOpen={denyError}
           variant="error"
-          title={i18n._(t`Error!`)}
+          title={t`Error!`}
           onClose={dismissDenyError}
         >
-          {i18n._(t`Failed to deny workflow approval.`)}
+          {t`Failed to deny workflow approval.`}
           <ErrorDetail error={denyError} />
         </AlertModal>
       )}
@@ -260,4 +260,4 @@ WorkflowApprovalDetail.defaultProps = {
   workflowApproval: WorkflowApproval.isRequired,
 };
 
-export default withI18n()(WorkflowApprovalDetail);
+export default WorkflowApprovalDetail;
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListApproveButton.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListApproveButton.jsx
index fdf92597aa..6c448d3048 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListApproveButton.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListApproveButton.jsx
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Button, DropdownItem, Tooltip } from '@patternfly/react-core';
@@ -10,12 +10,12 @@ function cannotApprove(item) {
   return !item.can_approve_or_deny;
 }
 
-function WorkflowApprovalListApproveButton({ onApprove, selectedItems, i18n }) {
+function WorkflowApprovalListApproveButton({ onApprove, selectedItems }) {
   const { isKebabified } = useContext(KebabifiedContext);
 
   const renderTooltip = () => {
     if (selectedItems.length === 0) {
-      return i18n._(t`Select a row to approve`);
+      return t`Select a row to approve`;
     }
 
     const itemsUnableToApprove = selectedItems
@@ -24,12 +24,10 @@ function WorkflowApprovalListApproveButton({ onApprove, selectedItems, i18n }) {
       .join(', ');
 
     if (selectedItems.some(cannotApprove)) {
-      return i18n._(
-        t`You are unable to act on the following workflow approvals: ${itemsUnableToApprove}`
-      );
+      return t`You are unable to act on the following workflow approvals: ${itemsUnableToApprove}`;
     }
 
-    return i18n._(t`Approve`);
+    return t`Approve`;
   };
 
   const isDisabled =
@@ -44,7 +42,7 @@ function WorkflowApprovalListApproveButton({ onApprove, selectedItems, i18n }) {
           component="button"
           onClick={onApprove}
         >
-          {i18n._(t`Approve`)}
+          {t`Approve`}
         </DropdownItem>
       ) : (
         <Tooltip content={renderTooltip()} position="top">
@@ -52,11 +50,11 @@ function WorkflowApprovalListApproveButton({ onApprove, selectedItems, i18n }) {
             <Button
               ouiaId="workflow-approval-approve-button"
               isDisabled={isDisabled}
-              aria-label={i18n._(t`Approve`)}
+              aria-label={t`Approve`}
               variant="primary"
               onClick={onApprove}
             >
-              {i18n._(t`Approve`)}
+              {t`Approve`}
             </Button>
           </div>
         </Tooltip>
@@ -74,4 +72,4 @@ WorkflowApprovalListApproveButton.defaultProps = {
   selectedItems: [],
 };
 
-export default withI18n()(WorkflowApprovalListApproveButton);
+export default WorkflowApprovalListApproveButton;
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListDenyButton.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListDenyButton.jsx
index 822b2aa9c4..00909dbff2 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListDenyButton.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListDenyButton.jsx
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import PropTypes from 'prop-types';
 import { Button, DropdownItem, Tooltip } from '@patternfly/react-core';
@@ -10,12 +10,12 @@ function cannotDeny(item) {
   return !item.can_approve_or_deny;
 }
 
-function WorkflowApprovalListDenyButton({ onDeny, selectedItems, i18n }) {
+function WorkflowApprovalListDenyButton({ onDeny, selectedItems }) {
   const { isKebabified } = useContext(KebabifiedContext);
 
   const renderTooltip = () => {
     if (selectedItems.length === 0) {
-      return i18n._(t`Select a row to deny`);
+      return t`Select a row to deny`;
     }
 
     const itemsUnableToDeny = selectedItems
@@ -24,12 +24,10 @@ function WorkflowApprovalListDenyButton({ onDeny, selectedItems, i18n }) {
       .join(', ');
 
     if (selectedItems.some(cannotDeny)) {
-      return i18n._(
-        t`You are unable to act on the following workflow approvals: ${itemsUnableToDeny}`
-      );
+      return t`You are unable to act on the following workflow approvals: ${itemsUnableToDeny}`;
     }
 
-    return i18n._(t`Deny`);
+    return t`Deny`;
   };
 
   const isDisabled =
@@ -44,7 +42,7 @@ function WorkflowApprovalListDenyButton({ onDeny, selectedItems, i18n }) {
           component="button"
           onClick={onDeny}
         >
-          {i18n._(t`Deny`)}
+          {t`Deny`}
         </DropdownItem>
       ) : (
         <Tooltip content={renderTooltip()} position="top">
@@ -52,11 +50,11 @@ function WorkflowApprovalListDenyButton({ onDeny, selectedItems, i18n }) {
             <Button
               ouiaId="workflow-approval-deny-button"
               isDisabled={isDisabled}
-              aria-label={i18n._(t`Deny`)}
+              aria-label={t`Deny`}
               variant="danger"
               onClick={onDeny}
             >
-              {i18n._(t`Deny`)}
+              {t`Deny`}
             </Button>
           </div>
         </Tooltip>
@@ -74,4 +72,4 @@ WorkflowApprovalListDenyButton.defaultProps = {
   selectedItems: [],
 };
 
-export default withI18n()(WorkflowApprovalListDenyButton);
+export default WorkflowApprovalListDenyButton;
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.jsx
index 95aab631ca..a5d11cfb6e 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { string, bool, func } from 'prop-types';
 import { Label } from '@patternfly/react-core';
@@ -20,7 +20,6 @@ function WorkflowApprovalListItem({
   onSelect,
   detailUrl,
   rowIndex,
-  i18n,
 }) {
   const labelId = `check-action-${workflowApproval.id}`;
   const workflowJob = workflowApproval?.summary_fields?.source_workflow_job;
@@ -32,11 +31,9 @@ function WorkflowApprovalListItem({
     ) {
       return (
         <Label>
-          {i18n._(
-            t`Expires on ${formatDateString(
-              workflowApproval.approval_expiration
-            )}`
-          )}
+          {t`Expires on ${formatDateString(
+            workflowApproval.approval_expiration
+          )}`}
         </Label>
       );
     }
@@ -44,7 +41,7 @@ function WorkflowApprovalListItem({
       workflowApproval.status === 'pending' &&
       !workflowApproval.approval_expiration
     ) {
-      return <Label>{i18n._(t`Never expires`)}</Label>;
+      return <Label>{t`Never expires`}</Label>;
     }
     return <WorkflowApprovalStatus workflowApproval={workflowApproval} />;
   };
@@ -57,29 +54,29 @@ function WorkflowApprovalListItem({
           isSelected,
           onSelect,
         }}
-        dataLabel={i18n._(t`Selected`)}
+        dataLabel={t`Selected`}
       />
-      <Td id={labelId} dataLabel={i18n._(t`Name`)}>
+      <Td id={labelId} dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
           <b>{workflowApproval.name}</b>
         </Link>
       </Td>
       <Td>
         <>
-          <JobLabel>{i18n._(t`Job`)}</JobLabel>
+          <JobLabel>{t`Job`}</JobLabel>
           {workflowJob && workflowJob?.id ? (
             <Link to={`/jobs/workflow/${workflowJob?.id}`}>
               {`${workflowJob?.id} - ${workflowJob?.name}`}
             </Link>
           ) : (
-            i18n._(t`Deleted`)
+            t`Deleted`
           )}
         </>
       </Td>
-      <Td dataLabel={i18n._(t`Started`)}>
+      <Td dataLabel={t`Started`}>
         {formatDateString(workflowApproval.started)}
       </Td>
-      <Td dataLabel={i18n._(t`Status`)}>
+      <Td dataLabel={t`Status`}>
         <div>{getStatus()}</div>
       </Td>
     </Tr>
@@ -93,4 +90,4 @@ WorkflowApprovalListItem.propTypes = {
   onSelect: func.isRequired,
 };
 
-export default withI18n()(WorkflowApprovalListItem);
+export default WorkflowApprovalListItem;
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovals.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovals.jsx
index def42f1100..31c7d1461b 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovals.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovals.jsx
@@ -1,31 +1,28 @@
 import React, { useState, useCallback } from 'react';
 import { Route, Switch, useRouteMatch } from 'react-router-dom';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import WorkflowApprovalList from './WorkflowApprovalList';
 import WorkflowApproval from './WorkflowApproval';
 import ScreenHeader from '../../components/ScreenHeader/ScreenHeader';
 
-function WorkflowApprovals({ i18n }) {
+function WorkflowApprovals() {
   const match = useRouteMatch();
   const [breadcrumbConfig, setBreadcrumbConfig] = useState({
-    '/workflow_approvals': i18n._(t`Workflow Approvals`),
+    '/workflow_approvals': t`Workflow Approvals`,
   });
 
-  const updateBreadcrumbConfig = useCallback(
-    workflowApproval => {
-      if (!workflowApproval) {
-        return;
-      }
-      const { id } = workflowApproval;
-      setBreadcrumbConfig({
-        '/workflow_approvals': i18n._(t`Workflow Approvals`),
-        [`/workflow_approvals/${id}`]: workflowApproval.name,
-        [`/workflow_approvals/${id}/details`]: i18n._(t`Details`),
-      });
-    },
-    [i18n]
-  );
+  const updateBreadcrumbConfig = useCallback(workflowApproval => {
+    if (!workflowApproval) {
+      return;
+    }
+    const { id } = workflowApproval;
+    setBreadcrumbConfig({
+      '/workflow_approvals': t`Workflow Approvals`,
+      [`/workflow_approvals/${id}`]: workflowApproval.name,
+      [`/workflow_approvals/${id}/details`]: t`Details`,
+    });
+  }, []);
 
   return (
     <>
@@ -45,4 +42,4 @@ function WorkflowApprovals({ i18n }) {
   );
 }
 
-export default withI18n()(WorkflowApprovals);
+export default WorkflowApprovals;
diff --git a/awx/ui_next/src/screens/WorkflowApproval/shared/WorkflowApprovalStatus.jsx b/awx/ui_next/src/screens/WorkflowApproval/shared/WorkflowApprovalStatus.jsx
index d1540ca644..dca5401e5e 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/shared/WorkflowApprovalStatus.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/shared/WorkflowApprovalStatus.jsx
@@ -1,42 +1,36 @@
 import React from 'react';
-import { withI18n } from '@lingui/react';
+
 import { t } from '@lingui/macro';
 import { Label, Tooltip } from '@patternfly/react-core';
 import { CheckIcon, InfoCircleIcon } from '@patternfly/react-icons';
 import { WorkflowApproval } from '../../../types';
 import { formatDateString } from '../../../util/dates';
 
-function WorkflowApprovalStatus({ workflowApproval, i18n }) {
+function WorkflowApprovalStatus({ workflowApproval }) {
   if (workflowApproval.status === 'pending') {
     return workflowApproval.approval_expiration
-      ? i18n._(
-          t`Expires on ${formatDateString(
-            workflowApproval.approval_expiration
-          )}`
-        )
-      : i18n._(t`Never expires`);
+      ? t`Expires on ${formatDateString(workflowApproval.approval_expiration)}`
+      : t`Never expires`;
   }
 
   if (workflowApproval.timed_out) {
-    return <Label color="red">{i18n._(t`Timed out`)}</Label>;
+    return <Label color="red">{t`Timed out`}</Label>;
   }
 
   if (workflowApproval.canceled_on) {
-    return <Label color="red">{i18n._(t`Canceled`)}</Label>;
+    return <Label color="red">{t`Canceled`}</Label>;
   }
 
   if (workflowApproval.status === 'failed' && workflowApproval.failed) {
     return (
       <Tooltip
-        content={i18n._(
-          t`Denied by ${
-            workflowApproval.summary_fields.approved_or_denied_by.username
-          } - ${formatDateString(workflowApproval.finished)}`
-        )}
+        content={t`Denied by ${
+          workflowApproval.summary_fields.approved_or_denied_by.username
+        } - ${formatDateString(workflowApproval.finished)}`}
         position="top"
       >
         <Label variant="outline" color="red" icon={<InfoCircleIcon />}>
-          {i18n._(t`Denied`)}
+          {t`Denied`}
         </Label>
       </Tooltip>
     );
@@ -45,15 +39,13 @@ function WorkflowApprovalStatus({ workflowApproval, i18n }) {
   if (workflowApproval.status === 'successful') {
     return (
       <Tooltip
-        content={i18n._(
-          t`Approved by ${
-            workflowApproval.summary_fields.approved_or_denied_by.username
-          } - ${formatDateString(workflowApproval.finished)}`
-        )}
+        content={t`Approved by ${
+          workflowApproval.summary_fields.approved_or_denied_by.username
+        } - ${formatDateString(workflowApproval.finished)}`}
         position="top"
       >
         <Label variant="outline" color="green" icon={<CheckIcon />}>
-          {i18n._(t`Approved`)}
+          {t`Approved`}
         </Label>
       </Tooltip>
     );
@@ -66,4 +58,4 @@ WorkflowApprovalStatus.defaultProps = {
   workflowApproval: WorkflowApproval.isRequired,
 };
 
-export default withI18n()(WorkflowApprovalStatus);
+export default WorkflowApprovalStatus;
diff --git a/awx/ui_next/src/util/dates.jsx b/awx/ui_next/src/util/dates.jsx
index f86f423eef..392ae83933 100644
--- a/awx/ui_next/src/util/dates.jsx
+++ b/awx/ui_next/src/util/dates.jsx
@@ -55,7 +55,7 @@ export function dateToInputDateTime(dateObj) {
   return `${year}-${month}-${day}T${hour}:${minute}:${second}`;
 }
 
-export function getRRuleDayConstants(dayString, i18n) {
+export function getRRuleDayConstants(dayString) {
   switch (dayString) {
     case 'sunday':
       return RRule.SU;
@@ -86,6 +86,6 @@ export function getRRuleDayConstants(dayString, i18n) {
     case 'weekendDay':
       return [RRule.SA, RRule.SU];
     default:
-      throw new Error(i18n._(t`Unrecognized day string`));
+      throw new Error(t`Unrecognized day string`);
   }
 }
diff --git a/awx/ui_next/src/util/getRelatedResourceDeleteDetails.js b/awx/ui_next/src/util/getRelatedResourceDeleteDetails.js
index dbcd62080e..656236c936 100644
--- a/awx/ui_next/src/util/getRelatedResourceDeleteDetails.js
+++ b/awx/ui_next/src/util/getRelatedResourceDeleteDetails.js
@@ -1,5 +1,4 @@
 import { t } from '@lingui/macro';
-import { i18n } from '@lingui/core';
 
 import {
   UnifiedJobTemplatesAPI,
@@ -53,39 +52,39 @@ export const relatedResourceDeleteRequests = {
         JobTemplatesAPI.read({
           credentials: selected.id,
         }),
-      label: i18n._(t`Job Templates`),
+      label: t`Job Templates`,
     },
     {
       request: () => ProjectsAPI.read({ credentials: selected.id }),
-      label: i18n._(t`Projects`),
+      label: t`Projects`,
     },
     {
       request: () =>
         InventoriesAPI.read({
           insights_credential: selected.id,
         }),
-      label: i18n._(t`Inventories`),
+      label: t`Inventories`,
     },
     {
       request: () =>
         InventorySourcesAPI.read({
           credentials__id: selected.id,
         }),
-      label: i18n._(t`Inventory Sources`),
+      label: t`Inventory Sources`,
     },
     {
       request: () =>
         CredentialInputSourcesAPI.read({
           source_credential: selected.id,
         }),
-      label: i18n._(t`Credential Input Sources`),
+      label: t`Credential Input Sources`,
     },
     {
       request: () =>
         ExecutionEnvironmentsAPI.read({
           credential: selected.id,
         }),
-      label: i18n._(t`Execution Environments`),
+      label: t`Execution Environments`,
     },
   ],
 
@@ -95,7 +94,7 @@ export const relatedResourceDeleteRequests = {
         CredentialsAPI.read({
           credential_type__id: selected.id,
         }),
-      label: i18n._(t`Credentials`),
+      label: t`Credentials`,
     },
   ],
 
@@ -105,11 +104,11 @@ export const relatedResourceDeleteRequests = {
         JobTemplatesAPI.read({
           inventory: selected.id,
         }),
-      label: i18n._(t`Job Templates`),
+      label: t`Job Templates`,
     },
     {
       request: () => WorkflowJobTemplatesAPI.read({ inventory: selected.id }),
-      label: i18n._(t`Workflow Job Template`),
+      label: t`Workflow Job Template`,
     },
   ],
 
@@ -119,15 +118,15 @@ export const relatedResourceDeleteRequests = {
         WorkflowJobTemplateNodesAPI.read({
           unified_job_template: inventorySourceId,
         }),
-      label: i18n._(t`Workflow Job Template Nodes`),
+      label: t`Workflow Job Template Nodes`,
     },
     {
       request: async () => InventorySourcesAPI.readGroups(inventorySourceId),
-      label: i18n._(t`Groups`),
+      label: t`Groups`,
     },
     {
       request: async () => InventorySourcesAPI.readHosts(inventorySourceId),
-      label: i18n._(t`Hosts`),
+      label: t`Hosts`,
     },
   ],
 
@@ -137,21 +136,21 @@ export const relatedResourceDeleteRequests = {
         JobTemplatesAPI.read({
           project: selected.id,
         }),
-      label: i18n._(t`Job Templates`),
+      label: t`Job Templates`,
     },
     {
       request: () =>
         WorkflowJobTemplateNodesAPI.read({
           unified_job_template: selected.id,
         }),
-      label: i18n._(t`Workflow Job Templates`),
+      label: t`Workflow Job Templates`,
     },
     {
       request: () =>
         InventorySourcesAPI.read({
           source_project: selected.id,
         }),
-      label: i18n._(t`Inventory Sources`),
+      label: t`Inventory Sources`,
     },
   ],
 
@@ -161,7 +160,7 @@ export const relatedResourceDeleteRequests = {
         WorkflowJobTemplateNodesAPI.read({
           unified_job_template: selected.id,
         }),
-      label: [i18n._(t`Workflow Job Template Nodes`)],
+      label: [t`Workflow Job Template Nodes`],
     },
   ],
 
@@ -171,49 +170,49 @@ export const relatedResourceDeleteRequests = {
         CredentialsAPI.read({
           organization: selected.id,
         }),
-      label: i18n._(t`Credential`),
+      label: t`Credential`,
     },
     {
       request: async () =>
         TeamsAPI.read({
           organization: selected.id,
         }),
-      label: i18n._(t`Teams`),
+      label: t`Teams`,
     },
     {
       request: async () =>
         NotificationTemplatesAPI.read({
           organization: selected.id,
         }),
-      label: i18n._(t`Notification Templates`),
+      label: t`Notification Templates`,
     },
     {
       request: () =>
         ExecutionEnvironmentsAPI.read({
           organization: selected.id,
         }),
-      label: i18n._(t`Execution Environments`),
+      label: t`Execution Environments`,
     },
     {
       request: async () =>
         ProjectsAPI.read({
           organization: selected.id,
         }),
-      label: [i18n._(t`Projects`)],
+      label: [t`Projects`],
     },
     {
       request: () =>
         InventoriesAPI.read({
           organization: selected.id,
         }),
-      label: i18n._(t`Inventories`),
+      label: t`Inventories`,
     },
     {
       request: () =>
         ApplicationsAPI.read({
           organization: selected.id,
         }),
-      label: i18n._(t`Applications`),
+      label: t`Applications`,
     },
   ],
   executionEnvironment: selected => [
@@ -222,21 +221,21 @@ export const relatedResourceDeleteRequests = {
         UnifiedJobTemplatesAPI.read({
           execution_environment: selected.id,
         }),
-      label: [i18n._(t`Templates`)],
+      label: [t`Templates`],
     },
     {
       request: async () =>
         ProjectsAPI.read({
           default_environment: selected.id,
         }),
-      label: [i18n._(t`Projects`)],
+      label: [t`Projects`],
     },
     {
       request: async () =>
         OrganizationsAPI.read({
           default_environment: selected.id,
         }),
-      label: [i18n._(t`Organizations`)],
+      label: [t`Organizations`],
     },
     {
       request: async () => {
@@ -264,22 +263,22 @@ export const relatedResourceDeleteRequests = {
           throw new Error(err);
         }
       },
-      label: [i18n._(t`Workflow Job Template Nodes`)],
+      label: [t`Workflow Job Template Nodes`],
     },
   ],
   instanceGroup: selected => [
     {
       request: () => OrganizationsAPI.read({ instance_groups: selected.id }),
-      label: i18n._(t`Organizations`),
+      label: t`Organizations`,
     },
     {
       request: () => InventoriesAPI.read({ instance_groups: selected.id }),
-      label: i18n._(t`Inventories`),
+      label: t`Inventories`,
     },
     {
       request: () =>
         UnifiedJobTemplatesAPI.read({ instance_groups: selected.id }),
-      label: i18n._(t`Templates`),
+      label: t`Templates`,
     },
   ],
 };
diff --git a/awx/ui_next/src/util/validators.jsx b/awx/ui_next/src/util/validators.jsx
index c7b3c7ab6b..d69b370e34 100644
--- a/awx/ui_next/src/util/validators.jsx
+++ b/awx/ui_next/src/util/validators.jsx
@@ -1,7 +1,7 @@
 import { t } from '@lingui/macro';
 
-export function required(message, i18n) {
-  const errorMessage = message || i18n._(t`This field must not be blank`);
+export function required(message) {
+  const errorMessage = message || t`This field must not be blank`;
   return value => {
     if (typeof value === 'string' && !value.trim()) {
       return errorMessage;
@@ -16,39 +16,37 @@ export function required(message, i18n) {
   };
 }
 
-export function maxLength(max, i18n) {
+export function maxLength(max) {
   return value => {
     if (value.trim().length > max) {
-      return i18n._(t`This field must not exceed ${max} characters`);
+      return t`This field must not exceed ${max} characters`;
     }
     return undefined;
   };
 }
 
-export function minLength(min, i18n) {
+export function minLength(min) {
   return value => {
     if (value.trim().length < min) {
-      return i18n._(t`This field must be at least ${min} characters`);
+      return t`This field must be at least ${min} characters`;
     }
     return undefined;
   };
 }
 
-export function minMaxValue(min, max, i18n) {
+export function minMaxValue(min, max) {
   return value => {
     if (value < min || value > max) {
-      return i18n._(
-        t`This field must be a number and have a value between ${min} and ${max}`
-      );
+      return t`This field must be a number and have a value between ${min} and ${max}`;
     }
     return undefined;
   };
 }
 
-export function requiredEmail(i18n) {
+export function requiredEmail() {
   return value => {
     if (!value) {
-      return i18n._(t`This field must not be blank`);
+      return t`This field must not be blank`;
     }
 
     // This isn't a perfect validator. It's likely to let a few
@@ -66,30 +64,30 @@ export function requiredEmail(i18n) {
       }
     }
 
-    return i18n._(t`Invalid email address`);
+    return t`Invalid email address`;
   };
 }
 
-export function noWhiteSpace(i18n) {
+export function noWhiteSpace() {
   return value => {
     if (/\s/.test(value)) {
-      return i18n._(t`This field must not contain spaces`);
+      return t`This field must not contain spaces`;
     }
     return undefined;
   };
 }
 
-export function integer(i18n) {
+export function integer() {
   return value => {
     const str = String(value);
     if (!Number.isInteger(value) && /[^0-9]/.test(str)) {
-      return i18n._(t`This field must be an integer`);
+      return t`This field must be an integer`;
     }
     return undefined;
   };
 }
 
-export function number(i18n) {
+export function number() {
   return value => {
     const str = String(value);
     if (/^-?[0-9]*(\.[0-9]*)?$/.test(str)) {
@@ -99,11 +97,11 @@ export function number(i18n) {
     if (/^-?[0-9]*e[+-][0-9]*$/.test(str)) {
       return undefined;
     }
-    return i18n._(t`This field must be a number`);
+    return t`This field must be a number`;
   };
 }
 
-export function url(i18n) {
+export function url() {
   return value => {
     if (!value) {
       return undefined;
@@ -115,7 +113,7 @@ export function url(i18n) {
         value
       )
     ) {
-      return i18n._(t`Please enter a valid URL`);
+      return t`Please enter a valid URL`;
     }
     return undefined;
   };
@@ -134,12 +132,12 @@ export function combine(validators) {
   };
 }
 
-export function regExp(i18n) {
+export function regExp() {
   return value => {
     try {
       RegExp(value);
     } catch {
-      return i18n._(t`This field must be a regular expression`);
+      return t`This field must be a regular expression`;
     }
     return undefined;
   };
diff --git a/awx/ui_next/src/util/validators.test.js b/awx/ui_next/src/util/validators.test.js
index 1fcc58bc2a..ab3ac55e84 100644
--- a/awx/ui_next/src/util/validators.test.js
+++ b/awx/ui_next/src/util/validators.test.js
@@ -11,142 +11,136 @@ import {
   requiredEmail,
 } from './validators';
 
-const i18n = { _: val => val };
-
 describe('validators', () => {
   test('required returns undefined if value given', () => {
-    expect(required(null, i18n)('some value')).toBeUndefined();
-    expect(required('oops', i18n)('some value')).toBeUndefined();
+    expect(required(null)('some value')).toBeUndefined();
+    expect(required('oops')('some value')).toBeUndefined();
   });
 
   test('required returns default message if value missing', () => {
-    expect(required(null, i18n)('')).toEqual('This field must not be blank');
+    expect(required(null)('')).toEqual('This field must not be blank');
   });
 
   test('required returns custom message if value missing', () => {
-    expect(required('oops', i18n)('')).toEqual('oops');
+    expect(required('oops')('')).toEqual('oops');
   });
 
   test('required interprets white space as empty value', () => {
-    expect(required(null, i18n)(' ')).toEqual('This field must not be blank');
-    expect(required(null, i18n)('\t')).toEqual('This field must not be blank');
+    expect(required(null)(' ')).toEqual('This field must not be blank');
+    expect(required(null)('\t')).toEqual('This field must not be blank');
   });
 
   test('required interprets undefined as empty value', () => {
-    expect(required(null, i18n)(undefined)).toEqual(
-      'This field must not be blank'
-    );
+    expect(required(null)(undefined)).toEqual('This field must not be blank');
   });
 
   test('required interprets 0 as non-empty value', () => {
-    expect(required(null, i18n)(0)).toBeUndefined();
+    expect(required(null)(0)).toBeUndefined();
   });
 
   test('maxLength accepts value below max', () => {
-    expect(maxLength(10, i18n)('snazzy')).toBeUndefined();
+    expect(maxLength(10)('snazzy')).toBeUndefined();
   });
 
   test('maxLength accepts value equal to max', () => {
-    expect(maxLength(10, i18n)('abracadbra')).toBeUndefined();
+    expect(maxLength(10)('abracadbra')).toBeUndefined();
   });
 
   test('maxLength rejects value above max', () => {
-    expect(maxLength(8, i18n)('abracadbra')).toEqual(
-      'This field must not exceed {max} characters'
+    expect(maxLength(8)('abracadbra')).toEqual(
+      'This field must not exceed 8 characters'
     );
   });
 
   test('minLength accepts value above min', () => {
-    expect(minLength(3, i18n)('snazzy')).toBeUndefined();
+    expect(minLength(3)('snazzy')).toBeUndefined();
   });
 
   test('minLength accepts value equal to min', () => {
-    expect(minLength(10, i18n)('abracadbra')).toBeUndefined();
+    expect(minLength(10)('abracadbra')).toBeUndefined();
   });
 
   test('minLength rejects value below min', () => {
-    expect(minLength(12, i18n)('abracadbra')).toEqual(
-      'This field must be at least {min} characters'
+    expect(minLength(12)('abracadbra')).toEqual(
+      'This field must be at least 12 characters'
     );
   });
 
   test('noWhiteSpace returns error', () => {
-    expect(noWhiteSpace(i18n)('this has spaces')).toEqual(
+    expect(noWhiteSpace()('this has spaces')).toEqual(
       'This field must not contain spaces'
     );
-    expect(noWhiteSpace(i18n)('this has\twhitespace')).toEqual(
+    expect(noWhiteSpace()('this has\twhitespace')).toEqual(
       'This field must not contain spaces'
     );
-    expect(noWhiteSpace(i18n)('this\nhas\nnewlines')).toEqual(
+    expect(noWhiteSpace()('this\nhas\nnewlines')).toEqual(
       'This field must not contain spaces'
     );
   });
 
   test('noWhiteSpace should accept valid string', () => {
-    expect(noWhiteSpace(i18n)('this_has_no_whitespace')).toBeUndefined();
+    expect(noWhiteSpace()('this_has_no_whitespace')).toBeUndefined();
   });
 
   test('integer should accept integer (number)', () => {
-    expect(integer(i18n)(13)).toBeUndefined();
+    expect(integer()(13)).toBeUndefined();
   });
 
   test('integer should accept integer (string)', () => {
-    expect(integer(i18n)('13')).toBeUndefined();
+    expect(integer()('13')).toBeUndefined();
   });
 
   test('integer should reject decimal/float', () => {
-    expect(integer(i18n)(13.1)).toEqual('This field must be an integer');
+    expect(integer()(13.1)).toEqual('This field must be an integer');
   });
 
   test('integer should reject string containing alphanum', () => {
-    expect(integer(i18n)('15a')).toEqual('This field must be an integer');
+    expect(integer()('15a')).toEqual('This field must be an integer');
   });
 
   test('number should accept number (number)', () => {
-    expect(number(i18n)(13)).toBeUndefined();
+    expect(number()(13)).toBeUndefined();
   });
 
   test('number should accept number (string)', () => {
-    expect(number(i18n)('13')).toBeUndefined();
+    expect(number()('13')).toBeUndefined();
   });
 
   test('number should accept negative number', () => {
-    expect(number(i18n)(-14)).toBeUndefined();
+    expect(number()(-14)).toBeUndefined();
   });
 
   test('number should accept decimal/float', () => {
-    expect(number(i18n)(13.1)).toBeUndefined();
+    expect(number()(13.1)).toBeUndefined();
   });
 
   test('number should accept large number', () => {
-    expect(number(i18n)(999999999999999999999.9)).toBeUndefined();
-    expect(number(i18n)(-999999999999999999999.9)).toBeUndefined();
+    expect(number()(999999999999999999999.9)).toBeUndefined();
+    expect(number()(-999999999999999999999.9)).toBeUndefined();
   });
 
   test('number should reject string containing alphanum', () => {
-    expect(number(i18n)('15a')).toEqual('This field must be a number');
+    expect(number()('15a')).toEqual('This field must be a number');
   });
 
   test('url should reject incomplete url', () => {
-    expect(url(i18n)('abcd')).toEqual('Please enter a valid URL');
+    expect(url()('abcd')).toEqual('Please enter a valid URL');
   });
 
   test('url should accept fully qualified url', () => {
-    expect(url(i18n)('http://example.com/foo')).toBeUndefined();
+    expect(url()('http://example.com/foo')).toBeUndefined();
   });
 
   test('url should accept url with query params', () => {
-    expect(url(i18n)('https://example.com/foo?bar=baz')).toBeUndefined();
+    expect(url()('https://example.com/foo?bar=baz')).toBeUndefined();
   });
 
   test('url should reject short protocol', () => {
-    expect(url(i18n)('h://example.com/foo')).toEqual(
-      'Please enter a valid URL'
-    );
+    expect(url()('h://example.com/foo')).toEqual('Please enter a valid URL');
   });
 
   test('combine should run all validators', () => {
-    const validators = [required(null, i18n), noWhiteSpace(i18n)];
+    const validators = [required(null), noWhiteSpace()];
     expect(combine(validators)('')).toEqual('This field must not be blank');
     expect(combine(validators)('one two')).toEqual(
       'This field must not contain spaces'
@@ -155,25 +149,23 @@ describe('validators', () => {
   });
 
   test('combine should skip null validators', () => {
-    const validators = [required(null, i18n), null];
+    const validators = [required(null), null];
     expect(combine(validators)('')).toEqual('This field must not be blank');
     expect(combine(validators)('ok')).toBeUndefined();
   });
 
   test('regExp rejects invalid regular expression', () => {
-    expect(regExp(i18n)('[')).toEqual(
-      'This field must be a regular expression'
-    );
-    expect(regExp(i18n)('')).toBeUndefined();
-    expect(regExp(i18n)('ok')).toBeUndefined();
-    expect(regExp(i18n)('[^a-zA-Z]')).toBeUndefined();
+    expect(regExp()('[')).toEqual('This field must be a regular expression');
+    expect(regExp()('')).toBeUndefined();
+    expect(regExp()('ok')).toBeUndefined();
+    expect(regExp()('[^a-zA-Z]')).toBeUndefined();
   });
 
   test('email validator rejects obviously invalid email ', () => {
-    expect(requiredEmail(i18n)('foobar321')).toEqual('Invalid email address');
+    expect(requiredEmail()('foobar321')).toEqual('Invalid email address');
   });
 
   test('bob has email', () => {
-    expect(requiredEmail(i18n)('bob@localhost')).toBeUndefined();
+    expect(requiredEmail()('bob@localhost')).toBeUndefined();
   });
 });