diff --git a/apps/showcase/doc/checkbox/FormDoc.vue b/apps/showcase/doc/checkbox/FormDoc.vue
index b439eabc1..a46026d99 100644
--- a/apps/showcase/doc/checkbox/FormDoc.vue
+++ b/apps/showcase/doc/checkbox/FormDoc.vue
@@ -1,5 +1,7 @@
 <template>
-    <DocSectionText v-bind="$attrs"> </DocSectionText>
+    <DocSectionText v-bind="$attrs">
+        <p>Checkbox can be used with the <NuxtLink to="/forms">PrimeVue Forms</NuxtLink> library.</p>
+    </DocSectionText>
     <div class="card flex justify-center">
         <Form v-slot="$form" :resolver="resolver" :initialValues="initialValues" @submit="onFormSubmit" class="flex justify-center flex-col gap-4">
             <div class="flex flex-col gap-2">
@@ -24,10 +26,10 @@
 
                 <Message v-if="$form.checkbox?.invalid" severity="error">{{ $form.checkbox.errors[0]?.message }}</Message>
             </div>
-            <Button type="submit" severity="secondary" class="self-center p-2">Submit</Button>
+            <Button type="submit" severity="secondary" label="Submit" />
         </Form>
     </div>
-    <DocSectionCode :code="code" />
+    <DocSectionCode :code="code" :dependencies="{ zod: '3.23.8' }" />
 </template>
 
 <script>
@@ -40,36 +42,93 @@ export default {
             initialValues: {
                 checkbox: []
             },
-            resolver: null,
-            schema: z.object({
-                checkbox: z.array(z.string()).min(1, { message: 'At least one checkbox must be selected.' })
-            }),
+            resolver: zodResolver(
+                z.object({
+                    checkbox: z.array(z.string()).min(1, { message: 'At least one checkbox must be selected.' })
+                })
+            ),
             code: {
                 basic: `
 <Form v-slot="$form" :resolver="resolver" :initialValues="initialValues" @submit="onFormSubmit" class="flex justify-center flex-col gap-4">
     <div class="flex flex-col gap-2">
-        <InputText name="username" type="text" placeholder="Username" />
-        <Message v-if="$form.username?.invalid" severity="error">{{ $form.username.errors[0]?.message }}</Message>
+        <CheckboxGroup name="checkbox" class="flex flex-wrap gap-4">
+            <div class="flex items-center">
+                <Checkbox inputId="ingredient1" value="Cheese" />
+                <label for="ingredient1" class="ml-2"> Cheese </label>
+            </div>
+            <div class="flex items-center">
+                <Checkbox inputId="ingredient2" value="Mushroom" />
+                <label for="ingredient2" class="ml-2"> Mushroom </label>
+            </div>
+            <div class="flex items-center">
+                <Checkbox inputId="ingredient3" value="Pepper" />
+                <label for="ingredient3" class="ml-2"> Pepper </label>
+            </div>
+            <div class="flex items-center">
+                <Checkbox inputId="ingredient4" value="Onion" />
+                <label for="ingredient4" class="ml-2"> Onion </label>
+            </div>
+        </CheckboxGroup>
+
+        <Message v-if="$form.checkbox?.invalid" severity="error">{{ $form.checkbox.errors[0]?.message }}</Message>
     </div>
-    <div class="flex flex-col gap-2">
-        <InputText name="email" type="text" placeholder="Email" />
-        <Message v-if="$form.email?.invalid" severity="error">{{ $form.email.errors[0]?.message }}</Message>
-    </div>
-    <Button type="submit" severity="secondary" class="self-center p-2">Submit</Button>
+    <Button type="submit" severity="secondary" label="Submit" />
 </Form>
 `,
                 options: `
 <template>
     <div class="card flex justify-center">
-        <InputText type="text" v-model="value" />
+        <Form v-slot="$form" :resolver="resolver" :initialValues="initialValues" @submit="onFormSubmit" class="flex justify-center flex-col gap-4">
+            <div class="flex flex-col gap-2">
+                <CheckboxGroup name="checkbox" class="flex flex-wrap gap-4">
+                    <div class="flex items-center">
+                        <Checkbox inputId="ingredient1" value="Cheese" />
+                        <label for="ingredient1" class="ml-2"> Cheese </label>
+                    </div>
+                    <div class="flex items-center">
+                        <Checkbox inputId="ingredient2" value="Mushroom" />
+                        <label for="ingredient2" class="ml-2"> Mushroom </label>
+                    </div>
+                    <div class="flex items-center">
+                        <Checkbox inputId="ingredient3" value="Pepper" />
+                        <label for="ingredient3" class="ml-2"> Pepper </label>
+                    </div>
+                    <div class="flex items-center">
+                        <Checkbox inputId="ingredient4" value="Onion" />
+                        <label for="ingredient4" class="ml-2"> Onion </label>
+                    </div>
+                </CheckboxGroup>
+
+                <Message v-if="$form.checkbox?.invalid" severity="error">{{ $form.checkbox.errors[0]?.message }}</Message>
+            </div>
+            <Button type="submit" severity="secondary" label="Submit" />
+        </Form>
     </div>
+    <Toast />
 </template>
 
 <script>
+import { zodResolver } from '@primevue/form/resolvers';
+import { z } from 'zod';
+
 export default {
     data() {
         return {
-            value: null
+            initialValues: {
+                checkbox: []
+            },
+            resolver: zodResolver(
+                z.object({
+                    checkbox: z.array(z.string()).min(1, { message: 'At least one checkbox must be selected.' })
+                })
+            ),
+        }
+    },
+    methods: {
+        onFormSubmit({ valid }) {
+            if (valid) {
+                this.$toast.add({ severity: 'success', summary: 'Form is submitted.', life: 3000 });
+            }
         }
     }
 }
@@ -79,22 +138,61 @@ export default {
                 composition: `
 <template>
     <div class="card flex justify-center">
-        <InputText type="text" v-model="value" />
+        <Form v-slot="$form" :resolver="resolver" :initialValues="initialValues" @submit="onFormSubmit" class="flex justify-center flex-col gap-4">
+            <div class="flex flex-col gap-2">
+                <CheckboxGroup name="checkbox" class="flex flex-wrap gap-4">
+                    <div class="flex items-center">
+                        <Checkbox inputId="ingredient1" value="Cheese" />
+                        <label for="ingredient1" class="ml-2"> Cheese </label>
+                    </div>
+                    <div class="flex items-center">
+                        <Checkbox inputId="ingredient2" value="Mushroom" />
+                        <label for="ingredient2" class="ml-2"> Mushroom </label>
+                    </div>
+                    <div class="flex items-center">
+                        <Checkbox inputId="ingredient3" value="Pepper" />
+                        <label for="ingredient3" class="ml-2"> Pepper </label>
+                    </div>
+                    <div class="flex items-center">
+                        <Checkbox inputId="ingredient4" value="Onion" />
+                        <label for="ingredient4" class="ml-2"> Onion </label>
+                    </div>
+                </CheckboxGroup>
+
+                <Message v-if="$form.checkbox?.invalid" severity="error">{{ $form.checkbox.errors[0]?.message }}</Message>
+            </div>
+            <Button type="submit" severity="secondary" label="Submit" />
+        </Form>
     </div>
+    <Toast />
 </template>
 
 <script setup>
 import { ref } from 'vue';
+import { zodResolver } from '@primevue/form/resolvers';
+import { useToast } from "primevue/usetoast";
+import { z } from 'zod';
 
-const value = ref(null);
+const toast = useToast();
+const initialValues = ref({
+    checkbox: []
+});
+const resolver = ref(zodResolver(
+    z.object({
+        checkbox: z.array(z.string()).min(1, { message: 'At least one checkbox must be selected.' })
+    })
+));
+
+const onFormSubmit = ({ valid }) => {
+    if (valid) {
+        toast.add({ severity: 'success', summary: 'Form is submitted.', life: 3000 });
+    }
+};
 <\/script>
         `
             }
         };
     },
-    mounted() {
-        this.resolver = zodResolver(this.schema);
-    },
     methods: {
         onFormSubmit({ valid }) {
             if (valid) {