diff --git a/.changeset/seven-rings-smoke.md b/.changeset/seven-rings-smoke.md
new file mode 100644
index 0000000000..5183ccb3ac
--- /dev/null
+++ b/.changeset/seven-rings-smoke.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+- Moved the `JSONSchema` type from `@backstage/catalog-model` to `JSONSchema7`.
+- Renamed and prefixed some types ready for exporting.
diff --git a/.changeset/slimy-drinks-tell.md b/.changeset/slimy-drinks-tell.md
new file mode 100644
index 0000000000..f83953ccf6
--- /dev/null
+++ b/.changeset/slimy-drinks-tell.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-scaffolder': minor
+---
+
+- **BREAKING** - `scaffolderApi.scaffold()` now takes one `options` argument instead of 3, the existing arguments should just be wrapped up in one object instead.
+- **BREAKING** - `scaffolderApi.scaffold()` now returns an object instead of a single string for the job ID. It's now `{ taskId: string }`
+- **BREAKING** - `scaffolderApi.getIntegrationsList` now returns an object `{ integrations: { type: string, title: string, host: string }[] }` instead of just an array.
diff --git a/plugins/scaffolder/src/plugin.ts b/plugins/scaffolder/src/plugin.ts
index c84d2bb73c..ccf8d2ee34 100644
--- a/plugins/scaffolder/src/plugin.ts
+++ b/plugins/scaffolder/src/plugin.ts
@@ -64,12 +64,11 @@ export const scaffolderPlugin = createPlugin({
   },
 });
 
-export const EntityPickerExtension = createScaffolderFieldExtension({
-  component: EntityPicker,
-  name: 'EntityPicker',
-});
 export const EntityPickerFieldExtension = scaffolderPlugin.provide(
-  EntityPickerExtension,
+  createScaffolderFieldExtension({
+    component: EntityPicker,
+    name: 'EntityPicker',
+  }),
 );
 
 export const EntityNamePickerFieldExtension = scaffolderPlugin.provide(