diff --git a/plugins/scaffolder/src/components/fields/RepoBranchPicker/BitbucketRepoBranchPicker.tsx b/plugins/scaffolder/src/components/fields/RepoBranchPicker/BitbucketRepoBranchPicker.tsx
index 3af7eb7e2c..23e8f01617 100644
--- a/plugins/scaffolder/src/components/fields/RepoBranchPicker/BitbucketRepoBranchPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoBranchPicker/BitbucketRepoBranchPicker.tsx
@@ -24,6 +24,13 @@ import { useApi } from '@backstage/core-plugin-api';
 import { RepoBranchPickerState } from './types';
 import FormHelperText from '@material-ui/core/FormHelperText';
 
+/**
+ * The underlying component that is rendered in the form for the `BitbucketRepoBranchPicker`
+ * field extension.
+ *
+ * @public
+ *
+ */
 export const BitbucketRepoBranchPicker = ({
   onChange,
   state,
diff --git a/plugins/scaffolder/src/components/fields/RepoBranchPicker/schema.ts b/plugins/scaffolder/src/components/fields/RepoBranchPicker/schema.ts
index 12ed07fd80..6ee67bd1c7 100644
--- a/plugins/scaffolder/src/components/fields/RepoBranchPicker/schema.ts
+++ b/plugins/scaffolder/src/components/fields/RepoBranchPicker/schema.ts
@@ -77,4 +77,7 @@ export type RepoBranchPickerUiOptions =
 
 export type RepoBranchPickerProps = typeof RepoBranchPickerFieldSchema.type;
 
+// NOTE: There is a bug with this failing validation in the custom field explorer due
+// to https://github.com/rjsf-team/react-jsonschema-form/issues/675 even if
+// requestUserCredentials is not defined
 export const RepoBranchPickerSchema = RepoBranchPickerFieldSchema.schema;