diff --git a/packages/components/src/templates/next/components/internal/CollectionCard/CollectionCard.stories.tsx b/packages/components/src/templates/next/components/internal/CollectionCard/CollectionCard.stories.tsx
index e421af80c..f5b4baa57 100644
--- a/packages/components/src/templates/next/components/internal/CollectionCard/CollectionCard.stories.tsx
+++ b/packages/components/src/templates/next/components/internal/CollectionCard/CollectionCard.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react"
 import { withChromaticModes } from "@isomer/storybook-config"
 
 import type { CollectionCardProps } from "~/interfaces"
-import { Tag } from "~/interfaces/internal/CollectionCard"
+import type { Tag } from "~/interfaces/internal/CollectionCard"
 import { CollectionCard } from "./CollectionCard"
 
 const meta: Meta<typeof CollectionCard> = {
diff --git a/packages/components/src/templates/next/components/internal/Tag/Tag.tsx b/packages/components/src/templates/next/components/internal/Tag/Tag.tsx
index f1558433b..f7678aa08 100644
--- a/packages/components/src/templates/next/components/internal/Tag/Tag.tsx
+++ b/packages/components/src/templates/next/components/internal/Tag/Tag.tsx
@@ -1,4 +1,4 @@
-import { PropsWithChildren } from "react"
+import type { PropsWithChildren } from "react"
 
 export const Tag = (
   props: PropsWithChildren<
diff --git a/packages/components/src/templates/next/render/renderComponentPreviewText.ts b/packages/components/src/templates/next/render/renderComponentPreviewText.ts
index dd4cecacc..edce05329 100644
--- a/packages/components/src/templates/next/render/renderComponentPreviewText.ts
+++ b/packages/components/src/templates/next/render/renderComponentPreviewText.ts
@@ -8,7 +8,7 @@ function getTextContentOfProse(content: ProseContent): string {
   function recursiveSearch(
     content: ProseContent | OrderedListProps["content"],
   ) {
-    content?.map((contentBlock) => {
+    content.map((contentBlock) => {
       switch (contentBlock.type) {
         case "heading":
           values.push(
diff --git a/packages/components/src/types/page.ts b/packages/components/src/types/page.ts
index 04569d07a..c0f033bb3 100644
--- a/packages/components/src/types/page.ts
+++ b/packages/components/src/types/page.ts
@@ -1,7 +1,7 @@
 import type { Static } from "@sinclair/typebox"
 import { Type } from "@sinclair/typebox"
-import { Collection } from "react-aria-components"
 
+import type { CollectionVariant } from "./variants"
 import {
   ArticlePageHeaderSchema,
   ContentPageHeaderSchema,
@@ -9,7 +9,6 @@ import {
 } from "~/interfaces"
 import { AltTextSchema, generateImageSrcSchema } from "~/interfaces/complex"
 import { REF_HREF_PATTERN } from "~/utils/validation"
-import { CollectionVariant, CollectionVariantSchema } from "./variants"
 
 const categorySchemaObject = Type.Object({
   category: Type.String({
diff --git a/packages/components/src/types/variants.ts b/packages/components/src/types/variants.ts
index 922cf8c1f..c11d8f1b8 100644
--- a/packages/components/src/types/variants.ts
+++ b/packages/components/src/types/variants.ts
@@ -1,4 +1,5 @@
-import { Static, Type } from "@sinclair/typebox"
+import type { Static } from "@sinclair/typebox"
+import { Type } from "@sinclair/typebox"
 
 export const CollectionVariantSchema = Type.Union([
   Type.Literal("blog"),