diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index f26c242f97..b6a67b7c55 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -396,7 +396,9 @@ export class DatabaseTaskStore implements TaskStore {
   // (undocumented)
   heartbeatTask(taskId: string): Promise<void>;
   // (undocumented)
-  list(options: { createdBy?: string }): Promise<SerializedTask[]>;
+  list(options: { createdBy?: string }): Promise<{
+    tasks: SerializedTask[];
+  }>;
   // (undocumented)
   listEvents({ taskId, after }: TaskStoreListEventsOptions): Promise<{
     events: SerializedTaskEvent[];
@@ -522,7 +524,9 @@ export interface TaskBroker {
   // (undocumented)
   get(taskId: string): Promise<SerializedTask>;
   // (undocumented)
-  list(options?: { createdBy?: string }): Promise<SerializedTask[]>;
+  list?(options?: { createdBy?: string }): Promise<{
+    tasks: SerializedTask[];
+  }>;
   // (undocumented)
   vacuumTasks(options: { timeoutS: number }): Promise<void>;
 }
@@ -623,7 +627,9 @@ export interface TaskStore {
   // (undocumented)
   heartbeatTask(taskId: string): Promise<void>;
   // (undocumented)
-  list(options: { createdBy?: string }): Promise<SerializedTask[]>;
+  list?(options: { createdBy?: string }): Promise<{
+    tasks: SerializedTask[];
+  }>;
   // (undocumented)
   listEvents({ taskId, after }: TaskStoreListEventsOptions): Promise<{
     events: SerializedTaskEvent[];
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 6fbcd78df1..9ffca426ac 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -243,10 +243,12 @@ export interface ScaffolderApi {
   listActions(): Promise<ListActionsResponse>;
   // (undocumented)
   listTasks?({
-    createdBy,
+    filterByOwnership,
   }: {
-    createdBy: TasksOwnerFilterKind;
-  }): Promise<ScaffolderTask[]>;
+    filterByOwnership: 'owned' | 'all';
+  }): Promise<{
+    tasks: ScaffolderTask[];
+  }>;
   scaffold(
     options: ScaffolderScaffoldOptions,
   ): Promise<ScaffolderScaffoldResponse>;
@@ -262,7 +264,7 @@ export class ScaffolderClient implements ScaffolderApi {
   constructor(options: {
     discoveryApi: DiscoveryApi;
     fetchApi: FetchApi;
-    identityApi: IdentityApi;
+    identityApi?: IdentityApi;
     scmIntegrationsApi: ScmIntegrationRegistry;
     useLongPollingLogs?: boolean;
   });
@@ -281,9 +283,9 @@ export class ScaffolderClient implements ScaffolderApi {
   // (undocumented)
   listActions(): Promise<ListActionsResponse>;
   // (undocumented)
-  listTasks(options: {
-    createdBy: TasksOwnerFilterKind;
-  }): Promise<ScaffolderTask[]>;
+  listTasks(options: { filterByOwnership: 'owned' | 'all' }): Promise<{
+    tasks: ScaffolderTask[];
+  }>;
   scaffold(
     options: ScaffolderScaffoldOptions,
   ): Promise<ScaffolderScaffoldResponse>;
@@ -424,9 +426,6 @@ export type TaskPageProps = {
   loadingText?: string;
 };
 
-// @public
-export type TasksOwnerFilterKind = 'owned' | 'all';
-
 // @alpha (undocumented)
 export type TemplateGroupFilter = {
   title?: React_2.ReactNode;