diff --git a/plugins/scaffolder-react/src/next/components/TaskSteps/TaskSteps.tsx b/plugins/scaffolder-react/src/next/components/TaskSteps/TaskSteps.tsx
index d783351eca..b5fffe802f 100644
--- a/plugins/scaffolder-react/src/next/components/TaskSteps/TaskSteps.tsx
+++ b/plugins/scaffolder-react/src/next/components/TaskSteps/TaskSteps.tsx
@@ -59,7 +59,7 @@ export const TaskSteps = (props: TaskStepsProps) => {
           alternativeLabel
           variant="elevation"
         >
-          {props.steps.map((step, index) => {
+          {props.steps.map(step => {
             const isCompleted = step.status === 'completed';
             const isFailed = step.status === 'failed';
             const isActive = step.status === 'processing';
@@ -73,7 +73,7 @@ export const TaskSteps = (props: TaskStepsProps) => {
               };
 
             return (
-              <MuiStep key={index}>
+              <MuiStep key={`${step.id}-${step.startedAt}-${step.endedAt}`}>
                 <MuiStepButton>
                   <MuiStepLabel
                     StepIconProps={stepIconProps}