diff --git a/src/Components/CreateImageWizard/steps/Details/index.tsx b/src/Components/CreateImageWizard/steps/Details/index.tsx
index 76f5c347..eaaeba42 100644
--- a/src/Components/CreateImageWizard/steps/Details/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Details/index.tsx
@@ -48,7 +48,7 @@ const DetailsStep = () => {
       <Title headingLevel="h1" size="xl">
         Details
       </Title>
-      <Content component="p">
+      <Content>
         Enter a name to identify your blueprint. If no name is entered, the
         images created from this blueprint will use the name of the parent
         blueprint.
diff --git a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemAutomaticPartitionInformation.tsx b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemAutomaticPartitionInformation.tsx
index 0cc160f2..fcdd8213 100644
--- a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemAutomaticPartitionInformation.tsx
+++ b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemAutomaticPartitionInformation.tsx
@@ -9,7 +9,7 @@ const FileSystemAutomaticPartition = () => {
   return (
     <Content>
       <Content component={ContentVariants.h3}>Automatic partitioning</Content>
-      <Content component="p">
+      <Content>
         The system automatically partitions your image storage depending on the
         target environment(s). The target environment sometimes dictates all or
         part of the partitioning scheme. Automatic partitioning applies the most
diff --git a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemConfiguration.tsx b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemConfiguration.tsx
index 2f9d72e4..12036d17 100644
--- a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemConfiguration.tsx
+++ b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemConfiguration.tsx
@@ -48,12 +48,12 @@ const FileSystemConfiguration = () => {
         partition?.mountpoint?.includes('/usr')
       ) && <UsrSubDirectoriesDisabled />}
       <Content>
-        <Content component="p">
+        <Content>
           Create partitions for your image by defining mount points and minimum
           sizes. Image builder creates partitions with a logical volume (LVM)
           device type.
         </Content>
-        <Content component="p">
+        <Content>
           The order of partitions may change when the image is installed in
           order to conform to best practices and ensure functionality.
           <br></br>
diff --git a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx
index 4db1f936..abd6dfeb 100644
--- a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx
+++ b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx
@@ -46,7 +46,7 @@ export const MinimumSizePopover = () => {
       maxWidth="30rem"
       bodyContent={
         <Content>
-          <Content component="p">
+          <Content>
             Image Builder may extend this size based on requirements, selected
             packages, and configurations.
           </Content>
diff --git a/src/Components/CreateImageWizard/steps/FileSystem/index.tsx b/src/Components/CreateImageWizard/steps/FileSystem/index.tsx
index 555fd8ae..8de14e58 100644
--- a/src/Components/CreateImageWizard/steps/FileSystem/index.tsx
+++ b/src/Components/CreateImageWizard/steps/FileSystem/index.tsx
@@ -22,7 +22,7 @@ const FileSystemStep = () => {
       <Title headingLevel="h1" size="xl">
         File system configuration
       </Title>
-      <Content component="p">Define the partitioning of the image.</Content>
+      <Content>Define the partitioning of the image.</Content>
       {hasIsoTargetOnly ? (
         <FileSystemAutomaticPartition />
       ) : fileSystemConfigurationType === 'automatic' ? (
diff --git a/src/Components/CreateImageWizard/steps/Firewall/index.tsx b/src/Components/CreateImageWizard/steps/Firewall/index.tsx
index a9cee7a9..2211371d 100644
--- a/src/Components/CreateImageWizard/steps/Firewall/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Firewall/index.tsx
@@ -11,9 +11,7 @@ const FirewallStep = () => {
       <Title headingLevel="h1" size="xl">
         Firewall
       </Title>
-      <Content component="p">
-        Customize firewall settings for your image.
-      </Content>
+      <Content>Customize firewall settings for your image.</Content>
       <PortsInput />
       <Services />
     </Form>
diff --git a/src/Components/CreateImageWizard/steps/FirstBoot/index.tsx b/src/Components/CreateImageWizard/steps/FirstBoot/index.tsx
index b558ec8d..3cd93eae 100644
--- a/src/Components/CreateImageWizard/steps/FirstBoot/index.tsx
+++ b/src/Components/CreateImageWizard/steps/FirstBoot/index.tsx
@@ -52,7 +52,7 @@ const FirstBootStep = () => {
       <Title headingLevel="h1" size="xl">
         First boot configuration
       </Title>
-      <Content component="p">
+      <Content>
         Configure the image with a custom script that will execute on its first
         boot.
       </Content>
@@ -62,7 +62,7 @@ const FirstBootStep = () => {
         isInline
         title="Important: please do not include sensitive information"
       >
-        <Content component="p">
+        <Content>
           Please ensure that your script does not contain any secrets,
           passwords, or other sensitive data. All scripts should be crafted
           without including confidential information to maintain security and
diff --git a/src/Components/CreateImageWizard/steps/Hostname/index.tsx b/src/Components/CreateImageWizard/steps/Hostname/index.tsx
index f0fecb3d..49c91048 100644
--- a/src/Components/CreateImageWizard/steps/Hostname/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Hostname/index.tsx
@@ -10,7 +10,7 @@ const HostnameStep = () => {
       <Title headingLevel="h1" size="xl">
         Hostname
       </Title>
-      <Content component="p">Select a hostname for your image.</Content>
+      <Content>Select a hostname for your image.</Content>
       <HostnameInput />
     </Form>
   );
diff --git a/src/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.tsx b/src/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.tsx
index c0db28cc..7de6dbed 100644
--- a/src/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.tsx
+++ b/src/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.tsx
@@ -255,7 +255,7 @@ const TargetEnvironment = () => {
                             position="right"
                             bodyContent={
                               <Content>
-                                <Content component="p">
+                                <Content>
                                   An OVA file is a virtual appliance used by
                                   virtualization platforms such as VMware
                                   vSphere. It is a package that contains files
@@ -303,7 +303,7 @@ const TargetEnvironment = () => {
                           position="right"
                           bodyContent={
                             <Content>
-                              <Content component="p">
+                              <Content>
                                 A VMDK file is a virtual disk that stores the
                                 contents of a virtual machine. This disk has to
                                 be imported into vSphere using govc import.vmdk,
@@ -379,14 +379,14 @@ const TargetEnvironment = () => {
                   position="right"
                   headerContent={
                     <Content>
-                      <Content component="p">
+                      <Content>
                         WSL is not officially supported by Red Hat
                       </Content>
                     </Content>
                   }
                   bodyContent={
                     <Content>
-                      <Content component="p">
+                      <Content>
                         You can use RHEL on Microsoft&apos;s Windows Subsystem
                         for Linux (WSL) for development and learning use cases.
                         Red Hat supports WSL under the Validated Software
diff --git a/src/Components/CreateImageWizard/steps/ImageOutput/index.tsx b/src/Components/CreateImageWizard/steps/ImageOutput/index.tsx
index ab28206d..02c9315e 100644
--- a/src/Components/CreateImageWizard/steps/ImageOutput/index.tsx
+++ b/src/Components/CreateImageWizard/steps/ImageOutput/index.tsx
@@ -38,7 +38,7 @@ const ImageOutputStep = () => {
       <Title headingLevel="h1" size="xl">
         Image output
       </Title>
-      <Content component="p">
+      <Content>
         Images enables you to create customized blueprints, create custom images
         from the blueprints, and push them to target environments.
         <br />
diff --git a/src/Components/CreateImageWizard/steps/Kernel/index.tsx b/src/Components/CreateImageWizard/steps/Kernel/index.tsx
index bb864f44..a857b36a 100644
--- a/src/Components/CreateImageWizard/steps/Kernel/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Kernel/index.tsx
@@ -11,9 +11,7 @@ const KernelStep = () => {
       <Title headingLevel="h1" size="xl">
         Kernel
       </Title>
-      <Content component="p">
-        Customize kernel name and kernel arguments.
-      </Content>
+      <Content>Customize kernel name and kernel arguments.</Content>
       <KernelName />
       <KernelArguments />
     </Form>
diff --git a/src/Components/CreateImageWizard/steps/Locale/index.tsx b/src/Components/CreateImageWizard/steps/Locale/index.tsx
index 9a618425..45dd26d2 100644
--- a/src/Components/CreateImageWizard/steps/Locale/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Locale/index.tsx
@@ -11,7 +11,7 @@ const LocaleStep = () => {
       <Title headingLevel="h1" size="xl">
         Locale
       </Title>
-      <Content component="p">Select the locale for your image.</Content>
+      <Content>Select the locale for your image.</Content>
       <LanguagesDropDown />
       <KeyboardDropDown />
     </Form>
diff --git a/src/Components/CreateImageWizard/steps/Oscap/index.tsx b/src/Components/CreateImageWizard/steps/Oscap/index.tsx
index 99f1404c..1c096cfe 100644
--- a/src/Components/CreateImageWizard/steps/Oscap/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Oscap/index.tsx
@@ -114,7 +114,7 @@ const OscapContent = () => {
       <Title headingLevel="h1" size="xl">
         {complianceEnabled ? 'Compliance' : 'OpenSCAP profile'}
       </Title>
-      <Content component="p">
+      <Content>
         Below you can select which Insights compliance policy or OpenSCAP
         profile your image will be compliant to. Insights compliance allows the
         use of tailored policies, whereas OpenSCAP gives you the default
diff --git a/src/Components/CreateImageWizard/steps/Packages/PackageRecommendations.tsx b/src/Components/CreateImageWizard/steps/Packages/PackageRecommendations.tsx
index 5d82df3e..9a8eb047 100644
--- a/src/Components/CreateImageWizard/steps/Packages/PackageRecommendations.tsx
+++ b/src/Components/CreateImageWizard/steps/Packages/PackageRecommendations.tsx
@@ -170,7 +170,7 @@ const PackageRecommendations = () => {
                         onHide={() => setIsExpanded(false)}
                         bodyContent={
                           <Content>
-                            <Content component="p">
+                            <Content>
                               RHEL Lightspeed provides intelligent tools to
                               improve the productivity and efficiency of teams
                               using RHEL.
@@ -209,7 +209,7 @@ const PackageRecommendations = () => {
             {isSuccess && data && data?.packages && (
               <>
                 <Content>
-                  <Content component="p">
+                  <Content>
                     Other users commonly add these packages with the ones you
                     selected.
                   </Content>
diff --git a/src/Components/CreateImageWizard/steps/Packages/Packages.tsx b/src/Components/CreateImageWizard/steps/Packages/Packages.tsx
index 1459a4f5..35fbf67c 100644
--- a/src/Components/CreateImageWizard/steps/Packages/Packages.tsx
+++ b/src/Components/CreateImageWizard/steps/Packages/Packages.tsx
@@ -1189,9 +1189,7 @@ const Packages = () => {
                             </Tbody>
                           </Table>
                         ) : (
-                          <Content component="p">
-                            This group has no packages
-                          </Content>
+                          <Content>This group has no packages</Content>
                         )}
                       </div>
                     }
diff --git a/src/Components/CreateImageWizard/steps/Packages/components/PackageInfoNotAvailablePopover.tsx b/src/Components/CreateImageWizard/steps/Packages/components/PackageInfoNotAvailablePopover.tsx
index 7e748080..62e77a96 100644
--- a/src/Components/CreateImageWizard/steps/Packages/components/PackageInfoNotAvailablePopover.tsx
+++ b/src/Components/CreateImageWizard/steps/Packages/components/PackageInfoNotAvailablePopover.tsx
@@ -9,10 +9,10 @@ const PackageInfoNotAvailablePopover = () => {
       headerContent="Package description"
       bodyContent={
         <Content>
-          <Content component="p">
+          <Content>
             The package description provides more information about the package.
           </Content>
-          <Content component="p">
+          <Content>
             When editing an existing blueprint, you may see a &quot;Not
             available&quot; value in the field because information about
             previously added packages can not be fetched.
diff --git a/src/Components/CreateImageWizard/steps/Packages/components/RepoPopovers.tsx b/src/Components/CreateImageWizard/steps/Packages/components/RepoPopovers.tsx
index ef5aa18e..6a099b14 100644
--- a/src/Components/CreateImageWizard/steps/Packages/components/RepoPopovers.tsx
+++ b/src/Components/CreateImageWizard/steps/Packages/components/RepoPopovers.tsx
@@ -8,7 +8,7 @@ export const IncludedReposPopover = () => {
     <Popover
       bodyContent={
         <Content>
-          <Content component="p">
+          <Content>
             View packages from the Red Hat repository and repositories
             you&apos;ve selected.
           </Content>
@@ -33,7 +33,7 @@ export const OtherReposPopover = () => {
     <Popover
       bodyContent={
         <Content>
-          <Content component="p">
+          <Content>
             View packages from popular repositories and your other repositories
             not included in the image.
           </Content>
diff --git a/src/Components/CreateImageWizard/steps/Packages/index.tsx b/src/Components/CreateImageWizard/steps/Packages/index.tsx
index c280051d..f522b967 100644
--- a/src/Components/CreateImageWizard/steps/Packages/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Packages/index.tsx
@@ -16,7 +16,7 @@ const PackagesStep = () => {
       <Title headingLevel="h1" size="xl">
         Additional packages
       </Title>
-      <Content component="p">
+      <Content>
         Blueprints created with Images include all required packages.
       </Content>
       {!process.env.IS_ON_PREMISE && (
diff --git a/src/Components/CreateImageWizard/steps/Registration/ActivationKeyInformation.tsx b/src/Components/CreateImageWizard/steps/Registration/ActivationKeyInformation.tsx
index 4a7a6369..bd4f7b03 100644
--- a/src/Components/CreateImageWizard/steps/Registration/ActivationKeyInformation.tsx
+++ b/src/Components/CreateImageWizard/steps/Registration/ActivationKeyInformation.tsx
@@ -54,7 +54,7 @@ const ActivationKeyInformation = (): JSX.Element => {
               <Popover
                 bodyContent={
                   <Content>
-                    <Content component="p">
+                    <Content>
                       The core repositories for your operating system version
                       are always enabled and do not need to be explicitly added
                       to the activation key.
diff --git a/src/Components/CreateImageWizard/steps/Registration/ActivationKeysList.tsx b/src/Components/CreateImageWizard/steps/Registration/ActivationKeysList.tsx
index bdf1b3b8..cb308c86 100644
--- a/src/Components/CreateImageWizard/steps/Registration/ActivationKeysList.tsx
+++ b/src/Components/CreateImageWizard/steps/Registration/ActivationKeysList.tsx
@@ -262,7 +262,7 @@ const ActivationKeysList = () => {
           <SelectList>{prepareSelectOptions()}</SelectList>
         </Select>
         <Content>
-          <Content component="p">
+          <Content>
             Create and manage activation keys on the <ManageKeysButton />
           </Content>
         </Content>
diff --git a/src/Components/CreateImageWizard/steps/Registration/Registration.tsx b/src/Components/CreateImageWizard/steps/Registration/Registration.tsx
index 896236ed..66799279 100644
--- a/src/Components/CreateImageWizard/steps/Registration/Registration.tsx
+++ b/src/Components/CreateImageWizard/steps/Registration/Registration.tsx
@@ -27,7 +27,7 @@ const InsightsPopover = () => {
       minWidth="30rem"
       bodyContent={
         <Content>
-          <Content component="p">
+          <Content>
             Red Hat Insights client provides actionable intelligence about your
             Red Hat Enterprise Linux environments, helping to identify and
             address operational and vulnerability risks before an issue results
@@ -66,7 +66,7 @@ const RhcPopover = () => {
       minWidth="30rem"
       bodyContent={
         <Content>
-          <Content component="p">
+          <Content>
             Remote host configuration allows Red Hat Enterprise Linux hosts to
             connect to Red Hat Insights. Remote host configuration is required
             to use the Red Hat Insights Remediations service.
diff --git a/src/Components/CreateImageWizard/steps/Registration/components/PopoverActivation.tsx b/src/Components/CreateImageWizard/steps/Registration/components/PopoverActivation.tsx
index 612bd113..cf25e94c 100644
--- a/src/Components/CreateImageWizard/steps/Registration/components/PopoverActivation.tsx
+++ b/src/Components/CreateImageWizard/steps/Registration/components/PopoverActivation.tsx
@@ -22,18 +22,16 @@ const PopoverActivation = () => {
       maxWidth="35rem"
       bodyContent={
         <Content>
-          <Content component="p">
+          <Content>
             Activation keys enable you to register a system with appropriate
             subscriptions, system purpose, and repositories attached.
           </Content>
-          <Content component="p">
+          <Content>
             If using an activation key with command line registration, you must
             provide your organization&apos;s ID.
           </Content>
           {orgId ? (
-            <Content component="p">
-              Your organization&apos;s ID is {orgId}
-            </Content>
+            <Content>Your organization&apos;s ID is {orgId}</Content>
           ) : (
             <Spinner size="md" />
           )}
diff --git a/src/Components/CreateImageWizard/steps/Registration/index.tsx b/src/Components/CreateImageWizard/steps/Registration/index.tsx
index 7e499910..8176b8ba 100644
--- a/src/Components/CreateImageWizard/steps/Registration/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Registration/index.tsx
@@ -21,7 +21,7 @@ const RegistrationStep = () => {
       <Title headingLevel="h1" size="xl">
         Register systems using this image
       </Title>
-      <Content component="p">
+      <Content>
         You can either automatically register your systems with Red Hat to
         enhance security and track your spending or choose to register your
         system during initial boot.
diff --git a/src/Components/CreateImageWizard/steps/Repositories/components/UploadRepositoryLabel.tsx b/src/Components/CreateImageWizard/steps/Repositories/components/UploadRepositoryLabel.tsx
index 668b4fd2..047bacfc 100644
--- a/src/Components/CreateImageWizard/steps/Repositories/components/UploadRepositoryLabel.tsx
+++ b/src/Components/CreateImageWizard/steps/Repositories/components/UploadRepositoryLabel.tsx
@@ -9,7 +9,7 @@ const UploadRepositoryLabel = () => {
   return (
     <Tooltip
       content={
-        <Content component="p">
+        <Content>
           Upload repository: Snapshots will only be taken when new content is
           uploaded.&nbsp;
           <Button
diff --git a/src/Components/CreateImageWizard/steps/Repositories/index.tsx b/src/Components/CreateImageWizard/steps/Repositories/index.tsx
index 76401f17..1c9e22a6 100644
--- a/src/Components/CreateImageWizard/steps/Repositories/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Repositories/index.tsx
@@ -37,7 +37,7 @@ const RepositoriesStep = () => {
       <Title headingLevel="h1" size="xl">
         Custom repositories
       </Title>
-      <Content component="p">
+      <Content>
         Select the linked custom repositories from which you can add packages to
         the image.
         <br />
diff --git a/src/Components/CreateImageWizard/steps/Review/index.tsx b/src/Components/CreateImageWizard/steps/Review/index.tsx
index 9384ebde..944b39dd 100644
--- a/src/Components/CreateImageWizard/steps/Review/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Review/index.tsx
@@ -19,9 +19,7 @@ const ReviewStep = () => {
       <Title headingLevel="h1" size="xl">
         Review {blueprintName} blueprint
       </Title>
-      {blueprintDescription && (
-        <Content component="p">{blueprintDescription}</Content>
-      )}
+      {blueprintDescription && <Content>{blueprintDescription}</Content>}
       <Review />
     </Form>
   );
diff --git a/src/Components/CreateImageWizard/steps/Services/index.tsx b/src/Components/CreateImageWizard/steps/Services/index.tsx
index 2bb335ac..cb0bb3b2 100644
--- a/src/Components/CreateImageWizard/steps/Services/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Services/index.tsx
@@ -10,9 +10,7 @@ const ServicesStep = () => {
       <Title headingLevel="h1" size="xl">
         Systemd services
       </Title>
-      <Content component="p">
-        Enable, disable and mask systemd services.
-      </Content>
+      <Content>Enable, disable and mask systemd services.</Content>
       <ServicesInput />
     </Form>
   );
diff --git a/src/Components/CreateImageWizard/steps/Snapshot/Snapshot.tsx b/src/Components/CreateImageWizard/steps/Snapshot/Snapshot.tsx
index 55681a17..a28f879a 100644
--- a/src/Components/CreateImageWizard/steps/Snapshot/Snapshot.tsx
+++ b/src/Components/CreateImageWizard/steps/Snapshot/Snapshot.tsx
@@ -99,7 +99,7 @@ export default function Snapshot() {
             Use latest content
           </Title>
           <Grid>
-            <Content component="p">
+            <Content>
               Image Builder will automatically use the newest state of
               repositories when building this image.
             </Content>
@@ -149,7 +149,7 @@ export default function Snapshot() {
             </Flex>
           </FormGroup>
           <Grid>
-            <Content component="p">
+            <Content>
               Image Builder will reflect the state of repositories based on the
               selected date when building this image.
             </Content>
diff --git a/src/Components/CreateImageWizard/steps/Snapshot/index.tsx b/src/Components/CreateImageWizard/steps/Snapshot/index.tsx
index 7b4904f3..eed00f1b 100644
--- a/src/Components/CreateImageWizard/steps/Snapshot/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Snapshot/index.tsx
@@ -14,7 +14,7 @@ export default function SnapshotStep() {
         Repeatable build
       </Title>
       <Grid>
-        <Content component="p">
+        <Content>
           Control the consistency of the packages in the repository used to
           build the image.
         </Content>
diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/index.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/index.tsx
index 5c1caa2b..2ac256c7 100644
--- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/index.tsx
+++ b/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/index.tsx
@@ -58,11 +58,11 @@ const Aws = () => {
       <Title headingLevel="h1" size="xl">
         Target environment - Amazon Web Services
       </Title>
-      <Content component="p">
+      <Content>
         Your image will be uploaded to AWS and shared with the account you
         provide below.
       </Content>
-      <Content component="p">
+      <Content>
         <b>The shared image will expire within 14 days.</b> To permanently
         access the image, copy the image, which will be shared to your account
         by Red Hat, to your own AWS account.
diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx
index 57394a47..5db43ea0 100644
--- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx
+++ b/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx
@@ -68,12 +68,12 @@ const Azure = () => {
       <Title headingLevel="h1" size="xl">
         Target environment - Microsoft Azure
       </Title>
-      <Content component="p">
+      <Content>
         Upon build, Image Builder sends the image to the selected authorized
         Azure account. The image will be uploaded to the resource group in the
         subscription you specify.
       </Content>
-      <Content component="p">
+      <Content>
         To authorize Image Builder to push images to Microsoft Azure, the
         account owner must configure Image Builder as an authorized application
         for a specific tenant ID and give it the role of &quot;Contributor&quot;
diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Gcp/index.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Gcp/index.tsx
index 71e5f9c8..fe7f5c8c 100644
--- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Gcp/index.tsx
+++ b/src/Components/CreateImageWizard/steps/TargetEnvironment/Gcp/index.tsx
@@ -1,6 +1,13 @@
 import React from 'react';
 
-import { Radio, Content, Form, Title, FormGroup } from '@patternfly/react-core';
+import {
+  Radio,
+  Content,
+  Form,
+  Title,
+  FormGroup,
+  ContentVariants,
+} from '@patternfly/react-core';
 
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import {
@@ -34,7 +41,7 @@ const Gcp = () => {
       <Title headingLevel="h1" size="xl">
         Target environment - Google Cloud Platform
       </Title>
-      <Content component="p">
+      <Content>
         Select how to share your image. The image you create can be used to
         launch instances on GCP, regardless of which method you select.
       </Content>
@@ -44,7 +51,7 @@ const Gcp = () => {
           label="Share image with a Google account"
           name="radio-1"
           description={
-            <Content component="p">
+            <Content component={ContentVariants.small}>
               Your image will be uploaded to GCP and shared with the account you
               provide below.
               <b>The image expires in 14 days.</b> To keep permanent access to
@@ -63,7 +70,7 @@ const Gcp = () => {
           label="Share image with Red Hat Insights only"
           name="radio-2"
           description={
-            <Content component="p">
+            <Content component={ContentVariants.small}>
               Your image will be uploaded to GCP and shared with Red Hat
               Insights.
               <b> The image expires in 14 days.</b> You cannot access or
diff --git a/src/Components/CreateImageWizard/steps/Timezone/index.tsx b/src/Components/CreateImageWizard/steps/Timezone/index.tsx
index f06cf77f..df4bab73 100644
--- a/src/Components/CreateImageWizard/steps/Timezone/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Timezone/index.tsx
@@ -11,7 +11,7 @@ const TimezoneStep = () => {
       <Title headingLevel="h1" size="xl">
         Timezone
       </Title>
-      <Content component="p">Select a timezone for your image.</Content>
+      <Content>Select a timezone for your image.</Content>
       <TimezoneDropDown />
       <NtpServersInput />
     </Form>
diff --git a/src/Components/CreateImageWizard/steps/Users/index.tsx b/src/Components/CreateImageWizard/steps/Users/index.tsx
index b48e9921..ba9012ef 100644
--- a/src/Components/CreateImageWizard/steps/Users/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Users/index.tsx
@@ -16,7 +16,7 @@ const UsersStep = () => {
       <Title headingLevel="h1" size="xl">
         Users
       </Title>
-      <Content component="p">Add a user to your image.</Content>
+      <Content>Add a user to your image.</Content>
       {users.length !== 0 ? <UserInfo /> : <EmptyUserState />}
     </Form>
   );
diff --git a/src/Components/ImagesTable/EmptyState.tsx b/src/Components/ImagesTable/EmptyState.tsx
index d4ad6597..856bc173 100644
--- a/src/Components/ImagesTable/EmptyState.tsx
+++ b/src/Components/ImagesTable/EmptyState.tsx
@@ -36,7 +36,7 @@ const EmptyBlueprintsImagesTable = () => (
       variant={EmptyStateVariant.lg}
     >
       <EmptyStateBody>
-        <Content component="p">
+        <Content>
           The selected blueprint version doesn&apos;t contain any images. Build
           an image from this version, or adjust the filters.
         </Content>
@@ -63,7 +63,7 @@ const EmptyImagesTable = () => {
             headingLevel="h4"
           />
           <EmptyStateBody>
-            <Content component="p">
+            <Content>
               Image builder is a tool for creating deployment-ready customized
               system images: installation disks, virtual machines, cloud
               vendor-specific images, and others. By using image builder, you
@@ -71,10 +71,10 @@ const EmptyImagesTable = () => {
               it eliminates the specific configurations required for each output
               type.
             </Content>
-            <Content component="p">
+            <Content>
               There are no images yet. Create a blueprint to create images.
             </Content>
-            <Content component="p">
+            <Content>
               <Button
                 component="a"
                 target="_blank"
diff --git a/src/Components/LandingPage/LandingPage.tsx b/src/Components/LandingPage/LandingPage.tsx
index 4b02b688..f112ea1d 100644
--- a/src/Components/LandingPage/LandingPage.tsx
+++ b/src/Components/LandingPage/LandingPage.tsx
@@ -101,13 +101,13 @@ export const LandingPage = () => {
                 body={
                   <div>
                     <Content>
-                      <Content component="p">
+                      <Content>
                         With RPM-DNF, you can manage the system software by
                         using the DNF package manager and updated RPM packages.
                         This is a simple and adaptive method of managing and
                         modifying the system over its lifecycle.
                       </Content>
-                      <Content component="p">
+                      <Content>
                         <Button
                           component="a"
                           target="_blank"
@@ -136,7 +136,7 @@ export const LandingPage = () => {
                 header={'Immutable (OSTree)'}
                 body={
                   <Content>
-                    <Content component="p">
+                    <Content>
                       With OSTree, you can manage the system software by
                       referencing a central image repository. OSTree images
                       contain a complete operating system ready to be remotely
@@ -145,7 +145,7 @@ export const LandingPage = () => {
                       address changes and keep the operating system unchanged.
                       The updates are quick, and the rollbacks are easy.
                     </Content>
-                    <Content component="p">
+                    <Content>
                       <Button
                         component="a"
                         target="_blank"
diff --git a/src/Components/LandingPage/NewAlert.tsx b/src/Components/LandingPage/NewAlert.tsx
index f0f8b61a..7986b458 100644
--- a/src/Components/LandingPage/NewAlert.tsx
+++ b/src/Components/LandingPage/NewAlert.tsx
@@ -73,7 +73,7 @@ export const NewAlert = ({ setShowAlert }: NewAlertPropTypes) => {
         }
       >
         <Content>
-          <Content component="p">
+          <Content>
             New options for blueprint customization are now available:
           </Content>
           <Content component="ul">
diff --git a/src/Components/sharedComponents/ImageBuilderHeader.tsx b/src/Components/sharedComponents/ImageBuilderHeader.tsx
index a5b8038e..ce3090cf 100644
--- a/src/Components/sharedComponents/ImageBuilderHeader.tsx
+++ b/src/Components/sharedComponents/ImageBuilderHeader.tsx
@@ -43,7 +43,7 @@ const AboutImageBuilderPopover = () => {
       headerContent={'About image builder'}
       bodyContent={
         <Content>
-          <Content component="p">
+          <Content>
             Image builder is a tool for creating deployment-ready customized
             system images: installation disks, virtual machines, cloud
             vendor-specific images, and others. By using image builder, you can
@@ -51,7 +51,7 @@ const AboutImageBuilderPopover = () => {
             eliminates the specific configurations required for each output
             type.
           </Content>
-          <Content component="p">
+          <Content>
             <Button
               component="a"
               target="_blank"
@@ -64,7 +64,7 @@ const AboutImageBuilderPopover = () => {
               Image builder for RPM-DNF documentation
             </Button>
           </Content>
-          <Content component="p">
+          <Content>
             <Button
               component="a"
               target="_blank"