diff --git a/packages/plugin-form-builder/src/collections/Forms/DynamicFieldSelector.tsx b/packages/plugin-form-builder/src/collections/Forms/DynamicFieldSelector.tsx
index 2d2940fd87..3877df090a 100644
--- a/packages/plugin-form-builder/src/collections/Forms/DynamicFieldSelector.tsx
+++ b/packages/plugin-form-builder/src/collections/Forms/DynamicFieldSelector.tsx
@@ -2,7 +2,8 @@
 
 import type { TextField } from 'payload/types'
 
-import { Select, useForm } from '@payloadcms/ui'
+import { Select } from '@payloadcms/ui/fields/Select'
+import { useForm } from '@payloadcms/ui/forms/Form'
 import React, { useEffect, useState } from 'react'
 
 import type { SelectFieldOption } from '../../types.js'
diff --git a/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx b/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx
index df6cff9199..bd720b2bab 100644
--- a/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx
+++ b/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx
@@ -1,8 +1,9 @@
 'use client'
+
+import { useForm } from '@payloadcms/ui/forms/Form'
+import { useField } from '@payloadcms/ui/forms/useField'
 import * as React from 'react'
 
-import { useForm } from '@payloadcms/ui'
-import { useField } from '@payloadcms/ui'
 import './index.scss'
 
 const baseClass = 'custom-blocks-field-management'
diff --git a/test/uploads/collections/admin-thumbnail/RegisterThumbnailFn.tsx b/test/uploads/collections/admin-thumbnail/RegisterThumbnailFn.tsx
index aea30ab971..32405996cc 100644
--- a/test/uploads/collections/admin-thumbnail/RegisterThumbnailFn.tsx
+++ b/test/uploads/collections/admin-thumbnail/RegisterThumbnailFn.tsx
@@ -1,7 +1,7 @@
 'use client'
 import type React from 'react'
 
-import { useAdminThumbnail } from '@payloadcms/ui'
+import { useAdminThumbnail } from '@payloadcms/ui/hooks/useAdminThumbnail'
 
 type TypeWithFile = {
   filename: string