diff --git a/apps/docs/content/components/collections/Listbox.mdx b/apps/docs/content/components/collections/Listbox.mdx
index 4b9560939..f57446e5c 100644
--- a/apps/docs/content/components/collections/Listbox.mdx
+++ b/apps/docs/content/components/collections/Listbox.mdx
@@ -35,7 +35,7 @@ links:
 
 A `ListBox` uses the following components.
 
-<ComposedComponents components={["Avatar", "Badge", "Header", "Icon", "Section", "Text"]}/>
+<ComposedComponents components={["Avatar", "Badge", "Header", "Icon", "Text"]}/>
 
 ## Usage
 
@@ -170,6 +170,10 @@ List box items can vary in sizes.
 
 <PropTable component="ListBox" />
 
+### ListBoxSection
+
+<PropTable component="ListBoxSection" />
+
 ### ListBoxItem
 
 <PropTable component="ListBoxItem" />
diff --git a/apps/docs/content/components/collections/Section.mdx b/apps/docs/content/components/collections/Section.mdx
deleted file mode 100644
index f4ac59823..000000000
--- a/apps/docs/content/components/collections/Section.mdx
+++ /dev/null
@@ -1,57 +0,0 @@
----
-title: Section
-description: A Section serves as a versatile container component, encapsulating an HTML section element.
-category: "collections"
-links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/Section/src/Section.tsx
----
-
-Section is a subcomponent of [Listbox](./Listbox), it's used within [Combobox](./ComboBox) and [Select](./Select).
-
-<Example src="Section/docs/preview" isOpen />
-
-<FeatureFlag flag="next">
-    ## Guidelines
-
-    TODO: If we have some guidelines about this component&apos;s usage
-
-    ### Accessibility ?
-
-    TODO: If we have some guidelines about this component and accessibility
-</FeatureFlag>
-
-## Anatomy
-
-### Composed Components
-
-A `Section` is used in the following components.
-
-<ComposedComponents components={["ComboBox", "ListBox", "Select"]}/>
-
-<FeatureFlag flag="rc">
-
-    TODO: We have anatomy screenshots from the Figma, we could most likely use them here
-
-    ### Concepts
-
-    TODO: links to related concepts
-</FeatureFlag>
-
-<FeatureFlag flag="next">
-    ## Advanced customization
-
-    ### Contexts
-    TODO: Example of context + content about the context
-
-    ### Custom Children
-
-    TODO: Example of passing custom childrens to the components to fake a slot
-
-    ### Custom Component
-
-    TODO: Example of creating a custom version of this component
-</FeatureFlag>
-
-## Props
-
-<PropTable component="Section" />
diff --git a/apps/docs/content/components/pickers/ComboBox.mdx b/apps/docs/content/components/pickers/ComboBox.mdx
index 218de98c8..6c39f259b 100644
--- a/apps/docs/content/components/pickers/ComboBox.mdx
+++ b/apps/docs/content/components/pickers/ComboBox.mdx
@@ -42,7 +42,7 @@ The Section component represents a `section` within a Hopper container.
 
 A `ComboBox` uses the following components.
 
-<ComposedComponents components={["Avatar", "Badge", "Header", "Icon", "Section", "Text"]}/>
+<ComposedComponents components={["Avatar", "Badge", "Header", "Icon", "Text"]}/>
 
 ## Usage
 
@@ -197,5 +197,15 @@ A combo box item can have a description.
 
 ## Props
 
+### ComboBox
+
 <PropTable component="ComboBox" />
 
+### ComboBoxSection
+
+<PropTable component="ListBoxSection" />
+
+### ComboBoxItem
+
+<PropTable component="ListBoxItem" />
+
diff --git a/apps/docs/content/components/pickers/Select.mdx b/apps/docs/content/components/pickers/Select.mdx
index df304820c..b36b72a3f 100644
--- a/apps/docs/content/components/pickers/Select.mdx
+++ b/apps/docs/content/components/pickers/Select.mdx
@@ -41,7 +41,7 @@ The Section component represents a `section` within a Hopper container.
 
 A `Select` uses the following components.
 
-<ComposedComponents components={["Avatar", "Badge", "Header",  "Icon", "Section", "Text"]}/>
+<ComposedComponents components={["Avatar", "Badge", "Header", "Icon", "Text"]}/>
 
 ## Usage
 
@@ -198,8 +198,18 @@ A select item can have a description.
 
 ## Props
 
+### Select
+
 <PropTable component="Select" />
 
+### SelectSection
+
+<PropTable component="ListBoxSection" />
+
+### SelectItem
+
+<PropTable component="ListBoxItem" />
+
 ## Migration Notes
 
 <MigrateGuide src="Select/docs/migration-notes" />
diff --git a/apps/docs/examples/Preview.ts b/apps/docs/examples/Preview.ts
index 754b7a66a..75e6cf828 100644
--- a/apps/docs/examples/Preview.ts
+++ b/apps/docs/examples/Preview.ts
@@ -152,9 +152,6 @@ export const Previews: Record<string, Preview> = {
     "ListBox/docs/multipleSizes": {
         component: lazy(() => import("@/../../packages/components/src/ListBox/docs/multipleSizes.tsx"))
     },
-    "Section/docs/preview": {
-        component: lazy(() => import("@/../../packages/components/src/Section/docs/preview.tsx"))
-    },
     "tag/docs/preview": {
         component: lazy(() => import("@/../../packages/components/src/tag/docs/preview.tsx"))
     },
diff --git a/packages/components/src/ListBoxSection/docs/preview.tsx b/packages/components/src/ListBoxSection/docs/preview.tsx
deleted file mode 100644
index 0cdc97040..000000000
--- a/packages/components/src/ListBoxSection/docs/preview.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Header, ListBox, ListBoxItem, ListBoxSection } from "@hopper-ui/components";
-
-export default function Example() {
-    return (
-        <ListBox>
-            <ListBoxSection>
-                <Header>Creative Department</Header>
-                <ListBoxItem>Designer</ListBoxItem>
-                <ListBoxItem>Copywriter</ListBoxItem>
-                <ListBoxItem>UX Researcher</ListBoxItem>
-            </ListBoxSection>
-        </ListBox>
-    );
-}