diff --git a/.changeset/heavy-colts-wash.md b/.changeset/heavy-colts-wash.md
new file mode 100644
index 0000000000..c22cb70dbf
--- /dev/null
+++ b/.changeset/heavy-colts-wash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-common': patch
+---
+
+Export `typeguard` for `isTemplateEntityV1beta3`
diff --git a/.changeset/weak-turtles-arrive.md b/.changeset/weak-turtles-arrive.md
new file mode 100644
index 0000000000..3bb56909f9
--- /dev/null
+++ b/.changeset/weak-turtles-arrive.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': minor
+---
+
+`scaffolder/next`: Export the `TemplateGroupFilter` and `TemplateGroups` and make an extensible component