diff --git a/.changeset/thick-forks-prove.md b/.changeset/thick-forks-prove.md
new file mode 100644
index 0000000000..5025852e79
--- /dev/null
+++ b/.changeset/thick-forks-prove.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-scaffolder-react': minor
+'@backstage/plugin-scaffolder': minor
+---
+
+Move `CategoryPicker` from `scaffolder` into `scaffolder-react`
+Move `ContextMenu` into `scaffolder-react` and rename it to `ScaffolderPageContextMenu`
diff --git a/plugins/scaffolder-react/alpha-api-report.md b/plugins/scaffolder-react/alpha-api-report.md
index 8d3b593816..6eeb80d927 100644
--- a/plugins/scaffolder-react/alpha-api-report.md
+++ b/plugins/scaffolder-react/alpha-api-report.md
@@ -5,6 +5,7 @@
 ```ts
 /// <reference types="react" />
 
+import { AnyParams } from '@backstage/core-plugin-api';
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { ComponentType } from 'react';
 import { CustomFieldExtensionSchema } from '@backstage/plugin-scaffolder-react';
@@ -22,6 +23,7 @@ import { PropsWithChildren } from 'react';
 import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { RJSFSchema } from '@rjsf/utils';
+import { RouteFunc } from '@backstage/core-plugin-api';
 import { ScaffolderStep } from '@backstage/plugin-scaffolder-react';
 import { ScaffolderTaskOutput } from '@backstage/plugin-scaffolder-react';
 import { SetStateAction } from 'react';
@@ -132,6 +134,18 @@ export type ReviewStateProps = {
   formState: JsonObject;
 };
 
+// @alpha (undocumented)
+export function ScaffolderPageContextMenu(
+  props: ScaffolderPageContextMenuProps,
+): JSX.Element | null;
+
+// @alpha (undocumented)
+export type ScaffolderPageContextMenuProps = {
+  editor?: RouteFunc<AnyParams>;
+  actions?: RouteFunc<AnyParams>;
+  tasks?: RouteFunc<AnyParams>;
+};
+
 // @alpha
 export const Stepper: (stepperProps: StepperProps) => JSX.Element;
 
diff --git a/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx b/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
index 0194137521..0e5bc3b6a9 100644
--- a/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
+++ b/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
@@ -36,12 +36,18 @@ const useStyles = makeStyles((theme: BackstageTheme) => ({
   },
 }));
 
+/**
+ * @alpha
+ */
 export type ScaffolderPageContextMenuProps = {
   editor?: RouteFunc<AnyParams>;
   actions?: RouteFunc<AnyParams>;
   tasks?: RouteFunc<AnyParams>;
 };
 
+/**
+ * @alpha
+ */
 export function ScaffolderPageContextMenu(
   props: ScaffolderPageContextMenuProps,
 ) {