diff --git a/.changeset/rich-carrots-relax.md b/.changeset/rich-carrots-relax.md
new file mode 100644
index 0000000000..9f7c822883
--- /dev/null
+++ b/.changeset/rich-carrots-relax.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-circleci': patch
+---
+
+Switch to using `LogViewer` component from `@backstage/core-components` to display action output.
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 9d94d61dcd..dfcf7b61e1 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -44,7 +44,6 @@
"humanize-duration": "^3.27.0",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
- "react-lazylog": "^4.5.2",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
@@ -63,7 +62,6 @@
"@types/humanize-duration": "^3.25.1",
"@types/jest": "^26.0.7",
"@types/node": "^14.14.32",
- "@types/react-lazylog": "^4.5.0",
"cross-fetch": "^3.0.6",
"msw": "^0.35.0"
},
diff --git a/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx b/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx
index a4c2af241f..4a4a8a45f2 100644
--- a/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx
+++ b/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { Progress } from '@backstage/core-components';
+import { LogViewer } from '@backstage/core-components';
import {
Accordion,
AccordionDetails,
@@ -24,10 +24,9 @@ import {
import { makeStyles } from '@material-ui/core/styles';
import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
import { BuildStepAction } from 'circleci-api';
-import React, { Suspense, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
import { durationHumanized } from '../../../../util';
-const LazyLog = React.lazy(() => import('react-lazylog/build/LazyLog'));
const useStyles = makeStyles({
accordionDetails: {
padding: 0,
@@ -85,11 +84,9 @@ export const ActionOutput = ({
{messages.length === 0 ? (
'Nothing here...'
) : (
-