diff --git a/.changeset/spotty-cooks-unite.md b/.changeset/spotty-cooks-unite.md
new file mode 100644
index 000000000..cc7b0b1b1
--- /dev/null
+++ b/.changeset/spotty-cooks-unite.md
@@ -0,0 +1,6 @@
+---
+'@saas-ui/forms': minor
+'@saas-ui/react': minor
+---
+
+Improved ObjectSchema type definitions to be more strict and inherit correct field type props
diff --git a/apps/website/src/pages/docs/components/forms/auto-form/usage.mdx b/apps/website/src/pages/docs/components/forms/auto-form/usage.mdx
index e56adc63d..ded36e8e1 100644
--- a/apps/website/src/pages/docs/components/forms/auto-form/usage.mdx
+++ b/apps/website/src/pages/docs/components/forms/auto-form/usage.mdx
@@ -34,31 +34,8 @@ The default Form component supports the following schema format.
 
 The object schema is an object with field props. Array and object fields can have nested fields.
 
-```ts
-type FieldTypes =
-  | 'array'
-  | 'object'
-  | 'text'
-  | 'textarea'
-  | 'select'
-  | 'number'
-  | 'checkbox'
-  | 'radio'
-  | 'pin'
-  | 'phone'
-  | 'url'
-  | 'email'
-  | 'password'
-  | 'switch'
-  | 'native-select'
-
-type ObjectSchema = {
-  [key: FieldTypes]: FieldProps
-}
-```
-
 ```jsx
-import { Form } from '@saas-ui/react'
+import { Form, ObjectSchema } from '@saas-ui/react'
 
 const schema = {
   title: {
@@ -71,7 +48,7 @@ const schema = {
     label: 'Body',
     type: 'textarea',
   },
-}
+} as const satisfies ObjectSchema
 
 export default function Task() {
   return (
@@ -90,7 +67,7 @@ export default function Task() {
 ### Customize submit button
 
 ```jsx
-import { Form } from '@saas-ui/react'
+import { Form, ObjectSchema  } from '@saas-ui/react'
 
 const schema = {
   title: {
@@ -103,7 +80,7 @@ const schema = {
     label: 'Body',
     type: 'textarea',
   },
-}
+} as const satisfies ObjectSchema
 
 export default function Post() {
   return (
@@ -129,7 +106,7 @@ export default function Post() {
 ### Object field
 
 ```jsx
-import { Form } from '@saas-ui/react'
+import { Form, ObjectSchema } from '@saas-ui/react'
 
 const schema = {
   title: {
@@ -154,7 +131,7 @@ const schema = {
       },
     },
   },
-}
+} as const satisfies ObjectSchema
 
 export default function Post() {
   return (
@@ -184,7 +161,7 @@ export default function Post() {
 ### Array field
 
 ```jsx
-import { Form } from '@saas-ui/react'
+import { Form, ObjectSchema } from '@saas-ui/react'
 
 const schema = {
   title: {
@@ -209,7 +186,7 @@ const schema = {
       },
     },
   },
-}
+} as const satisfies ObjectSchema
 
 export default function Post() {
   return (
diff --git a/package.json b/package.json
index 2efcb9cfc..dcbbb6d8d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "clean": "turbo run clean",
     "test": "vitest",
     "test:watch": "vitest --watch --onlyChanged",
-    "test:ci": "vitest --color --runInBand --ci",
+    "test:ci": "vitest --color --run",
     "lint": "turbo run lint",
     "lint:staged": "lint-staged --allow-empty --config lint-staged.config.js",
     "create:pkg": "hygen package chakra-component",
diff --git a/packages/saas-ui-forms/src/auto-form.tsx b/packages/saas-ui-forms/src/auto-form.tsx
index 602c934de..4e5312c77 100644
--- a/packages/saas-ui-forms/src/auto-form.tsx
+++ b/packages/saas-ui-forms/src/auto-form.tsx
@@ -27,8 +27,11 @@ interface AutoFormOptions {
 
 export interface AutoFormProps<
   TFieldValues extends FieldValues,
-  TContext extends object = object
-> extends Omit<FormProps<TFieldValues, TContext>, 'schema' | 'children'>,
+  TContext extends object = object,
+> extends Omit<
+      FormProps<TFieldValues, TContext>,
+      'schema' | 'children' | 'fieldResolver'
+    >,
     AutoFormOptions {
   children?: React.ReactNode
 }
@@ -40,7 +43,7 @@ export interface AutoFormProps<
 export const AutoForm = forwardRef(
   <
     TFieldValues extends FieldValues = FieldValues,
-    TContext extends object = object
+    TContext extends object = object,
   >(
     props: AutoFormProps<TFieldValues, TContext>,
     ref: React.ForwardedRef<HTMLFormElement>
diff --git a/packages/saas-ui-forms/src/default-fields.tsx b/packages/saas-ui-forms/src/default-fields.tsx
index c3dee5113..0b494c392 100644
--- a/packages/saas-ui-forms/src/default-fields.tsx
+++ b/packages/saas-ui-forms/src/default-fields.tsx
@@ -31,9 +31,11 @@ import {
   NativeSelectProps,
   SelectButtonProps,
   SelectListProps,
+  SelectOption,
 } from './select'
 
 import { createField } from './create-field'
+import { FieldOption, FieldOptions } from './types'
 
 export interface InputFieldProps extends InputProps {
   type?: string
@@ -95,6 +97,7 @@ export interface SelectFieldProps extends SelectProps {
 export const SelectField = createField<SelectFieldProps>(
   forwardRef((props, ref) => {
     const { buttonProps, listProps, ...rest } = props
+
     return (
       <Select ref={ref} {...rest}>
         <SelectButton {...buttonProps} />
diff --git a/packages/saas-ui-forms/src/field-resolver.ts b/packages/saas-ui-forms/src/field-resolver.ts
index 59d0ab1c1..b0789e3e1 100644
--- a/packages/saas-ui-forms/src/field-resolver.ts
+++ b/packages/saas-ui-forms/src/field-resolver.ts
@@ -1,6 +1,9 @@
-import { BaseFieldProps } from './types'
+import { BaseFieldProps, ValueOf } from './types'
 
 import { get } from '@chakra-ui/utils'
+import { ArrayFieldProps } from './array-field'
+import { ObjectFieldProps } from './object-field'
+import { DefaultFields } from './default-fields'
 
 export type FieldResolver = {
   getFields(): BaseFieldProps[]
@@ -9,16 +12,32 @@ export type FieldResolver = {
 
 export type GetFieldResolver<TSchema = any> = (schema: TSchema) => FieldResolver
 
-interface SchemaField extends BaseFieldProps {
-  items?: SchemaField[]
-  properties?: Record<string, SchemaField>
-}
+type FieldTypes<FieldDefs = DefaultFields> = ValueOf<{
+  [K in keyof FieldDefs]: FieldDefs[K] extends React.FC<infer Props>
+    ? { type?: K } & Omit<Props, 'name'>
+    : never
+}>
+
+type SchemaField<FieldDefs = DefaultFields> =
+  | FieldTypes<FieldDefs>
+  | (Omit<ObjectFieldProps, 'name' | 'children'> & {
+      type: 'object'
+      properties?: Record<string, SchemaField<FieldDefs>>
+    })
+  | (Omit<ArrayFieldProps, 'name' | 'children'> & {
+      type: 'array'
+      items?: SchemaField<FieldDefs>
+    })
 
-export type ObjectSchema = Record<string, SchemaField>
+export type ObjectSchema<FieldDefs = DefaultFields> = Record<
+  string,
+  SchemaField<FieldDefs>
+>
 
 const mapFields = (schema: ObjectSchema): BaseFieldProps[] =>
   schema &&
-  Object.entries(schema).map(([name, { items, label, title, ...field }]) => {
+  Object.entries(schema).map(([name, props]) => {
+    const { items, label, title, ...field } = props as any
     return {
       ...field,
       name,
diff --git a/packages/saas-ui-forms/stories/auto-form.stories.tsx b/packages/saas-ui-forms/stories/auto-form.stories.tsx
index d0cb73279..418b7d58c 100644
--- a/packages/saas-ui-forms/stories/auto-form.stories.tsx
+++ b/packages/saas-ui-forms/stories/auto-form.stories.tsx
@@ -7,7 +7,7 @@ import { createYupForm } from '@saas-ui/forms/yup'
 import * as z from 'zod'
 import { createZodForm, zodMeta } from '@saas-ui/forms/zod'
 
-import { Form, SubmitButton } from '../src'
+import { Form, ObjectSchema, SubmitButton } from '../src'
 
 import { onSubmit } from './helpers'
 
@@ -34,6 +34,14 @@ const basicSchema = {
     type: 'text',
     label: 'Last name',
   },
+  role: {
+    type: 'select',
+    label: 'Role',
+    options: [
+      { label: 'Admin', value: 'admin' },
+      { label: 'User', value: 'user' },
+    ],
+  },
   emails: {
     type: 'array',
     label: 'Emails',
@@ -46,7 +54,7 @@ const basicSchema = {
       },
     },
   },
-} as const
+} as const satisfies ObjectSchema
 
 const schema = Yup.object().shape({
   firstName: Yup.string()
@@ -93,169 +101,156 @@ const zodSchema = z.object({
 const ZodForm = createZodForm()
 
 export const Basic = () => (
-  <>
-    <Form
-      defaultValues={{
-        firstName: '',
-        lastName: '',
-        emails: [
-          {
-            address: '',
-          },
-        ],
-      }}
-      schema={basicSchema}
-      onSubmit={onSubmit}
-    />
-  </>
+  <Form
+    defaultValues={{
+      firstName: '',
+      lastName: '',
+      emails: [
+        {
+          address: '',
+        },
+      ],
+      role: 'user',
+    }}
+    schema={basicSchema}
+    onSubmit={onSubmit}
+  />
 )
 
 export const CustomSubmit = () => (
-  <>
-    <Form
-      defaultValues={{
-        firstName: '',
-        lastName: '',
-        emails: [
-          {
-            address: '',
-          },
-        ],
-      }}
-      schema={basicSchema}
-      onSubmit={onSubmit}
-      fields={{
-        submit: {
-          children: 'Save',
-          variant: 'secondary',
+  <Form
+    defaultValues={{
+      firstName: '',
+      lastName: '',
+      emails: [
+        {
+          address: '',
         },
-      }}
-    />
-  </>
+      ],
+    }}
+    schema={basicSchema}
+    onSubmit={onSubmit}
+    fields={{
+      submit: {
+        children: 'Save',
+        variant: 'secondary',
+      },
+    }}
+  />
 )
 
 export const YupSchema = () => (
-  <>
-    <YupForm
-      schema={schema}
-      defaultValues={{
-        firstName: '',
-        lastName: '',
-        emails: [
-          {
-            address: '',
-          },
-        ],
-      }}
-      onSubmit={onSubmit}
-    />
-  </>
+  <YupForm
+    schema={schema}
+    defaultValues={{
+      firstName: '',
+      lastName: '',
+      emails: [
+        {
+          address: '',
+        },
+      ],
+    }}
+    onSubmit={onSubmit}
+  />
 )
 
 export const ZodSchema = () => (
-  <>
-    <ZodForm
-      schema={zodSchema}
-      defaultValues={{
-        firstName: '',
-        lastName: '',
-        emails: [
-          {
-            address: '',
-          },
-        ],
-      }}
-      onSubmit={onSubmit}
-    />
-  </>
+  <ZodForm
+    schema={zodSchema}
+    defaultValues={{
+      firstName: '',
+      lastName: '',
+      emails: [
+        {
+          address: '',
+        },
+      ],
+    }}
+    onSubmit={onSubmit}
+  />
 )
 
 export const ZodSchemaNested = () => (
-  <>
-    <ZodForm
-      schema={z.object({
-        title: z
-          .string()
-          .min(2, 'Too short')
-          .max(25, 'Too long')
-          .describe('Title'),
-        author: z
-          .object({
-            name: z.string().describe('Name'),
-            email: z.string().email().describe('Email'),
-          })
-          .describe('Author'),
-      })}
-      defaultValues={{
-        title: '',
-        author: {
-          name: '',
-          email: '',
-        },
-      }}
-      fields={{
-        author: {
-          type: 'object',
-          columns: 2,
-        },
-        'author.email': {
-          type: 'email',
-        },
-      }}
-      onSubmit={onSubmit}
-    />
-  </>
+  <ZodForm
+    schema={z.object({
+      title: z
+        .string()
+        .min(2, 'Too short')
+        .max(25, 'Too long')
+        .describe('Title'),
+      author: z
+        .object({
+          name: z.string().describe('Name'),
+          email: z.string().email().describe('Email'),
+        })
+        .describe('Author'),
+    })}
+    defaultValues={{
+      title: '',
+      author: {
+        name: '',
+        email: '',
+      },
+    }}
+    fields={{
+      author: {
+        type: 'object',
+        columns: 2,
+      },
+      'author.email': {
+        type: 'email',
+      },
+    }}
+    onSubmit={onSubmit}
+  />
 )
 
 export const ZodSchemaArray = () => (
-  <>
-    <ZodForm
-      schema={z.object({
-        description: z
-          .string()
-          .min(2, 'Too short')
-          .max(25, 'Too long')
-          .describe('Description'),
-        todos: z
-          .array(
-            z.object({
-              todo: z.string().describe('Todo'),
-            })
-          )
-          .min(1, 'Add minimal 1 todo')
-          .max(10, 'Maximum 10 todos')
-          .describe('Todos'),
-      })}
-      defaultValues={{
-        description: '',
-        todos: [{ todo: '' }],
-      }}
-      fields={{
-        'todos.$.todo': {
-          type: 'textarea',
-        },
-        submit: {
-          children: 'Save',
-        },
-      }}
-      onSubmit={onSubmit}
-    />
-  </>
+  <ZodForm
+    schema={z.object({
+      description: z
+        .string()
+        .min(2, 'Too short')
+        .max(25, 'Too long')
+        .describe('Description'),
+      todos: z
+        .array(
+          z.object({
+            todo: z.string().describe('Todo'),
+          })
+        )
+        .min(1, 'Add minimal 1 todo')
+        .max(10, 'Maximum 10 todos')
+        .describe('Todos'),
+    })}
+    defaultValues={{
+      description: '',
+      todos: [{ todo: '' }],
+    }}
+    fields={{
+      'todos.$.todo': {
+        type: 'textarea',
+      },
+      submit: {
+        children: 'Save',
+      },
+    }}
+    onSubmit={onSubmit}
+  />
 )
 
 export const ZodSchemaMeta = () => (
-  <>
-    <ZodForm
-      schema={z.object({
-        description: z
-          .string()
-          .min(2, 'Too short')
-          .describe(zodMeta({ label: 'Description', type: 'textarea' })),
-      })}
-      defaultValues={{
-        description: '',
-      }}
-      onSubmit={onSubmit}
-    />
-  </>
+  <ZodForm
+    schema={z.object({
+      description: z
+        .string()
+        .min(2, 'Too short')
+        .describe(zodMeta({ label: 'Description', type: 'textarea' })),
+    })}
+    defaultValues={{
+      description: '',
+    }}
+    onSubmit={onSubmit}
+  />
 )
diff --git a/packages/saas-ui-forms/stories/form.stories.tsx b/packages/saas-ui-forms/stories/form.stories.tsx
index 37731633b..9600ca95f 100644
--- a/packages/saas-ui-forms/stories/form.stories.tsx
+++ b/packages/saas-ui-forms/stories/form.stories.tsx
@@ -52,15 +52,14 @@ const loginSchema = yup.object({
 })
 
 export const Basic = {
-  render(args: FormProps) {
+  render() {
     return (
       <Form
         defaultValues={{
           title: 'Form',
           description: 'A basic layout',
         }}
-        {...args}
-        onSubmit={args?.onSubmit || onSubmit}
+        onSubmit={onSubmit}
       >
         {({ Field }) => (
           <FormLayout>
@@ -76,14 +75,13 @@ export const Basic = {
 }
 
 export const WithValidationRules = {
-  render(props: FormProps) {
+  render() {
     return (
       <Form
         defaultValues={{
           title: '',
           description: '',
         }}
-        {...props}
         onSubmit={onSubmit}
       >
         {({ Field }) => (
@@ -184,7 +182,7 @@ const yupSchema = yup.object({
 })
 
 export const WithYupSchema = {
-  render(props: React.ComponentProps<typeof YupForm>) {
+  render() {
     return (
       <YupForm
         schema={yupSchema}
@@ -192,8 +190,7 @@ export const WithYupSchema = {
           name: '',
           description: '',
         }}
-        {...props}
-        onSubmit={props?.onSubmit || onSubmit}
+        onSubmit={onSubmit}
       >
         {({ Field }) => (
           <FormLayout>
diff --git a/packages/saas-ui-modals/src/form.tsx b/packages/saas-ui-modals/src/form.tsx
index 72f9858f0..10c2c7e40 100644
--- a/packages/saas-ui-modals/src/form.tsx
+++ b/packages/saas-ui-modals/src/form.tsx
@@ -118,27 +118,25 @@ const useFormProps = (props: FormDialogProps) => {
 /**
  * @todo make this dynamic to support other schema types
  */
-type MergeDialogProps<T> = T extends FormType<
-  infer FieldDefs,
-  infer ExtraProps,
-  infer ExtraOverrides
->
-  ? FormType<
-      FieldDefs,
-      ExtraProps & Omit<BaseModalProps, 'children'>,
-      ExtraOverrides & FormDialogFieldOverrides
-    >
-  : never
-
-type IsSchemaType<T, Schema, FieldDefs> = T extends DefaultFormType<FieldDefs>
-  ? T extends (
-      props: FormProps<infer TSchema, infer TFieldValues, infer TContext>
-    ) => any
-    ? Schema extends TSchema
-      ? true
+type MergeDialogProps<T> =
+  T extends FormType<infer FieldDefs, infer ExtraProps, infer ExtraOverrides>
+    ? FormType<
+        FieldDefs,
+        ExtraProps & Omit<BaseModalProps, 'children'>,
+        ExtraOverrides & FormDialogFieldOverrides
+      >
+    : never
+
+type IsSchemaType<T, Schema, FieldDefs> =
+  T extends DefaultFormType<FieldDefs>
+    ? T extends (
+        props: FormProps<infer TSchema, infer TFieldValues, infer TContext>
+      ) => any
+      ? Schema extends TSchema
+        ? true
+        : false
       : false
     : false
-  : false
 
 export type DefaultFormType<
   FieldDefs = any,