diff --git a/.changeset/selfish-phones-smoke.md b/.changeset/selfish-phones-smoke.md
new file mode 100644
index 0000000000..a9583cff94
--- /dev/null
+++ b/.changeset/selfish-phones-smoke.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Added a new prop to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.