diff --git a/plugins/scaffolder-backend/src/schema/openapi.yaml b/plugins/scaffolder-backend/src/schema/openapi.yaml
index 3b67678df1..b89c270e59 100644
--- a/plugins/scaffolder-backend/src/schema/openapi.yaml
+++ b/plugins/scaffolder-backend/src/schema/openapi.yaml
@@ -359,6 +359,10 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/SerializedTask'
+        totalTasks:
+          type: number
+      required:
+        - tasks
       description: The response shape for the `listTasks` call to the `scaffolder-backend`
     MapStringString:
       type: object
@@ -640,9 +644,7 @@ components:
           properties:
             entity:
               type: object
-              properties: {}
               description: The decorated entity from the Catalog
-              additionalProperties: {}
             ref:
               type: string
               description: An entity ref for the author of the task
@@ -800,12 +802,14 @@ components:
           description: Where the template is stored, so we can resolve relative paths for things like `fetch:template` paths.
         entity:
           type: object
-          description: The Template entity.
           properties:
             metadata:
               # come back to this one - done
               $ref: '#/components/schemas/EntityMeta'
               description: The metadata of the Template.
+          required:
+            - metadata
+          description: The Template entity.
       required:
         - entityRef
       description: |-
diff --git a/plugins/scaffolder-backend/src/schema/openapi/generated/models/ListTasksResponse.model.ts b/plugins/scaffolder-backend/src/schema/openapi/generated/models/ListTasksResponse.model.ts
index 65a3a04bec..a61f35d3e6 100644
--- a/plugins/scaffolder-backend/src/schema/openapi/generated/models/ListTasksResponse.model.ts
+++ b/plugins/scaffolder-backend/src/schema/openapi/generated/models/ListTasksResponse.model.ts
@@ -24,5 +24,6 @@ import { SerializedTask } from '../models/SerializedTask.model';
  * @public
  */
 export interface ListTasksResponse {
-  tasks?: Array<SerializedTask>;
+  tasks: Array<SerializedTask>;
+  totalTasks?: number;
 }
diff --git a/plugins/scaffolder-backend/src/schema/openapi/generated/models/TaskSpecV1beta3User.model.ts b/plugins/scaffolder-backend/src/schema/openapi/generated/models/TaskSpecV1beta3User.model.ts
index 7f36a3f171..a47b103213 100644
--- a/plugins/scaffolder-backend/src/schema/openapi/generated/models/TaskSpecV1beta3User.model.ts
+++ b/plugins/scaffolder-backend/src/schema/openapi/generated/models/TaskSpecV1beta3User.model.ts
@@ -26,7 +26,7 @@ export interface TaskSpecV1beta3User {
   /**
    * The decorated entity from the Catalog
    */
-  entity?: { [key: string]: any };
+  entity?: any;
   /**
    * An entity ref for the author of the task
    */
diff --git a/plugins/scaffolder-backend/src/schema/openapi/generated/models/TemplateInfoEntity.model.ts b/plugins/scaffolder-backend/src/schema/openapi/generated/models/TemplateInfoEntity.model.ts
index b59414f80f..993b995512 100644
--- a/plugins/scaffolder-backend/src/schema/openapi/generated/models/TemplateInfoEntity.model.ts
+++ b/plugins/scaffolder-backend/src/schema/openapi/generated/models/TemplateInfoEntity.model.ts
@@ -24,5 +24,5 @@ import { EntityMeta } from '../models/EntityMeta.model';
  * @public
  */
 export interface TemplateInfoEntity {
-  metadata?: EntityMeta;
+  metadata: EntityMeta;
 }
diff --git a/plugins/scaffolder-backend/src/schema/openapi/generated/router.ts b/plugins/scaffolder-backend/src/schema/openapi/generated/router.ts
index 2bc56e28ad..531561a61b 100644
--- a/plugins/scaffolder-backend/src/schema/openapi/generated/router.ts
+++ b/plugins/scaffolder-backend/src/schema/openapi/generated/router.ts
@@ -464,7 +464,11 @@ export const spec = {
               $ref: '#/components/schemas/SerializedTask',
             },
           },
+          totalTasks: {
+            type: 'number',
+          },
         },
+        required: ['tasks'],
         description:
           'The response shape for the `listTasks` call to the `scaffolder-backend`',
       },
@@ -833,9 +837,7 @@ export const spec = {
             properties: {
               entity: {
                 type: 'object',
-                properties: {},
                 description: 'The decorated entity from the Catalog',
-                additionalProperties: {},
               },
               ref: {
                 type: 'string',
@@ -1014,13 +1016,14 @@ export const spec = {
           },
           entity: {
             type: 'object',
-            description: 'The Template entity.',
             properties: {
               metadata: {
                 $ref: '#/components/schemas/EntityMeta',
                 description: 'The metadata of the Template.',
               },
             },
+            required: ['metadata'],
+            description: 'The Template entity.',
           },
         },
         required: ['entityRef'],
diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ListTasksResponse.model.ts b/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ListTasksResponse.model.ts
index 65a3a04bec..a61f35d3e6 100644
--- a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ListTasksResponse.model.ts
+++ b/plugins/scaffolder-common/client/src/schema/openapi/generated/models/ListTasksResponse.model.ts
@@ -24,5 +24,6 @@ import { SerializedTask } from '../models/SerializedTask.model';
  * @public
  */
 export interface ListTasksResponse {
-  tasks?: Array<SerializedTask>;
+  tasks: Array<SerializedTask>;
+  totalTasks?: number;
 }
diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskSpecV1beta3User.model.ts b/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskSpecV1beta3User.model.ts
index 7f36a3f171..a47b103213 100644
--- a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskSpecV1beta3User.model.ts
+++ b/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TaskSpecV1beta3User.model.ts
@@ -26,7 +26,7 @@ export interface TaskSpecV1beta3User {
   /**
    * The decorated entity from the Catalog
    */
-  entity?: { [key: string]: any };
+  entity?: any;
   /**
    * An entity ref for the author of the task
    */
diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TemplateInfoEntity.model.ts b/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TemplateInfoEntity.model.ts
index b59414f80f..993b995512 100644
--- a/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TemplateInfoEntity.model.ts
+++ b/plugins/scaffolder-common/client/src/schema/openapi/generated/models/TemplateInfoEntity.model.ts
@@ -24,5 +24,5 @@ import { EntityMeta } from '../models/EntityMeta.model';
  * @public
  */
 export interface TemplateInfoEntity {
-  metadata?: EntityMeta;
+  metadata: EntityMeta;
 }