diff --git a/app/src/molecules/Command/CommandText.tsx b/app/src/molecules/Command/CommandText.tsx
index e1d76453387..071dfd0dea7 100644
--- a/app/src/molecules/Command/CommandText.tsx
+++ b/app/src/molecules/Command/CommandText.tsx
@@ -52,6 +52,7 @@ interface Props extends StyleProps {
   command: RunTimeCommand
   commandTextData: CommandTextData
   robotType: RobotType
+  as?: React.ComponentProps<typeof StyledText>['as']
   isOnDevice?: boolean
   propagateCenter?: boolean
   propagateTextLimit?: boolean
@@ -63,6 +64,7 @@ export function CommandText(props: Props): JSX.Element | null {
     robotType,
     propagateCenter = false,
     propagateTextLimit = false,
+    as = 'p',
     ...styleProps
   } = props
   const { t } = useTranslation('protocol_command_text')
@@ -81,7 +83,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'dropTipInPlace':
     case 'pickUpTip': {
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           <PipettingCommandText {...{ command, commandTextData, robotType }} />
         </StyledText>
       )
@@ -91,7 +93,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'loadModule':
     case 'loadLiquid': {
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           <LoadCommandText {...{ command, commandTextData, robotType }} />
         </StyledText>
       )
@@ -102,7 +104,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'thermocycler/setTargetLidTemperature':
     case 'heaterShaker/setTargetTemperature': {
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           <TemperatureCommandText command={command} />
         </StyledText>
       )
@@ -135,12 +137,12 @@ export function CommandText(props: Props): JSX.Element | null {
             } ;
           `}
         >
-          <StyledText as="p" marginBottom={SPACING.spacing4} {...styleProps}>
+          <StyledText as={as} marginBottom={SPACING.spacing4} {...styleProps}>
             {t('tc_starting_profile', {
               repetitions: Object.keys(steps).length,
             })}
           </StyledText>
-          <StyledText as="p" marginLeft={SPACING.spacing16}>
+          <StyledText as={as} marginLeft={SPACING.spacing16}>
             <ul>
               {shouldPropagateTextLimit ? (
                 <li
@@ -171,7 +173,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'heaterShaker/setAndWaitForShakeSpeed': {
       const { rpm } = command.params
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('set_and_await_hs_shake', { rpm })}
         </StyledText>
       )
@@ -179,7 +181,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'moveToSlot': {
       const { slotName } = command.params
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('move_to_slot', { slot_name: slotName })}
         </StyledText>
       )
@@ -187,7 +189,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'moveRelative': {
       const { axis, distance } = command.params
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('move_relative', { axis, distance })}
         </StyledText>
       )
@@ -195,7 +197,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'moveToCoordinates': {
       const { coordinates } = command.params
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('move_to_coordinates', coordinates)}
         </StyledText>
       )
@@ -220,7 +222,7 @@ export function CommandText(props: Props): JSX.Element | null {
             )
           : ''
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('move_to_well', {
             well_name: wellName,
             labware: getLabwareName(commandTextData, labwareId),
@@ -231,7 +233,7 @@ export function CommandText(props: Props): JSX.Element | null {
     }
     case 'moveLabware': {
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           <MoveLabwareCommandText
             {...{ command, commandTextData, robotType }}
           />
@@ -245,7 +247,7 @@ export function CommandText(props: Props): JSX.Element | null {
       )?.pipetteName
 
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('configure_for_volume', {
             volume,
             pipette:
@@ -264,7 +266,7 @@ export function CommandText(props: Props): JSX.Element | null {
 
       // TODO (sb, 11/9/23): Add support for other configurations when needed
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('configure_nozzle_layout', {
             amount: configurationParams.style === 'COLUMN' ? '8' : 'all',
             pipette:
@@ -282,7 +284,7 @@ export function CommandText(props: Props): JSX.Element | null {
       )?.pipetteName
 
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('prepare_to_aspirate', {
             pipette:
               pipetteName != null
@@ -300,7 +302,7 @@ export function CommandText(props: Props): JSX.Element | null {
       )
 
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('move_to_addressable_area', {
             addressable_area: addressableAreaDisplayName,
           })}
@@ -314,7 +316,7 @@ export function CommandText(props: Props): JSX.Element | null {
         t
       )
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('move_to_addressable_area_drop_tip', {
             addressable_area: addressableAreaDisplayName,
           })}
@@ -342,7 +344,7 @@ export function CommandText(props: Props): JSX.Element | null {
       const simpleTKey =
         SIMPLE_TRANSLATION_KEY_BY_COMMAND_TYPE[command.commandType]
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {simpleTKey != null ? t(simpleTKey) : null}
         </StyledText>
       )
@@ -350,7 +352,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'waitForDuration': {
       const { seconds, message } = command.params
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {t('wait_for_duration', { seconds, message })}
         </StyledText>
       )
@@ -358,7 +360,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'pause': // legacy pause command
     case 'waitForResume': {
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {command.params?.message && command.params.message !== ''
             ? command.params.message
             : t('wait_for_resume')}
@@ -370,7 +372,7 @@ export function CommandText(props: Props): JSX.Element | null {
       const { message = '' } = command.params
       if ('waitForResume' in command.params) {
         return (
-          <StyledText as="p" {...styleProps}>
+          <StyledText as={as} {...styleProps}>
             {command.params?.message && command.params.message !== ''
               ? command.params.message
               : t('wait_for_resume')}
@@ -378,7 +380,7 @@ export function CommandText(props: Props): JSX.Element | null {
         )
       } else {
         return (
-          <StyledText as="p" {...styleProps}>
+          <StyledText as={as} {...styleProps}>
             {t('wait_for_duration', {
               seconds: command.params.seconds,
               message,
@@ -390,7 +392,7 @@ export function CommandText(props: Props): JSX.Element | null {
     case 'comment': {
       const { message } = command.params
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {message}
         </StyledText>
       )
@@ -402,7 +404,7 @@ export function CommandText(props: Props): JSX.Element | null {
           ? JSON.stringify(legacyCommandText)
           : String(legacyCommandText)
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {legacyCommandText != null
             ? sanitizedCommandText
             : `${command.commandType}: ${JSON.stringify(command.params)}`}
@@ -415,7 +417,7 @@ export function CommandText(props: Props): JSX.Element | null {
         command
       )
       return (
-        <StyledText as="p" {...styleProps}>
+        <StyledText as={as} {...styleProps}>
           {JSON.stringify(command)}
         </StyledText>
       )
diff --git a/app/src/organisms/ErrorRecoveryFlows/shared/StepInfo.tsx b/app/src/organisms/ErrorRecoveryFlows/shared/StepInfo.tsx
index e6a45282d24..5cee456b4ae 100644
--- a/app/src/organisms/ErrorRecoveryFlows/shared/StepInfo.tsx
+++ b/app/src/organisms/ErrorRecoveryFlows/shared/StepInfo.tsx
@@ -47,6 +47,7 @@ export function StepInfo({
           commandTextData={protocolAnalysis}
           robotType={robotType}
           display={DISPLAY_INLINE}
+          as={as}
         />
       ) : null}
     </Flex>