diff --git a/packages/app/src/components/SecurityTab/SecurityTab.tsx b/packages/app/src/components/SecurityTab/SecurityTab.tsx
index b9c1eccd02..f2768a2a0e 100644
--- a/packages/app/src/components/SecurityTab/SecurityTab.tsx
+++ b/packages/app/src/components/SecurityTab/SecurityTab.tsx
@@ -15,8 +15,8 @@
  */
 
 import React from 'react';
-import { EmbeddedScaffolderWorkflow } from '../EmbeddedScaffolderWorkflow/EmbeddedScaffolderWorkflow';
 import { Box } from '@material-ui/core';
+import { EmbeddedScaffolderWorkflow } from '@backstage/plugin-scaffolder';
 
 const ReviewWrapper = () => {
   return (
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index 6ae4e280cf..ef6764d853 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -48,6 +48,7 @@ export { NextScaffolderPage } from './plugin';
 export {
   EmbeddableWorkflow,
   useGetCustomFields,
+  EmbeddedScaffolderWorkflow,
   type WorkflowProps,
   type ReviewStateProps,
   type ParsedTemplateSchema,
diff --git a/packages/app/src/components/EmbeddedScaffolderWorkflow/EmbeddedScaffolderWorkflow.tsx b/plugins/scaffolder/src/next/EmbeddedScaffolderWorkflow/EmbeddedScaffolderWorkflow.tsx
similarity index 94%
rename from packages/app/src/components/EmbeddedScaffolderWorkflow/EmbeddedScaffolderWorkflow.tsx
rename to plugins/scaffolder/src/next/EmbeddedScaffolderWorkflow/EmbeddedScaffolderWorkflow.tsx
index 3587edd12e..1daf3b4aab 100644
--- a/packages/app/src/components/EmbeddedScaffolderWorkflow/EmbeddedScaffolderWorkflow.tsx
+++ b/plugins/scaffolder/src/next/EmbeddedScaffolderWorkflow/EmbeddedScaffolderWorkflow.tsx
@@ -16,14 +16,11 @@
 
 import React, { useState, useCallback } from 'react';
 import type { ReactNode } from 'react';
-import {
-  EmbeddableWorkflow,
-  useGetCustomFields,
-  WorkflowProps,
-} from '@backstage/plugin-scaffolder';
-import { Box, Button } from '@material-ui/core';
 import type { JsonValue } from '@backstage/types';
-import type { FormProps } from '@backstage/plugin-scaffolder-react';
+import { EmbeddableWorkflow, WorkflowProps } from '../Workflow/Workflow';
+import { FormProps } from '@backstage/plugin-scaffolder-react';
+import { useGetCustomFields } from '../Router';
+import { Box, Button } from '@material-ui/core';
 
 type EmbeddedWorkflowProps = Omit<
   WorkflowProps,
diff --git a/plugins/scaffolder/src/next/EmbeddedScaffolderWorkflow/index.ts b/plugins/scaffolder/src/next/EmbeddedScaffolderWorkflow/index.ts
new file mode 100644
index 0000000000..06c230cbb2
--- /dev/null
+++ b/plugins/scaffolder/src/next/EmbeddedScaffolderWorkflow/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { EmbeddedScaffolderWorkflow } from './EmbeddedScaffolderWorkflow';