diff --git a/plugins/scaffolder-backend/src/index.ts b/plugins/scaffolder-backend/src/index.ts
index 4c31e9f982..76cda63eef 100644
--- a/plugins/scaffolder-backend/src/index.ts
+++ b/plugins/scaffolder-backend/src/index.ts
@@ -24,10 +24,3 @@ export * from './scaffolder';
 export * from './service/router';
 export * from './lib/catalog';
 export * from './processor';
-export { TaskAgent } from './scaffolder/tasks';
-export type {
-  TaskBroker,
-  DispatchResult,
-  TaskStore,
-  Task,
-} from './scaffolder/tasks/types';
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
index d99cbcda6e..941c27ef0e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
@@ -30,4 +30,8 @@ export type {
   TaskSpecV1beta3,
   Status,
   TaskEventType,
+  TaskBroker,
+  Task,
+  TaskStore,
+  DispatchResult,
 } from './types';
diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts
index c0fdcb2ef7..71b6d27b5e 100644
--- a/plugins/scaffolder-backend/src/service/router.test.ts
+++ b/plugins/scaffolder-backend/src/service/router.test.ts
@@ -40,7 +40,7 @@ import { ConfigReader } from '@backstage/config';
 import express from 'express';
 import request from 'supertest';
 import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
-import { createRouter } from './router';
+import { createRouter } from '../index';
 
 const createCatalogClient = (templates: any[] = []) =>
   ({