diff --git a/.changeset/cyan-vans-study.md b/.changeset/cyan-vans-study.md
new file mode 100644
index 0000000000..a69b95fd85
--- /dev/null
+++ b/.changeset/cyan-vans-study.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Include step name and step id to checkpoint key
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
index aece424f5f..8bce6fba17 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
@@ -601,11 +601,11 @@ describe('NunjucksWorkflowRunner', () => {
           return Promise.resolve({
             state: {
               checkpoints: {
-                ['v1.task.checkpoint.key1']: {
+                ['v1.task.checkpoint.name.test.key1']: {
                   status: 'success',
                   value: 'initial',
                 },
-                ['v1.task.checkpoint.key2']: {
+                ['v1.task.checkpoint.name.test2.key2']: {
                   status: 'failed',
                   reason: 'fatal error',
                 },
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index 09fc162ea6..cfdd34365d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -375,7 +375,7 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
             keySuffix: string,
             fn: () => Promise<U>,
           ) {
-            const key = `v1.task.checkpoint.${keySuffix}`;
+            const key = `v1.task.checkpoint.${step.name}.${step.id}.${keySuffix}`;
             try {
               let prevValue: U | undefined;
               if (prevTaskState) {