diff --git a/.changeset/five-tigers-share.md b/.changeset/five-tigers-share.md
new file mode 100644
index 0000000000..507614c8b8
--- /dev/null
+++ b/.changeset/five-tigers-share.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Found the issue during testing the clean up of the workspace for the database implementation.
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index ba675b2cc7..23fe793432 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -532,8 +532,8 @@ export class DatabaseTaskStore implements TaskStore {
   }
 
   async cleanWorkspace({ taskId }: { taskId: string }): Promise<void> {
-    await this.db<RawDbTaskRow>('tasks').where({ id: taskId }).update({
-      workspace: undefined,
+    await this.db('tasks').where({ id: taskId }).update({
+      workspace: null,
     });
   }
 
@@ -542,10 +542,11 @@ export class DatabaseTaskStore implements TaskStore {
     taskId: string;
   }): Promise<void> {
     if (options.path) {
+      const workspace = (await serializeWorkspace(options)).contents;
       await this.db<RawDbTaskRow>('tasks')
         .where({ id: options.taskId })
         .update({
-          workspace: (await serializeWorkspace(options)).contents,
+          workspace,
         });
     }
   }
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseWorkspaceProvider.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseWorkspaceProvider.ts
index 69f90b3d7e..b3c3c24975 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseWorkspaceProvider.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseWorkspaceProvider.ts
@@ -29,7 +29,7 @@ export class DatabaseWorkspaceProvider implements WorkspaceProvider {
     path: string;
     taskId: string;
   }): Promise<void> {
-    this.storage.serializeWorkspace?.(options);
+    await this.storage.serializeWorkspace?.(options);
   }
 
   public async rehydrateWorkspace(options: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index 3d7d8b8b1d..09fc162ea6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -509,11 +509,11 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
 
       const output = this.render(task.spec.output, context, renderTemplate);
       await taskTrack.markSuccessful();
+      await task.cleanWorkspace?.();
 
       return { output };
     } finally {
       if (workspacePath) {
-        await task.cleanWorkspace?.();
         await fs.remove(workspacePath);
       }
     }