diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index e8ac7a35da..23fe793432 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -532,10 +532,8 @@ export class DatabaseTaskStore implements TaskStore {
   }
 
   async cleanWorkspace({ taskId }: { taskId: string }): Promise<void> {
-    await this.db.transaction(async tx => {
-      await tx('tasks').where({ id: taskId }).update({
-        workspace: null,
-      });
+    await this.db('tasks').where({ id: taskId }).update({
+      workspace: null,
     });
   }
 
@@ -544,13 +542,12 @@ export class DatabaseTaskStore implements TaskStore {
     taskId: string;
   }): Promise<void> {
     if (options.path) {
-      await this.db.transaction(async tx => {
-        await tx<RawDbTaskRow>('tasks')
-          .where({ id: options.taskId })
-          .update({
-            workspace: (await serializeWorkspace(options)).contents,
-          });
-      });
+      const workspace = (await serializeWorkspace(options)).contents;
+      await this.db<RawDbTaskRow>('tasks')
+        .where({ id: options.taskId })
+        .update({
+          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: {