diff --git a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
index 3aadd69c05..2a4dedf080 100644
--- a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
+++ b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import React from 'react';
-import type { FieldValidation } from '@rjsf/utils';
+import type { FieldValidation } from '@rjsf/core';
 import {
   createScaffolderFieldExtension,
   FieldExtensionComponentProps,
@@ -30,7 +30,7 @@ const TextValuePicker = (props: FieldExtensionComponentProps<string>) => {
     schema: { title, description },
     rawErrors,
     formData,
-    uiSchema: { 'ui:autofocus': autoFocus } = {},
+    uiSchema: { 'ui:autofocus': autoFocus },
     idSchema,
     placeholder,
   } = props;
diff --git a/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx b/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx
index 2b21141edb..802135a863 100644
--- a/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx
+++ b/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx
@@ -29,7 +29,7 @@ export const EntityNamePicker = (
     schema: { title = 'Name', description = 'Unique name of the component' },
     rawErrors,
     formData,
-    uiSchema: { 'ui:autofocus': autoFocus } = {},
+    uiSchema: { 'ui:autofocus': autoFocus },
     idSchema,
     placeholder,
   } = props;
diff --git a/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.test.ts b/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.test.ts
index 7201c9c4b3..290650387e 100644
--- a/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.test.ts
+++ b/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { FieldValidation } from '@rjsf/utils';
+import { FieldValidation } from '@rjsf/core';
 import { KubernetesValidatorFunctions } from '@backstage/catalog-model';
 import { entityNamePickerValidation } from './validation';
 
diff --git a/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.ts b/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.ts
index 1533b0cdc3..7a40a460ba 100644
--- a/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.ts
+++ b/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { FieldValidation } from '@rjsf/utils';
+import { FieldValidation } from '@rjsf/core';
 import { KubernetesValidatorFunctions } from '@backstage/catalog-model';
 
 export const entityNamePickerValidation = (
diff --git a/plugins/scaffolder/src/components/fields/EntityTagsPicker/EntityTagsPicker.tsx b/plugins/scaffolder/src/components/fields/EntityTagsPicker/EntityTagsPicker.tsx
index fcbf7a7c80..c0e3aab436 100644
--- a/plugins/scaffolder/src/components/fields/EntityTagsPicker/EntityTagsPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/EntityTagsPicker/EntityTagsPicker.tsx
@@ -51,9 +51,9 @@ export const EntityTagsPicker = (
   const [inputValue, setInputValue] = useState('');
   const [inputError, setInputError] = useState(false);
   const tagValidator = makeValidator().isValidTag;
-  const kinds = uiSchema?.['ui:options']?.kinds;
-  const showCounts = uiSchema?.['ui:options']?.showCounts;
-  const helperText = uiSchema?.['ui:options']?.helperText;
+  const kinds = uiSchema['ui:options']?.kinds;
+  const showCounts = uiSchema['ui:options']?.showCounts;
+  const helperText = uiSchema['ui:options']?.helperText;
 
   const { loading, value: existingTags } = useAsync(async () => {
     const facet = 'metadata.tags';
diff --git a/plugins/scaffolder/src/components/fields/OwnedEntityPicker/OwnedEntityPicker.tsx b/plugins/scaffolder/src/components/fields/OwnedEntityPicker/OwnedEntityPicker.tsx
index d15677cfac..2446883a86 100644
--- a/plugins/scaffolder/src/components/fields/OwnedEntityPicker/OwnedEntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/OwnedEntityPicker/OwnedEntityPicker.tsx
@@ -59,12 +59,12 @@ export const OwnedEntityPicker = (
     formData,
     idSchema,
   } = props;
-  const allowedKinds = uiSchema?.['ui:options']?.allowedKinds;
-  const defaultKind = uiSchema?.['ui:options']?.defaultKind;
-  const defaultNamespace = uiSchema?.['ui:options']?.defaultNamespace;
 
+  const allowedKinds = uiSchema['ui:options']?.allowedKinds;
+  const defaultKind = uiSchema['ui:options']?.defaultKind;
+  const defaultNamespace = uiSchema['ui:options']?.defaultNamespace;
   const allowArbitraryValues =
-    uiSchema?.['ui:options']?.allowArbitraryValues ?? true;
+    uiSchema['ui:options']?.allowArbitraryValues ?? true;
   const { ownedEntities, loading } = useOwnedEntities(allowedKinds);
 
   const entityRefs = ownedEntities?.items