diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index dcbfcc0a34..ad9d85cb2d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -493,6 +493,7 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
 
       const taskTrack = await this.tracker.taskStart(task);
       await fs.ensureDir(workspacePath);
+
       const context: TemplateContext = {
         parameters: task.spec.parameters,
         steps: {},
diff --git a/plugins/scaffolder-node/src/actions/types.ts b/plugins/scaffolder-node/src/actions/types.ts
index 51addda05c..171d3d82db 100644
--- a/plugins/scaffolder-node/src/actions/types.ts
+++ b/plugins/scaffolder-node/src/actions/types.ts
@@ -58,9 +58,9 @@ export type ActionContext<
   getInitiatorCredentials(): Promise<BackstageCredentials>;
 
   /**
-   * Optional task information
+   * Task information
    */
-  task?: {
+  task: {
     id: string;
   };