diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts b/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
index b2227426b8..1aa4f81bdd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
@@ -18,8 +18,11 @@ import { Logger } from 'winston';
 import { Writable } from 'stream';
 import { JsonValue, JsonObject } from '@backstage/types';
 import { Schema } from 'jsonschema';
-import { TaskSecrets, TemplateMetadata } from '../tasks/types';
-import { TemplateInfo } from '@backstage/plugin-scaffolder-common';
+import { TaskSecrets } from '../tasks/types';
+import {
+  TemplateInfo,
+  TemplateMetadata,
+} from '@backstage/plugin-scaffolder-common';
 
 export type ActionContext<Input extends JsonObject> = {
   /**
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.test.ts
index 9f4135b3d1..dcad1fc5d0 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.test.ts
@@ -21,8 +21,9 @@ import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '@backstage/backend-common';
 import { HandlebarsWorkflowRunner } from './HandlebarsWorkflowRunner';
-import { TaskContext, TaskSpec } from './types';
+import { TaskContext } from './types';
 import { RepoSpec } from '../actions/builtin/publish/util';
+import { TaskSpec } from '@backstage/plugin-scaffolder-common';
 
 describe('LegacyWorkflowRunner', () => {
   let runner: HandlebarsWorkflowRunner;
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.ts
index e525e6bd14..c82da51ead 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.ts
@@ -13,13 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  TaskContext,
-  WorkflowRunner,
-  WorkflowResponse,
-  TaskSpecV1beta2,
-  TaskSpec,
-} from './types';
+import { TaskContext, WorkflowRunner, WorkflowResponse } from './types';
 import * as Handlebars from 'handlebars';
 import { TemplateActionRegistry } from '..';
 import { ScmIntegrations } from '@backstage/integration';
@@ -33,6 +27,7 @@ import fs from 'fs-extra';
 import { validate as validateJsonSchema } from 'jsonschema';
 import { JsonObject, JsonValue } from '@backstage/types';
 import { InputError } from '@backstage/errors';
+import { TaskSpec, TaskSpecV1beta2 } from '@backstage/plugin-scaffolder-common';
 
 type Options = {
   workingDirectory: string;
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
index b66c69ee17..1b635b695c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
@@ -22,7 +22,8 @@ import { NunjucksWorkflowRunner } from './NunjucksWorkflowRunner';
 import { TemplateActionRegistry } from '../actions';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
-import { TaskContext, TaskSpec, TaskSecrets } from './types';
+import { TaskContext, TaskSecrets } from './types';
+import { TaskSpec } from '@backstage/plugin-scaffolder-common';
 
 const realFiles = Object.fromEntries(
   [
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index b1177ca49c..fb9da56c22 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -15,14 +15,7 @@
  */
 
 import { ScmIntegrations } from '@backstage/integration';
-import {
-  TaskContext,
-  TaskSpec,
-  TaskSpecV1beta3,
-  TaskStep,
-  WorkflowResponse,
-  WorkflowRunner,
-} from './types';
+import { TaskContext, WorkflowResponse, WorkflowRunner } from './types';
 import * as winston from 'winston';
 import fs from 'fs-extra';
 import path from 'path';
@@ -39,6 +32,11 @@ import {
   SecureTemplater,
   SecureTemplateRenderer,
 } from '../../lib/templating/SecureTemplater';
+import {
+  TaskSpec,
+  TaskSpecV1beta3,
+  TaskStep,
+} from '@backstage/plugin-scaffolder-common';
 
 type NunjucksWorkflowRunnerOptions = {
   workingDirectory: string;
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts
index daf444cdd8..639d61d4fd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts
@@ -16,9 +16,10 @@
 
 import { getVoidLogger, DatabaseManager } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
+import { TaskSpec } from '@backstage/plugin-scaffolder-common';
 import { DatabaseTaskStore } from './DatabaseTaskStore';
 import { StorageTaskBroker, TaskManager } from './StorageTaskBroker';
-import { TaskSecrets, TaskSpec, SerializedTaskEvent } from './types';
+import { TaskSecrets, SerializedTaskEvent } from './types';
 
 async function createStore(): Promise<DatabaseTaskStore> {
   const manager = DatabaseManager.fromConfig(
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
index 898516ef3b..71653f503b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
@@ -15,12 +15,12 @@
  */
 import { JsonObject } from '@backstage/types';
 import { assertError } from '@backstage/errors';
+import { TaskSpec } from '@backstage/plugin-scaffolder-common';
 import { Logger } from 'winston';
 import {
   TaskCompletionState,
   TaskContext,
   TaskSecrets,
-  TaskSpec,
   TaskStore,
   TaskBroker,
   SerializedTaskEvent,
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
index aa1640dae2..a2bf5f0e1c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
@@ -20,15 +20,12 @@ export { TaskWorker } from './TaskWorker';
 export type { CreateWorkerOptions } from './TaskWorker';
 export type {
   TaskSecrets,
-  TaskSpec,
   TaskCompletionState,
   CompletedTaskState,
   TaskStoreEmitOptions,
   TaskStoreListEventsOptions,
   SerializedTask,
   SerializedTaskEvent,
-  TaskSpecV1beta2,
-  TaskSpecV1beta3,
   Status,
   TaskStatus,
   TaskEventType,
@@ -40,5 +37,4 @@ export type {
   TaskBrokerDispatchOptions,
   TaskStoreCreateTaskOptions,
   TaskStoreCreateTaskResult,
-  TemplateMetadata,
 } from './types';
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
index ddcd3e7b4e..a28ccce239 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
@@ -15,21 +15,7 @@
  */
 
 import { JsonValue, JsonObject } from '@backstage/types';
-import {
-  TaskSpec,
-  TaskStep,
-  TemplateMetadata,
-  TaskSpecV1beta2,
-  TaskSpecV1beta3,
-} from '@backstage/plugin-scaffolder-common';
-
-export type {
-  TaskSpec,
-  TaskStep,
-  TemplateMetadata,
-  TaskSpecV1beta2,
-  TaskSpecV1beta3,
-};
+import { TaskSpec } from '@backstage/plugin-scaffolder-common';
 
 /**
  * The status of each step of the Task
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 371fc47dc2..50a1e4bba0 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -29,6 +29,7 @@ import {
   TemplateEntityV1beta2,
   TemplateEntityV1beta3,
   TaskSpecV1beta3,
+  TaskSpec,
   TaskSpecV1beta2,
 } from '@backstage/plugin-scaffolder-common';
 import express from 'express';
@@ -40,7 +41,6 @@ import {
   createBuiltinActions,
   DatabaseTaskStore,
   TaskBroker,
-  TaskSpec,
   TaskWorker,
   TemplateAction,
   TemplateActionRegistry,