diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
index 032fea6410..4a09149bab 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
@@ -44,10 +44,11 @@ export class TaskWorker {
   }
 
   async runOneTask(task: Task) {
+    let workspacePath: string | undefined = undefined;
     try {
       const { actionRegistry } = this.options;
 
-      const workspacePath = path.join(
+      workspacePath = path.join(
         this.options.workingDirectory,
         await task.getWorkspaceName(),
       );
@@ -172,6 +173,10 @@ export class TaskWorker {
       await task.complete('failed', {
         error: { name: error.name, message: error.message },
       });
+    } finally {
+      if (workspacePath) {
+        await fs.remove(workspacePath);
+      }
     }
   }
 }