diff --git a/app-config.yaml b/app-config.yaml
index adf479cd0c..c53a6475f4 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -297,9 +297,6 @@ catalog:
       target: ../../plugins/scaffolder-backend/sample-templates/all-templates.yaml
       rules:
         - allow: [Template]
-    # Backstage end-to-end tests of TechDocs
-    - type: file
-      target: ../../cypress/e2e-fixture.catalog.info.yaml
 scaffolder:
   # Use to customize default commit author info used when new components are created
   # defaultAuthor:
diff --git a/plugins/scaffolder-react/alpha-api-report.md b/plugins/scaffolder-react/alpha-api-report.md
index 95bea735ca..615b54df84 100644
--- a/plugins/scaffolder-react/alpha-api-report.md
+++ b/plugins/scaffolder-react/alpha-api-report.md
@@ -293,16 +293,7 @@ export interface TemplateGroupsProps {
 // @alpha
 export const useFilteredSchemaProperties: (
   manifest: TemplateParameterSchema | undefined,
-) => {
-  steps: {
-    title: string;
-    description?: string | undefined;
-    schema: JsonObject;
-  }[];
-  title: string;
-  description?: string | undefined;
-  presentation?: TemplatePresentationV1beta3 | undefined;
-} | null;
+) => TemplateParameterSchema | undefined;
 
 // @alpha
 export const useFormDataFromQuery: (
@@ -331,6 +322,9 @@ export type WorkflowProps = {
   description?: string;
   namespace: string;
   templateName: string;
+  components?: {
+    ReviewStepComponent?: React_2.ComponentType<ReviewStepProps>;
+  };
   onError(error: Error | undefined): JSX.Element | null;
 } & Pick<
   StepperProps,
diff --git a/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx
index a838b5c5ab..c02f3c2757 100644
--- a/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx
+++ b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx
@@ -27,7 +27,9 @@ import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 import { useTemplateParameterSchema } from '../../hooks/useTemplateParameterSchema';
 import { Stepper, type StepperProps } from '../Stepper/Stepper';
 import { SecretsContextProvider } from '../../../secrets/SecretsContext';
+
 import { useFilteredSchemaProperties } from '../../hooks/useFilteredSchemaProperties';
+import { ReviewStepProps } from '@backstage/plugin-scaffolder-react';
 
 const useStyles = makeStyles<BackstageTheme>(() => ({
   markdown: {
@@ -49,6 +51,9 @@ export type WorkflowProps = {
   description?: string;
   namespace: string;
   templateName: string;
+  components?: {
+    ReviewStepComponent?: React.ComponentType<ReviewStepProps>;
+  };
   onError(error: Error | undefined): JSX.Element | null;
 } & Pick<
   StepperProps,
diff --git a/plugins/scaffolder-react/src/next/hooks/useFilteredSchemaProperties.ts b/plugins/scaffolder-react/src/next/hooks/useFilteredSchemaProperties.ts
index 9c351348dc..be6f581f87 100644
--- a/plugins/scaffolder-react/src/next/hooks/useFilteredSchemaProperties.ts
+++ b/plugins/scaffolder-react/src/next/hooks/useFilteredSchemaProperties.ts
@@ -24,12 +24,12 @@ import { TemplateParameterSchema } from '@backstage/plugin-scaffolder-react';
 
 export const useFilteredSchemaProperties = (
   manifest: TemplateParameterSchema | undefined,
-) => {
+): TemplateParameterSchema | undefined => {
   const featureFlagKey = 'backstage:featureFlag';
   const featureFlagApi = useApi(featureFlagsApiRef);
 
   if (!manifest) {
-    return null;
+    return undefined;
   }
 
   const filteredSteps = manifest?.steps