diff --git a/plugins/scaffolder-node/report-alpha.api.md b/plugins/scaffolder-node/report-alpha.api.md
index fa9e022bb4..151af9ea37 100644
--- a/plugins/scaffolder-node/report-alpha.api.md
+++ b/plugins/scaffolder-node/report-alpha.api.md
@@ -91,12 +91,12 @@ export type CreatedTemplateGlobalValue<T extends JsonValue = JsonValue> = {
 // @alpha
 export const createTemplateFilter: <
   TSchema extends TemplateFilterSchema<any, any> | undefined,
-  TFunctionSchema extends TSchema extends TemplateFilterSchema<any, any>
+  TFilterSchema extends TSchema extends TemplateFilterSchema<any, any>
     ? z.infer<ReturnType<TSchema>>
     : (arg: JsonValue, ...rest: JsonValue[]) => JsonValue | undefined,
 >(
-  filter: CreatedTemplateFilter<TSchema, TFunctionSchema>,
-) => CreatedTemplateFilter<unknown, unknown>;
+  filter: CreatedTemplateFilter<TSchema, TFilterSchema>,
+) => CreatedTemplateFilter<TSchema, TFilterSchema>;
 
 // @alpha
 export const createTemplateGlobalFunction: <
@@ -106,7 +106,7 @@ export const createTemplateGlobalFunction: <
     : (...args: JsonValue[]) => JsonValue | undefined,
 >(
   fn: CreatedTemplateGlobalFunction<TSchema, TFilterSchema>,
-) => CreatedTemplateGlobalFunction<any, any>;
+) => CreatedTemplateGlobalFunction<TSchema, TFilterSchema>;
 
 // @alpha
 export const createTemplateGlobalValue: (
@@ -156,7 +156,9 @@ export const scaffolderTaskBrokerExtensionPoint: ExtensionPoint<ScaffolderTaskBr
 export interface ScaffolderTemplatingExtensionPoint {
   // (undocumented)
   addTemplateFilters(
-    filters: Record<string, TemplateFilter_2> | CreatedTemplateFilter[],
+    filters:
+      | Record<string, TemplateFilter_2>
+      | CreatedTemplateFilter<unknown, unknown>[],
   ): void;
   // (undocumented)
   addTemplateGlobals(
diff --git a/plugins/scaffolder-node/src/alpha/filters/createTemplateFilter.ts b/plugins/scaffolder-node/src/alpha/filters/createTemplateFilter.ts
index 1f4bac4ab7..219884b704 100644
--- a/plugins/scaffolder-node/src/alpha/filters/createTemplateFilter.ts
+++ b/plugins/scaffolder-node/src/alpha/filters/createTemplateFilter.ts
@@ -24,9 +24,9 @@ import { z } from 'zod';
  */
 export const createTemplateFilter = <
   TSchema extends TemplateFilterSchema<any, any> | undefined,
-  TFunctionSchema extends TSchema extends TemplateFilterSchema<any, any>
+  TFilterSchema extends TSchema extends TemplateFilterSchema<any, any>
     ? z.infer<ReturnType<TSchema>>
     : (arg: JsonValue, ...rest: JsonValue[]) => JsonValue | undefined,
 >(
-  filter: CreatedTemplateFilter<TSchema, TFunctionSchema>,
-): CreatedTemplateFilter<unknown, unknown> => filter;
+  filter: CreatedTemplateFilter<TSchema, TFilterSchema>,
+): CreatedTemplateFilter<TSchema, TFilterSchema> => filter;
diff --git a/plugins/scaffolder-node/src/alpha/globals/createTemplateGlobal.ts b/plugins/scaffolder-node/src/alpha/globals/createTemplateGlobal.ts
index 1f9e090d7f..2361a50964 100644
--- a/plugins/scaffolder-node/src/alpha/globals/createTemplateGlobal.ts
+++ b/plugins/scaffolder-node/src/alpha/globals/createTemplateGlobal.ts
@@ -45,4 +45,4 @@ export const createTemplateGlobalFunction = <
     : (...args: JsonValue[]) => JsonValue | undefined,
 >(
   fn: CreatedTemplateGlobalFunction<TSchema, TFilterSchema>,
-): CreatedTemplateGlobalFunction<any, any> => fn;
+): CreatedTemplateGlobalFunction<TSchema, TFilterSchema> => fn;
diff --git a/plugins/scaffolder-node/src/alpha/index.ts b/plugins/scaffolder-node/src/alpha/index.ts
index d97aa54557..1fd5abee18 100644
--- a/plugins/scaffolder-node/src/alpha/index.ts
+++ b/plugins/scaffolder-node/src/alpha/index.ts
@@ -73,7 +73,9 @@ export const scaffolderTaskBrokerExtensionPoint =
  */
 export interface ScaffolderTemplatingExtensionPoint {
   addTemplateFilters(
-    filters: Record<string, TemplateFilter> | CreatedTemplateFilter[],
+    filters:
+      | Record<string, TemplateFilter>
+      | CreatedTemplateFilter<unknown, unknown>[],
   ): void;
 
   addTemplateGlobals(