diff --git a/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.ts b/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.ts
index cbc2439563..c62c0737d8 100644
--- a/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.ts
+++ b/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.ts
@@ -27,7 +27,7 @@ import { ConflictError, InputError, NotFoundError } from '@backstage/errors';
 import { Logger } from 'winston';
 import { TokenIssuer, TokenParams } from '../../identity/types';
 import { AuthResolverContext } from '../../providers';
-import { AuthResolverCatalogUserQuery } from '../../providers/types';
+import { AuthResolverCatalogUserQuery } from '../../providers';
 import { CatalogIdentityClient } from '../catalog';
 
 /**
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts b/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
index ff15300b4a..666f7a0d50 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
@@ -18,8 +18,9 @@ import { Logger } from 'winston';
 import { Writable } from 'stream';
 import { JsonValue, JsonObject } from '@backstage/types';
 import { Schema } from 'jsonschema';
-import { TaskSecrets } from '../tasks/types';
+import { TaskSecrets } from '../tasks';
 import { TemplateInfo } from '@backstage/plugin-scaffolder-common';
+import { UserEntity } from '@backstage/catalog-model';
 
 /**
  * ActionContext is passed into scaffolder actions.
@@ -45,6 +46,20 @@ export type ActionContext<Input extends JsonObject> = {
    * This will only ever be true if the actions as marked as supporting dry-runs.
    */
   isDryRun?: boolean;
+
+  /**
+   * The user which triggered the action.
+   */
+  user?: {
+    /**
+     * The decorated entity from the Catalog
+     */
+    entity?: UserEntity;
+    /**
+     * An entity ref for the author of the task
+     */
+    ref?: string;
+  };
 };
 
 /** @public */
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index 97e37fd3eb..6e35f7c69b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -300,6 +300,7 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
               stepOutput[name] = value;
             },
             templateInfo: task.spec.templateInfo,
+            user: task.spec.user,
           });
 
           // Remove all temporary directories that were created when executing the action