From a1ac45773352df2066b8ae181dd3b0d15d1c54e5 Mon Sep 17 00:00:00 2001
From: Marius Ahsmus <marius.ahsmus@gmail.com>
Date: Mon, 27 Apr 2026 20:55:48 +0200
Subject: [PATCH 01/11] feat: dynamically render payload blocks to landing, and
 product pages, removed editionherosection & introduced centered prop to
 herosection to display the old editionhero in the product pages

---
 .../[locale]/community-edition/page.tsx       |  28 +---
 .../[locale]/enterprise-edition/page.tsx      |  33 +---
 src/app/(landing)/[locale]/page.tsx           |  43 +----
 src/blocks/EditionHeroBlock.ts                |  81 ----------
 src/blocks/HeroBlock.ts                       |  33 ++++
 src/collections/pages.ts                      |   3 +-
 src/components/PageBlockRenderer.tsx          |  60 +++++++
 .../sections/EditionHeroSection.tsx           | 112 -------------
 src/components/sections/HeroSection.tsx       | 101 ++++++++++--
 src/lib/cms.ts                                |   1 -
 .../20260427_010_remove_edition_hero_block.ts | 149 ++++++++++++++++++
 src/migrations/index.ts                       |   6 +
 src/payload-types.ts                          |  53 ++-----
 tsconfig.json                                 |   3 +-
 14 files changed, 361 insertions(+), 345 deletions(-)
 delete mode 100644 src/blocks/EditionHeroBlock.ts
 create mode 100644 src/components/PageBlockRenderer.tsx
 delete mode 100644 src/components/sections/EditionHeroSection.tsx
 create mode 100644 src/migrations/20260427_010_remove_edition_hero_block.ts

diff --git a/src/app/(landing)/[locale]/community-edition/page.tsx b/src/app/(landing)/[locale]/community-edition/page.tsx
index 7d2fb2e6..a4a14fab 100644
--- a/src/app/(landing)/[locale]/community-edition/page.tsx
+++ b/src/app/(landing)/[locale]/community-edition/page.tsx
@@ -1,8 +1,4 @@
-import { CtaSection } from "@/components/sections/CtaSection"
-import { EditionFeatureSection } from "@/components/sections/EditionFeatureSection"
-import { EditionHeroSection } from "@/components/sections/EditionHeroSection"
-import { EditionInstallSection } from "@/components/sections/EditionInstallSection"
-import { EditionUseCaseSection } from "@/components/sections/EditionUseCaseSection"
+import { PageBlocks } from "@/components/PageBlockRenderer"
 import { LandingContainer } from "@/components/ui/LandingContainer"
 import { getLandingPage } from "@/lib/cms"
 import { isSupportedLocale } from "@/lib/i18n"
@@ -20,31 +16,11 @@ export default async function CommunityEditionPage({ params }: { params: Promise
     if (!isSupportedLocale(locale)) notFound()
 
     const page = await getLandingPage("community-edition", locale)
-    const heroBlock = page?.layout?.find((item) => item.blockType === "editionHero") ?? null
-    const featuresBlock = page?.layout?.find((item) => item.blockType === "editionFeatures") ?? null
-    const installBlock = page?.layout?.find((item) => item.blockType === "editionInstall") ?? null
-    const useCaseBlock = page?.layout?.find((item) => item.blockType === "editionUseCases") ?? null
-    const ctaBlock = page?.layout?.find((item) => item.blockType === "cta") ?? null
 
     return (
         <LandingContainer>
             <div className="h-12 lg:h-16" aria-hidden="true" />
-            <EditionHeroSection
-                content={heroBlock}
-                locale={locale}
-                grainientColors={{
-                    color1: "#10213a",
-                    color2: "#f872e2",
-                    color3: "#f8f172",
-                    backgroundColor: "#0b1324",
-                }}
-            />
-            <div className="h-32" aria-hidden="true" />
-            <EditionFeatureSection content={featuresBlock} />
-            <div className="h-32" aria-hidden="true" />
-            <EditionInstallSection content={installBlock} />
-            <div className="h-32" aria-hidden="true" />
-            <CtaSection content={ctaBlock} />
+            <PageBlocks blocks={page?.layout} locale={locale} />
         </LandingContainer>
     )
 }
diff --git a/src/app/(landing)/[locale]/enterprise-edition/page.tsx b/src/app/(landing)/[locale]/enterprise-edition/page.tsx
index 8bd5c82a..28fe3d9d 100644
--- a/src/app/(landing)/[locale]/enterprise-edition/page.tsx
+++ b/src/app/(landing)/[locale]/enterprise-edition/page.tsx
@@ -1,15 +1,10 @@
-import { CtaSection } from "@/components/sections/CtaSection"
-import { EditionFeatureSection } from "@/components/sections/EditionFeatureSection"
-import { EditionHeroSection } from "@/components/sections/EditionHeroSection"
-import { EditionUseCaseSection } from "@/components/sections/EditionUseCaseSection"
+import { PageBlocks } from "@/components/PageBlockRenderer"
 import { LandingContainer } from "@/components/ui/LandingContainer"
 import { getLandingPage } from "@/lib/cms"
-import type { CtaLayoutBlock } from "@/lib/cms"
 import { isSupportedLocale } from "@/lib/i18n"
 import { getLandingPageMetadata } from "@/lib/pageMetadata"
 import type { Metadata } from "next"
 import { notFound } from "next/navigation"
-import React from "react"
 
 export async function generateMetadata({ params }: { params: Promise<{ locale: string }> }): Promise<Metadata> {
     const { locale } = await params
@@ -21,35 +16,11 @@ export default async function EnterpriseEditionPage({ params }: { params: Promis
     if (!isSupportedLocale(locale)) notFound()
 
     const page = await getLandingPage("enterprise-edition", locale)
-    const heroBlock = page?.layout?.find((item) => item.blockType === "editionHero") ?? null
-    const ctaBlock = (page?.layout?.find((item) => item.blockType === "cta") ?? null) as CtaLayoutBlock | null
-    const blocks = page?.layout?.filter((item) => item.blockType === "editionUseCases" || item.blockType === "editionFeatures") ?? []
 
     return (
         <LandingContainer>
             <div className="h-12 lg:h-16" aria-hidden="true" />
-            <EditionHeroSection
-                content={heroBlock}
-                locale={locale}
-                grainientColors={{
-                    color1: "#13102d",
-                    color2: "#7472f8",
-                    color3: "#72c9f8",
-                    backgroundColor: "#140c22",
-                }}
-            />
-            {blocks.map((block, index) => (
-                <React.Fragment key={index}>
-                    <div className="h-32" aria-hidden="true" />
-                    {block.blockType === "editionFeatures" ? (
-                        <EditionFeatureSection content={block} />
-                    ) : block.blockType === "editionUseCases" ? (
-                        <EditionUseCaseSection content={block} />
-                    ) : null}
-                </React.Fragment>
-            ))}
-            <div className="h-32" aria-hidden="true" />
-            <CtaSection content={ctaBlock} floatingCta locale={locale} />
+            <PageBlocks blocks={page?.layout} ctaFloating locale={locale} />
         </LandingContainer>
     )
 }
diff --git a/src/app/(landing)/[locale]/page.tsx b/src/app/(landing)/[locale]/page.tsx
index fbb81af4..e65f3ece 100644
--- a/src/app/(landing)/[locale]/page.tsx
+++ b/src/app/(landing)/[locale]/page.tsx
@@ -1,19 +1,6 @@
 import { LandingContainer } from "@/components/ui/LandingContainer"
-import { HeroSection } from "@/components/sections/HeroSection"
-import { BrandSection } from "@/components/sections/BrandSection"
-import { UseCaseSection } from "@/components/sections/UseCaseSection"
-import { AppFeatureSection } from "@/components/sections/AppFeatureSection"
-import { DeploymentSection } from "@/components/sections/DeploymentSection"
-import { RuntimeFeatureSection } from "@/components/sections/RuntimeFeatureSection"
-import { RoadmapSection } from "@/components/sections/RoadmapSection"
-import { FaqSection } from "@/components/sections/FaqSection"
-import { CtaSection } from "@/components/sections/CtaSection"
+import { PageBlocks } from "@/components/PageBlockRenderer"
 import { getLandingPage } from "@/lib/cms"
-import type { DeploymentLayoutBlock, HeroLayoutBlock } from "@/lib/cms"
-import type { BrandLayoutBlock } from "@/lib/cms"
-import type { CtaLayoutBlock } from "@/lib/cms"
-import type { FaqLayoutBlock } from "@/lib/cms"
-import type { UseCaseLayoutBlock } from "@/lib/cms"
 import { isSupportedLocale, SUPPORTED_LOCALES } from "@/lib/i18n"
 import { getLandingPageMetadata } from "@/lib/pageMetadata"
 import type { Metadata } from "next"
@@ -30,38 +17,14 @@ export async function generateMetadata({ params }: { params: Promise<{ locale: s
 
 export default async function Page({ params }: { params: Promise<{ locale: string }> }) {
     const { locale } = await params
-    if (!isSupportedLocale(locale)) {
-        notFound()
-    }
+    if (!isSupportedLocale(locale)) notFound()
 
     const page = await getLandingPage("main", locale)
-    const layout = page?.layout ?? []
-    const heroBlock = layout.find((block): block is HeroLayoutBlock => block.blockType === "hero") ?? null
-    const brandBlock = layout.find((block): block is BrandLayoutBlock => block.blockType === "brand") ?? null
-    const useCaseBlock = layout.find((block): block is UseCaseLayoutBlock => block.blockType === "usecase") ?? null
-    const faqBlock = layout.find((block): block is FaqLayoutBlock => block.blockType === "faq") ?? null
-    const ctaBlock = layout.find((block): block is CtaLayoutBlock => block.blockType === "cta") ?? null
-    const deploymentBlock = layout.find((block): block is DeploymentLayoutBlock => block.blockType === "deployment") ?? null
 
     return (
         <LandingContainer>
             <div className="h-12 lg:h-16" aria-hidden="true" />
-            <HeroSection content={heroBlock} />
-            <BrandSection content={brandBlock} />
-            <div className="h-32" aria-hidden="true" />
-            <UseCaseSection content={useCaseBlock} />
-            <div className="h-32" aria-hidden="true" />
-            <AppFeatureSection locale={locale} />
-            <div className="h-32" aria-hidden="true" />
-            <DeploymentSection content={deploymentBlock} />
-            <div className="h-32" aria-hidden="true" />
-            <RuntimeFeatureSection locale={locale} />
-            <div className="h-32" aria-hidden="true" />
-            <RoadmapSection locale={locale} />
-            <div className="h-32" aria-hidden="true" />
-            <FaqSection content={faqBlock} />
-            <div className="h-32" aria-hidden="true" />
-            <CtaSection content={ctaBlock} />
+            <PageBlocks blocks={page?.layout} locale={locale} />
         </LandingContainer>
     )
 }
diff --git a/src/blocks/EditionHeroBlock.ts b/src/blocks/EditionHeroBlock.ts
deleted file mode 100644
index 4bbafaca..00000000
--- a/src/blocks/EditionHeroBlock.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import type { Block } from "payload"
-
-export const EditionHeroBlock: Block = {
-  slug: "editionHero",
-  labels: {
-    singular: "Edition Hero",
-    plural: "Edition Hero Blocks",
-  },
-  fields: [
-    {
-      name: "heading",
-      type: "text",
-      required: true,
-      localized: true,
-    },
-    {
-      name: "texts",
-      label: "Texts",
-      type: "array",
-      required: false,
-      fields: [
-        {
-          name: "text",
-          type: "text",
-          required: true,
-          localized: true,
-        },
-      ],
-    },
-    {
-      name: "buttons",
-      label: "Buttons",
-      type: "array",
-      required: false,
-      maxRows: 3,
-      fields: [
-        {
-          name: "label",
-          type: "text",
-          required: true,
-          localized: true,
-        },
-        {
-          name: "url",
-          type: "text",
-          required: true,
-        },
-        {
-          name: "variant",
-          type: "select",
-          required: false,
-          defaultValue: "normal",
-          options: [
-            {
-              label: "None",
-              value: "none",
-            },
-            {
-              label: "Normal",
-              value: "normal",
-            },
-            {
-              label: "Outlined",
-              value: "outlined",
-            },
-            {
-              label: "Filled",
-              value: "filled",
-            },
-          ],
-        },
-      ],
-    },
-    {
-      name: "imageAlt",
-      type: "text",
-      required: true,
-      localized: true,
-    },
-  ],
-}
diff --git a/src/blocks/HeroBlock.ts b/src/blocks/HeroBlock.ts
index 485b444b..9e57e7e9 100644
--- a/src/blocks/HeroBlock.ts
+++ b/src/blocks/HeroBlock.ts
@@ -24,6 +24,39 @@ export const HeroBlock: Block = {
       required: true,
       localized: true,
     },
+    {
+      name: "centered",
+      label: "Centered layout",
+      type: "checkbox",
+      defaultValue: false,
+    },
+    {
+      name: "grainientColors",
+      label: "Grainient Colors",
+      type: "group",
+      fields: [
+        {
+          name: "color1",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "color2",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "color3",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "backgroundColor",
+          type: "text",
+          required: false,
+        },
+      ],
+    },
     {
       name: "texts",
       label: "Texts",
diff --git a/src/collections/pages.ts b/src/collections/pages.ts
index 17f4bd0f..4e62e369 100644
--- a/src/collections/pages.ts
+++ b/src/collections/pages.ts
@@ -6,7 +6,6 @@ import { ContactBlock } from "../blocks/ContactBlock"
 import { CtaBlock } from "../blocks/CtaBlock"
 import { DeploymentBlock } from "../blocks/DeploymentBlock"
 import { EditionFeaturesBlock } from "../blocks/EditionFeaturesBlock"
-import { EditionHeroBlock } from "../blocks/EditionHeroBlock"
 import { EditionInstallBlock } from "../blocks/EditionInstallBlock"
 import { FaqBlock } from "../blocks/FaqBlock"
 import { HeroBlock } from "../blocks/HeroBlock"
@@ -60,7 +59,7 @@ export const Pages: CollectionConfig = {
       name: "layout",
       label: "Layout",
       type: "blocks",
-      blocks: [HeroBlock, EditionHeroBlock, EditionFeaturesBlock, EditionInstallBlock, EditionUseCaseBlock, BrandBlock, UseCaseBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, DeploymentBlock],
+      blocks: [HeroBlock, EditionFeaturesBlock, EditionInstallBlock, EditionUseCaseBlock, BrandBlock, UseCaseBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, DeploymentBlock],
       required: false,
       localized: true,
     },
diff --git a/src/components/PageBlockRenderer.tsx b/src/components/PageBlockRenderer.tsx
new file mode 100644
index 00000000..9f42106b
--- /dev/null
+++ b/src/components/PageBlockRenderer.tsx
@@ -0,0 +1,60 @@
+import { BrandSection } from "@/components/sections/BrandSection"
+import { CtaSection } from "@/components/sections/CtaSection"
+import { DeploymentSection } from "@/components/sections/DeploymentSection"
+import { EditionFeatureSection } from "@/components/sections/EditionFeatureSection"
+import { EditionInstallSection } from "@/components/sections/EditionInstallSection"
+import { EditionUseCaseSection } from "@/components/sections/EditionUseCaseSection"
+import { FaqSection } from "@/components/sections/FaqSection"
+import { HeroSection } from "@/components/sections/HeroSection"
+import { UseCaseSection } from "@/components/sections/UseCaseSection"
+import type { AppLocale } from "@/lib/i18n"
+import type { Page } from "@/payload-types"
+import React from "react"
+
+type PageBlock = NonNullable<Page["layout"]>[number]
+
+interface PageBlocksRendererProps {
+    blocks?: PageBlock[] | null
+    ctaFloating?: boolean
+    locale?: AppLocale
+}
+
+function renderPageBlock(block: PageBlock, options: Pick<PageBlocksRendererProps, "ctaFloating" | "locale">) {
+    switch (block.blockType) {
+        case "hero":
+            return <HeroSection content={block} />
+        case "brand":
+            return <BrandSection content={block} />
+        case "usecase":
+            return <UseCaseSection content={block} />
+        case "deployment":
+            return <DeploymentSection content={block} />
+        case "faq":
+            return <FaqSection content={block} />
+        case "cta":
+            return <CtaSection content={block} floatingCta={options.ctaFloating} locale={options.locale} />
+        case "editionFeatures":
+            return <EditionFeatureSection content={block} />
+        case "editionInstall":
+            return <EditionInstallSection content={block} />
+        case "editionUseCases":
+            return <EditionUseCaseSection content={block} />
+        default:
+            return null
+    }
+}
+
+export function PageBlocks({ blocks, ctaFloating = false, locale }: PageBlocksRendererProps) {
+    const renderableBlocks = blocks?.filter((block) => renderPageBlock(block, { ctaFloating, locale }) !== null) ?? []
+
+    return (
+        <>
+            {renderableBlocks.map((block, index) => (
+                <React.Fragment key={block.id ?? index}>
+                    {index > 0 && <div className="h-32" aria-hidden="true" />}
+                    {renderPageBlock(block, { ctaFloating, locale })}
+                </React.Fragment>
+            ))}
+        </>
+    )
+}
diff --git a/src/components/sections/EditionHeroSection.tsx b/src/components/sections/EditionHeroSection.tsx
deleted file mode 100644
index 27effa86..00000000
--- a/src/components/sections/EditionHeroSection.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-"use client"
-
-import { Section } from "@/components/ui/Section"
-import type { EditionHeroLayoutBlock } from "@/lib/cms"
-import { cn } from "@/lib/utils"
-import { m as motion, type Variants } from "motion/react"
-import Image from "next/image"
-import React from "react"
-import Grainient from "../ui/Granient"
-import { HapticButtonLink } from "../ui/HapticButtonLink"
-
-type EditionHeroSectionProps = {
-    content?: EditionHeroLayoutBlock | null
-    imageSrc?: string
-    locale: "en" | "de"
-    grainientColors?: {
-        color1: string
-        color2: string
-        color3: string
-        backgroundColor?: string
-    }
-}
-
-export function EditionHeroSection({
-    content,
-    imageSrc = "/code0_software.png",
-    locale,
-    grainientColors,
-}: EditionHeroSectionProps) {
-    if (!content?.heading || !content?.imageAlt) return null
-
-    const texts = content.texts?.map((item) => item.text).filter(Boolean) ?? []
-    const buttons = content.buttons?.filter((button) => Boolean(button.label && button.url)) ?? []
-
-    const staggerContainer: Variants = {
-        hidden: {},
-        show: {
-            transition: {
-                staggerChildren: 0.08,
-                delayChildren: 0,
-            },
-        },
-    }
-
-    const staggerItem: Variants = {
-        hidden: { opacity: 0, y: 12 },
-        show: {
-            opacity: 1,
-            y: 0,
-            transition: { duration: 0.3, ease: [0.22, 1, 0.36, 1] },
-        },
-    }
-
-    return (
-        <Section showBlur={false} showFunnel={false}>
-            <div className="glass-card-shell relative isolate h-[min(85svh,918px)] md:h-[min(85dvh,918px)] rounded-4xl bg-[linear-gradient(180deg,rgba(255,255,255,0.05),rgba(255,255,255,0.02))]! shadow-[0_24px_80px_rgba(0,0,0,0.34)]!">
-                <Grainient {...grainientColors} />
-
-                <motion.div
-                    className="relative z-20 flex flex-col items-center justify-center gap-10 p-8 lg:p-16"
-                    variants={staggerContainer}
-                    initial="hidden"
-                    whileInView="show"
-                    viewport={{ once: true, amount: 0.25 }}
-                >
-                    <div className="flex w-full max-w-6xl flex-col items-center gap-4">
-                        <motion.h1 variants={staggerItem} className="relative z-10 text-balance text-3xl font-bold text-white lg:text-5xl text-center">
-                            {content.heading}
-                        </motion.h1>
-
-                        <motion.p variants={staggerItem} className="relative z-10 max-w-2xl text-base font-medium text-pretty text-white/75 lg:text-xl text-center">
-                            {texts.map((text, index) => (
-                                <React.Fragment key={`${text}-${index}`}>
-                                    {text}
-                                    {index < texts.length - 1 && <br />}
-                                </React.Fragment>
-                            ))}
-                        </motion.p>
-
-                        <motion.div variants={staggerItem} className="mt-4 flex w-full flex-col items-center gap-2 sm:w-auto sm:flex-row sm:flex-wrap sm:gap-4">
-                            {buttons.map((button, index) => (
-                                <HapticButtonLink
-                                    href={button.url}
-                                    key={`${button.label}-${index}`}
-                                    variant={button.variant ?? "normal"}
-                                    className={cn(button.variant === "filled" && "bg-white/80! text-primary! hover:bg-white!")}
-                                >
-                                    {button.label}
-                                </HapticButtonLink>
-                            ))}
-                        </motion.div>
-                    </div>
-
-                    <div className="w-full max-w-6xl">
-                        <div className="relative overflow-hidden rounded-2xl">
-                            <Image
-                                src={imageSrc}
-                                alt={content.imageAlt}
-                                height={620}
-                                width={1200}
-                                priority
-                                fetchPriority="high"
-                                sizes="(min-width: 1024px) 72rem, 100vw"
-                                className="rounded-2xl border border-white/10 shadow-[0_14px_38px_rgba(0,0,0,0.24)] ring-4 ring-white/5"
-                            />
-                        </div>
-                    </div>
-                </motion.div>
-            </div>
-        </Section>
-    )
-}
diff --git a/src/components/sections/HeroSection.tsx b/src/components/sections/HeroSection.tsx
index 90c61fa2..081a7b68 100644
--- a/src/components/sections/HeroSection.tsx
+++ b/src/components/sections/HeroSection.tsx
@@ -6,7 +6,7 @@ import { IconArrowRight } from "@tabler/icons-react"
 import { m as motion, type Variants } from "motion/react"
 import Image from "next/image"
 import Link from "next/link"
-import React from "react"
+import React, { useState } from "react"
 import Grainient from "../ui/Granient"
 import { HapticButtonLink } from "../ui/HapticButtonLink"
 import { StableBadge } from "../ui/StableBadge"
@@ -27,18 +27,26 @@ interface HeroSectionContent {
     badge?: string | null
     badge_link?: string | null
     heading?: string | null
+    centered?: boolean | null
+    grainientColors?: {
+        color1?: string | null
+        color2?: string | null
+        color3?: string | null
+        backgroundColor?: string | null
+    } | null
     texts?: HeroSectionText[] | null
     buttons?: HeroSectionButton[] | null
 }
 
 interface HeroSectionProps {
     content?: HeroSectionContent | null
+    imageSrc?: string
 }
 
-export const HeroSection: React.FC<HeroSectionProps> = ({ content }) => {
-    const [isProductHuntBadgeVisible, setIsProductHuntBadgeVisible] = React.useState(false)
+export const HeroSection: React.FC<HeroSectionProps> = ({ content, imageSrc = "/code0_software.png" }) => {
+    const [isProductHuntBadgeVisible, setIsProductHuntBadgeVisible] = useState(false)
 
-    if (!content || !content.texts || !content.buttons) return
+    if (!content?.heading) return
 
     const staggerContainer: Variants = {
         hidden: {},
@@ -59,6 +67,77 @@ export const HeroSection: React.FC<HeroSectionProps> = ({ content }) => {
         },
     }
 
+    const texts = content.texts?.map((item) => item.text).filter(Boolean) ?? []
+    const buttons = content.buttons?.filter((button) => Boolean(button.label && button.url)) ?? []
+    const centered = Boolean(content.centered)
+    const grainientColors = {
+        color1: content.grainientColors?.color1 ?? undefined,
+        color2: content.grainientColors?.color2 ?? undefined,
+        color3: content.grainientColors?.color3 ?? undefined,
+        backgroundColor: content.grainientColors?.backgroundColor ?? undefined,
+    }
+
+    if (centered) {
+        return (
+            <Section showBlur={false} showFunnel={false}>
+                <div className="glass-card-shell relative isolate h-[min(85svh,918px)] md:h-[min(85dvh,918px)] rounded-4xl bg-[linear-gradient(180deg,rgba(255,255,255,0.05),rgba(255,255,255,0.02))]! shadow-[0_24px_80px_rgba(0,0,0,0.34)]!">
+                    <Grainient {...grainientColors} />
+
+                    <motion.div
+                        className="relative z-20 flex flex-col items-center justify-center gap-10 p-8 lg:p-16"
+                        variants={staggerContainer}
+                        initial="hidden"
+                        whileInView="show"
+                        viewport={{ once: true, amount: 0.25 }}
+                    >
+                        <div className="flex w-full max-w-6xl flex-col items-center gap-4">
+                            <motion.h1 variants={staggerItem} className="relative z-10 text-balance text-3xl font-bold text-white lg:text-5xl text-center">
+                                {content.heading}
+                            </motion.h1>
+
+                            <motion.p variants={staggerItem} className="relative z-10 max-w-2xl text-base font-medium text-pretty text-white/75 lg:text-xl text-center">
+                                {texts.map((text, index) => (
+                                    <React.Fragment key={`${text}-${index}`}>
+                                        {text}
+                                        {index < texts.length - 1 && <br />}
+                                    </React.Fragment>
+                                ))}
+                            </motion.p>
+
+                            <motion.div variants={staggerItem} className="mt-4 flex w-full flex-col items-center gap-2 sm:w-auto sm:flex-row sm:flex-wrap sm:gap-4">
+                                {buttons.map((button, index) => (
+                                    <HapticButtonLink
+                                        href={button.url}
+                                        key={`${button.label}-${button.id ?? index}`}
+                                        variant={button.variant ?? "normal"}
+                                        className={cn(button.variant === "filled" && "bg-white/80! text-primary! hover:bg-white!")}
+                                    >
+                                        {button.label}
+                                    </HapticButtonLink>
+                                ))}
+                            </motion.div>
+                        </div>
+
+                        <div className="w-full max-w-6xl">
+                            <div className="relative overflow-hidden rounded-2xl">
+                                <Image
+                                    src={imageSrc}
+                                    alt={content.heading}
+                                    height={620}
+                                    width={1200}
+                                    priority
+                                    fetchPriority="high"
+                                    sizes="(min-width: 1024px) 72rem, 100vw"
+                                    className="rounded-2xl border border-white/10 shadow-[0_14px_38px_rgba(0,0,0,0.24)] ring-4 ring-white/5"
+                                />
+                            </div>
+                        </div>
+                    </motion.div>
+                </div>
+            </Section>
+        )
+    }
+
     return (
         <Section showBlur={false} showFunnel={false}>
             <div className="glass-card-shell relative isolate h-[min(85svh,918px)] md:h-[min(85dvh,918px)] rounded-4xl bg-[linear-gradient(180deg,rgba(255,255,255,0.05),rgba(255,255,255,0.02))]! shadow-[0_24px_80px_rgba(0,0,0,0.34)]!">
@@ -105,18 +184,18 @@ export const HeroSection: React.FC<HeroSectionProps> = ({ content }) => {
                         </motion.h1>
 
                         <motion.p variants={staggerItem} className="relative z-10 font-medium text-white/75 text-base lg:text-xl text-pretty">
-                            {content.texts.length > 0
-                                ? content.texts.map((item, index) => (
-                                    <React.Fragment key={`${item.id ?? item.text}-${index}`}>
-                                        {item.text}
-                                        {index < content.texts!!.length - 1 && <br />}
+                            {texts.length > 0
+                                ? texts.map((text, index) => (
+                                    <React.Fragment key={`${text}-${index}`}>
+                                        {text}
+                                        {index < texts.length - 1 && <br />}
                                     </React.Fragment>
                                 ))
                                 : <>Beschreibung1 <br /> Beschreibung2</>}
                         </motion.p>
 
                         <motion.div variants={staggerItem} className={"flex flex-col gap-2 sm:gap-4 mt-4"}>
-                            {content.buttons.map((button, index) => (
+                            {buttons.map((button, index) => (
                                 <HapticButtonLink
                                     href={button.url}
                                     key={`${button.label}-${button.id ?? index}`}
@@ -131,7 +210,7 @@ export const HeroSection: React.FC<HeroSectionProps> = ({ content }) => {
                     <div className="h-auto w-full lg:w-4/5 lg:-mr-56">
                         <div className="relative overflow-hidden rounded-2xl lg:rounded-l-2xl lg:rounded-r-none">
                             <Image
-                                src={"/code0_software.png"}
+                                src={imageSrc}
                                 alt={"Code= Example"}
                                 height={620}
                                 width={900}
diff --git a/src/lib/cms.ts b/src/lib/cms.ts
index c71dd55f..e9bf9dd4 100644
--- a/src/lib/cms.ts
+++ b/src/lib/cms.ts
@@ -11,7 +11,6 @@ const hasDatabaseUrl = Boolean(process.env.DATABASE_URL?.trim())
 type PageLayoutBlock = NonNullable<Page["layout"]>[number]
 
 export type HeroLayoutBlock = Extract<PageLayoutBlock, { blockType: "hero" }>
-export type EditionHeroLayoutBlock = Extract<PageLayoutBlock, { blockType: "editionHero" }>
 export type EditionFeaturesLayoutBlock = Extract<PageLayoutBlock, { blockType: "editionFeatures" }>
 export type EditionInstallLayoutBlock = Extract<PageLayoutBlock, { blockType: "editionInstall" }>
 export type EditionUseCaseLayoutBlock = Extract<PageLayoutBlock, { blockType: "editionUseCases" }>
diff --git a/src/migrations/20260427_010_remove_edition_hero_block.ts b/src/migrations/20260427_010_remove_edition_hero_block.ts
new file mode 100644
index 00000000..246830a9
--- /dev/null
+++ b/src/migrations/20260427_010_remove_edition_hero_block.ts
@@ -0,0 +1,149 @@
+import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
+
+export async function up({ db }: MigrateUpArgs): Promise<void> {
+  await db.execute(sql`
+    ALTER TABLE "pages_blocks_hero" ADD COLUMN IF NOT EXISTS "centered" boolean DEFAULT false;
+    ALTER TABLE "pages_blocks_hero" ADD COLUMN IF NOT EXISTS "grainient_colors_color1" varchar;
+    ALTER TABLE "pages_blocks_hero" ADD COLUMN IF NOT EXISTS "grainient_colors_color2" varchar;
+    ALTER TABLE "pages_blocks_hero" ADD COLUMN IF NOT EXISTS "grainient_colors_color3" varchar;
+    ALTER TABLE "pages_blocks_hero" ADD COLUMN IF NOT EXISTS "grainient_colors_background_color" varchar;
+
+    INSERT INTO "pages_blocks_hero" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      "centered",
+      "grainient_colors_color1",
+      "grainient_colors_color2",
+      "grainient_colors_color3",
+      "grainient_colors_background_color",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      true,
+      CASE WHEN "_path" LIKE '%community-edition%' THEN '#10213a' ELSE '#13102d' END,
+      CASE WHEN "_path" LIKE '%community-edition%' THEN '#f872e2' ELSE '#7472f8' END,
+      CASE WHEN "_path" LIKE '%community-edition%' THEN '#f8f172' ELSE '#72c9f8' END,
+      CASE WHEN "_path" LIKE '%community-edition%' THEN '#0b1324' ELSE '#140c22' END,
+      "block_name"
+    FROM "pages_blocks_edition_hero"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_hero_texts" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "text"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "text"
+    FROM "pages_blocks_edition_hero_texts"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_hero_buttons" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "label",
+      "url",
+      "variant"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "label",
+      "url",
+      "variant"::text::"enum_pages_blocks_hero_buttons_variant"
+    FROM "pages_blocks_edition_hero_buttons"
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_edition_hero_texts" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_hero_buttons" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_hero" CASCADE;
+    DROP TYPE IF EXISTS "public"."enum_pages_blocks_edition_hero_buttons_variant";
+  `)
+}
+
+export async function down({ db }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+    ALTER TABLE "pages_blocks_hero" DROP COLUMN IF EXISTS "grainient_colors_background_color";
+    ALTER TABLE "pages_blocks_hero" DROP COLUMN IF EXISTS "grainient_colors_color3";
+    ALTER TABLE "pages_blocks_hero" DROP COLUMN IF EXISTS "grainient_colors_color2";
+    ALTER TABLE "pages_blocks_hero" DROP COLUMN IF EXISTS "grainient_colors_color1";
+    ALTER TABLE "pages_blocks_hero" DROP COLUMN IF EXISTS "centered";
+
+    CREATE TYPE "public"."enum_pages_blocks_edition_hero_buttons_variant" AS ENUM('none', 'normal', 'outlined', 'filled');
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_hero" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "heading" varchar NOT NULL,
+      "image_alt" varchar DEFAULT '' NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_hero_texts" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "text" varchar NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_hero_buttons" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "label" varchar NOT NULL,
+      "url" varchar NOT NULL,
+      "variant" "enum_pages_blocks_edition_hero_buttons_variant" DEFAULT 'normal'
+    );
+
+    ALTER TABLE "pages_blocks_edition_hero"
+      ADD CONSTRAINT "pages_blocks_edition_hero_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_hero_texts"
+      ADD CONSTRAINT "pages_blocks_edition_hero_texts_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_edition_hero"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_hero_buttons"
+      ADD CONSTRAINT "pages_blocks_edition_hero_buttons_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_edition_hero"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_order_idx" ON "pages_blocks_edition_hero" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_parent_id_idx" ON "pages_blocks_edition_hero" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_path_idx" ON "pages_blocks_edition_hero" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_locale_idx" ON "pages_blocks_edition_hero" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_texts_order_idx" ON "pages_blocks_edition_hero_texts" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_texts_parent_id_idx" ON "pages_blocks_edition_hero_texts" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_texts_locale_idx" ON "pages_blocks_edition_hero_texts" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_buttons_order_idx" ON "pages_blocks_edition_hero_buttons" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_buttons_parent_id_idx" ON "pages_blocks_edition_hero_buttons" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_hero_buttons_locale_idx" ON "pages_blocks_edition_hero_buttons" USING btree ("_locale");
+  `)
+}
diff --git a/src/migrations/index.ts b/src/migrations/index.ts
index 31277611..f1f21361 100644
--- a/src/migrations/index.ts
+++ b/src/migrations/index.ts
@@ -9,6 +9,7 @@ import * as migration_20260412_174023_006_contact_page_description from './20260
 import * as migration_20260415_025537_007_subscription_workflow_executions from './20260415_025537_007_subscription_workflow_executions';
 import * as migration_20260425_134031_009_actions from './20260425_134031_009_actions';
 import * as migration_20260424_151900_008_footer_contact_legal_fields from './20260424_151900_008_footer_contact_legal_fields';
+import * as migration_20260427_010_remove_edition_hero_block from './20260427_010_remove_edition_hero_block';
 
 export const migrations = [
   {
@@ -66,4 +67,9 @@ export const migrations = [
     down: migration_20260424_151900_008_footer_contact_legal_fields.down,
     name: '20260424_151900_008_footer_contact_legal_fields'
   },
+  {
+    up: migration_20260427_010_remove_edition_hero_block.up,
+    down: migration_20260427_010_remove_edition_hero_block.down,
+    name: '20260427_010_remove_edition_hero_block'
+  },
 ];
diff --git a/src/payload-types.ts b/src/payload-types.ts
index 711bdfcb..d205ef9d 100644
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -363,6 +363,13 @@ export interface Page {
             badge?: string | null;
             badge_link?: string | null;
             heading: string;
+            centered?: boolean | null;
+            grainientColors?: {
+              color1?: string | null;
+              color2?: string | null;
+              color3?: string | null;
+              backgroundColor?: string | null;
+            };
             texts?:
               | {
                   text: string;
@@ -381,27 +388,6 @@ export interface Page {
             blockName?: string | null;
             blockType: 'hero';
           }
-        | {
-            heading: string;
-            texts?:
-              | {
-                  text: string;
-                  id?: string | null;
-                }[]
-              | null;
-            buttons?:
-              | {
-                  label: string;
-                  url: string;
-                  variant?: ('none' | 'normal' | 'outlined' | 'filled') | null;
-                  id?: string | null;
-                }[]
-              | null;
-            imageAlt: string;
-            id?: string | null;
-            blockName?: string | null;
-            blockType: 'editionHero';
-          }
         | {
             features: {
               label: string;
@@ -1382,27 +1368,15 @@ export interface PagesSelect<T extends boolean = true> {
               badge?: T;
               badge_link?: T;
               heading?: T;
-              texts?:
+              centered?: T;
+              grainientColors?:
                 | T
                 | {
-                    text?: T;
-                    id?: T;
-                  };
-              buttons?:
-                | T
-                | {
-                    label?: T;
-                    url?: T;
-                    variant?: T;
-                    id?: T;
+                    color1?: T;
+                    color2?: T;
+                    color3?: T;
+                    backgroundColor?: T;
                   };
-              id?: T;
-              blockName?: T;
-            };
-        editionHero?:
-          | T
-          | {
-              heading?: T;
               texts?:
                 | T
                 | {
@@ -1417,7 +1391,6 @@ export interface PagesSelect<T extends boolean = true> {
                     variant?: T;
                     id?: T;
                   };
-              imageAlt?: T;
               id?: T;
               blockName?: T;
             };
diff --git a/tsconfig.json b/tsconfig.json
index 133fb883..ee923a47 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -39,6 +39,7 @@
     ".next/dev/types/**/*.ts"
   ],
   "exclude": [
-    "node_modules"
+    "node_modules",
+    ".next/dev"
   ]
 }

From 6055862f5bd5a4776761a67493d2329c25f6c811 Mon Sep 17 00:00:00 2001
From: Marius Ahsmus <marius.ahsmus@gmail.com>
Date: Tue, 28 Apr 2026 21:00:14 +0200
Subject: [PATCH 02/11] feat: renamed sections & blocks

---
 src/app/(landing)/[locale]/page.tsx           |  13 +-
 .../{UseCaseBlock.ts => CardRowBlock.ts}      |  42 +--
 src/blocks/DeploymentBlock.ts                 | 101 ------
 ...EditionInstallBlock.ts => InstallBlock.ts} |   8 +-
 ...onFeaturesBlock.ts => OffsetCardsBlock.ts} |  18 +-
 ...itionUseCaseBlock.ts => SwipeCardBlock.ts} |  38 +-
 src/collections/pages.ts                      |  11 +-
 src/collections/sections.ts                   |   4 +
 src/components/PageBlockRenderer.tsx          |  38 +-
 src/components/sections/CardRowSection.tsx    | 112 ++++++
 src/components/sections/DeploymentSection.tsx | 123 -------
 .../sections/EditionFeatureSection.tsx        | 139 -------
 ...nInstallSection.tsx => InstallSection.tsx} |   8 +-
 ...CaseSection.tsx => OffsetCardsSection.tsx} |  36 +-
 ...seCaseSection.tsx => SwipeCardSection.tsx} |  53 ++-
 src/lib/cms.ts                                |   9 +-
 src/migrations/20260428_011_card_row_block.ts | 230 ++++++++++++
 .../20260428_012_offset_cards_block.ts        | 342 ++++++++++++++++++
 ...0428_013_install_and_swipe_cards_blocks.ts | 299 +++++++++++++++
 src/migrations/index.ts                       |  18 +
 src/payload-types.ts                          | 130 ++-----
 21 files changed, 1180 insertions(+), 592 deletions(-)
 rename src/blocks/{UseCaseBlock.ts => CardRowBlock.ts} (61%)
 delete mode 100644 src/blocks/DeploymentBlock.ts
 rename src/blocks/{EditionInstallBlock.ts => InstallBlock.ts} (78%)
 rename src/blocks/{EditionFeaturesBlock.ts => OffsetCardsBlock.ts} (80%)
 rename src/blocks/{EditionUseCaseBlock.ts => SwipeCardBlock.ts} (67%)
 create mode 100644 src/components/sections/CardRowSection.tsx
 delete mode 100644 src/components/sections/DeploymentSection.tsx
 delete mode 100644 src/components/sections/EditionFeatureSection.tsx
 rename src/components/sections/{EditionInstallSection.tsx => InstallSection.tsx} (95%)
 rename src/components/sections/{UseCaseSection.tsx => OffsetCardsSection.tsx} (85%)
 rename src/components/sections/{EditionUseCaseSection.tsx => SwipeCardSection.tsx} (78%)
 create mode 100644 src/migrations/20260428_011_card_row_block.ts
 create mode 100644 src/migrations/20260428_012_offset_cards_block.ts
 create mode 100644 src/migrations/20260428_013_install_and_swipe_cards_blocks.ts

diff --git a/src/app/(landing)/[locale]/page.tsx b/src/app/(landing)/[locale]/page.tsx
index e65f3ece..79aeb142 100644
--- a/src/app/(landing)/[locale]/page.tsx
+++ b/src/app/(landing)/[locale]/page.tsx
@@ -1,5 +1,6 @@
-import { LandingContainer } from "@/components/ui/LandingContainer"
+import { DeploymentImage } from "@/components/DeploymentImage"
 import { PageBlocks } from "@/components/PageBlockRenderer"
+import { LandingContainer } from "@/components/ui/LandingContainer"
 import { getLandingPage } from "@/lib/cms"
 import { isSupportedLocale, SUPPORTED_LOCALES } from "@/lib/i18n"
 import { getLandingPageMetadata } from "@/lib/pageMetadata"
@@ -24,7 +25,15 @@ export default async function Page({ params }: { params: Promise<{ locale: strin
     return (
         <LandingContainer>
             <div className="h-12 lg:h-16" aria-hidden="true" />
-            <PageBlocks blocks={page?.layout} locale={locale} />
+            <PageBlocks
+                blocks={page?.layout}
+                locale={locale}
+                cardRowChildren={[
+                    <DeploymentImage key="cloud" color="aqua" icon="cloud" text="Cloud" />,
+                    <DeploymentImage key="selfhost" color="pink" icon="server" text="Selfhost" />,
+                    <DeploymentImage key="dynamic" color="brand" icon="cloud-computing" text="Dynamic" />,
+                ]}
+            />
         </LandingContainer>
     )
 }
diff --git a/src/blocks/UseCaseBlock.ts b/src/blocks/CardRowBlock.ts
similarity index 61%
rename from src/blocks/UseCaseBlock.ts
rename to src/blocks/CardRowBlock.ts
index 6f187f56..ac8de114 100644
--- a/src/blocks/UseCaseBlock.ts
+++ b/src/blocks/CardRowBlock.ts
@@ -1,24 +1,18 @@
 import type { Block } from "payload"
 
-export const UseCaseBlock: Block = {
-  slug: "usecase",
+export const CardRowBlock: Block = {
+  slug: "cardRow",
   labels: {
-    singular: "Use Case",
-    plural: "Use Case Blocks",
+    singular: "Card Row",
+    plural: "Card Rows",
   },
   fields: [
     {
-      name: "useCases",
-      label: "Use Cases",
+      name: "cards",
+      label: "Cards",
       type: "array",
-      required: true,
+      required: false,
       fields: [
-        {
-          name: "label",
-          type: "text",
-          required: true,
-          localized: true,
-        },
         {
           name: "title",
           type: "text",
@@ -28,27 +22,11 @@ export const UseCaseBlock: Block = {
         {
           name: "description",
           type: "textarea",
-          required: true,
-          localized: true,
-        },
-        {
-          name: "image",
-          label: "Image",
-          type: "upload",
-          relationTo: "media",
-          required: false,
-        },
-        {
-          name: "bulletPoints",
-          label: "Bullet Points",
-          type: "text",
           required: false,
-          hasMany: true,
           localized: true,
         },
         {
           name: "link",
-          label: "Link",
           type: "group",
           fields: [
             {
@@ -64,6 +42,12 @@ export const UseCaseBlock: Block = {
             },
           ],
         },
+        {
+          name: "image",
+          type: "upload",
+          relationTo: "media",
+          required: false,
+        },
       ],
     },
   ],
diff --git a/src/blocks/DeploymentBlock.ts b/src/blocks/DeploymentBlock.ts
deleted file mode 100644
index e7412e0d..00000000
--- a/src/blocks/DeploymentBlock.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import type { Block } from "payload"
-
-export const DeploymentBlock: Block = {
-  slug: "deployment",
-  labels: {
-    singular: "Deployment",
-    plural: "Deployment Blocks",
-  },
-  fields: [
-    {
-      name: "cloudTitle",
-      type: "text",
-      required: false,
-      localized: true,
-    },
-    {
-      name: "cloudDescription",
-      type: "textarea",
-      required: false,
-      localized: true,
-    },
-    {
-      name: "cloudLink",
-      label: "Cloud Link",
-      type: "group",
-      fields: [
-        {
-          name: "label",
-          type: "text",
-          required: false,
-          localized: true,
-        },
-        {
-          name: "url",
-          type: "text",
-          required: false,
-        },
-      ],
-    },
-    {
-      name: "selfhostTitle",
-      type: "text",
-      required: false,
-      localized: true,
-    },
-    {
-      name: "selfhostDescription",
-      type: "textarea",
-      required: false,
-      localized: true,
-    },
-    {
-      name: "selfhostLink",
-      label: "Selfhost Link",
-      type: "group",
-      fields: [
-        {
-          name: "label",
-          type: "text",
-          required: false,
-          localized: true,
-        },
-        {
-          name: "url",
-          type: "text",
-          required: false,
-        },
-      ],
-    },
-    {
-      name: "dynamicTitle",
-      type: "text",
-      required: false,
-      localized: true,
-    },
-    {
-      name: "dynamicDescription",
-      type: "textarea",
-      required: false,
-      localized: true,
-    },
-    {
-      name: "dynamicLink",
-      label: "Dynamic Link",
-      type: "group",
-      fields: [
-        {
-          name: "label",
-          type: "text",
-          required: false,
-          localized: true,
-        },
-        {
-          name: "url",
-          type: "text",
-          required: false,
-        },
-      ],
-    },
-  ],
-}
diff --git a/src/blocks/EditionInstallBlock.ts b/src/blocks/InstallBlock.ts
similarity index 78%
rename from src/blocks/EditionInstallBlock.ts
rename to src/blocks/InstallBlock.ts
index df76cce3..7a2bc955 100644
--- a/src/blocks/EditionInstallBlock.ts
+++ b/src/blocks/InstallBlock.ts
@@ -1,10 +1,10 @@
 import type { Block } from "payload"
 
-export const EditionInstallBlock: Block = {
-  slug: "editionInstall",
+export const InstallBlock: Block = {
+  slug: "install",
   labels: {
-    singular: "Edition Install",
-    plural: "Edition Install Blocks",
+    singular: "Install",
+    plural: "Install Blocks",
   },
   fields: [
     {
diff --git a/src/blocks/EditionFeaturesBlock.ts b/src/blocks/OffsetCardsBlock.ts
similarity index 80%
rename from src/blocks/EditionFeaturesBlock.ts
rename to src/blocks/OffsetCardsBlock.ts
index 85332192..a120e086 100644
--- a/src/blocks/EditionFeaturesBlock.ts
+++ b/src/blocks/OffsetCardsBlock.ts
@@ -1,15 +1,21 @@
 import type { Block } from "payload"
 
-export const EditionFeaturesBlock: Block = {
-  slug: "editionFeatures",
+export const OffsetCardsBlock: Block = {
+  slug: "offsetCards",
   labels: {
-    singular: "Edition Feature",
-    plural: "Edition Feature Blocks",
+    singular: "Offset Cards",
+    plural: "Offset Cards Blocks",
   },
   fields: [
     {
-      name: "features",
-      label: "Features",
+      name: "showSectionHeader",
+      label: "Show Section Header",
+      type: "checkbox",
+      defaultValue: false,
+    },
+    {
+      name: "cards",
+      label: "Cards",
       type: "array",
       required: true,
       fields: [
diff --git a/src/blocks/EditionUseCaseBlock.ts b/src/blocks/SwipeCardBlock.ts
similarity index 67%
rename from src/blocks/EditionUseCaseBlock.ts
rename to src/blocks/SwipeCardBlock.ts
index b9d7514e..7f6e55a6 100644
--- a/src/blocks/EditionUseCaseBlock.ts
+++ b/src/blocks/SwipeCardBlock.ts
@@ -1,27 +1,27 @@
 import type { Block } from "payload"
 
-export const EditionUseCaseBlock: Block = {
-  slug: "editionUseCases",
+export const SwipeCardBlock: Block = {
+  slug: "swipeCards",
   labels: {
-    singular: "Edition UseCases",
-    plural: "Edition UseCase Blocks",
+    singular: "Swipe Cards",
+    plural: "Swipe Cards Blocks",
   },
-    fields: [
-        {
-          name: "heading",
-          type: "text",
-          required: true,
-          localized: true,
-        },
-        {
-          name: "subheading",
-          type: "textarea",
-          required: true,
-          localized: true,
-        },
+  fields: [
+    {
+      name: "heading",
+      type: "text",
+      required: true,
+      localized: true,
+    },
+    {
+      name: "subheading",
+      type: "textarea",
+      required: true,
+      localized: true,
+    },
     {
-      name: "useCases",
-      label: "UseCases",
+      name: "cards",
+      label: "Cards",
       type: "array",
       required: true,
       fields: [
diff --git a/src/collections/pages.ts b/src/collections/pages.ts
index 4e62e369..fcf77bcf 100644
--- a/src/collections/pages.ts
+++ b/src/collections/pages.ts
@@ -1,17 +1,16 @@
 import { ActionBlock } from "@/blocks/ActionBlock"
-import { EditionUseCaseBlock } from "@/blocks/EditionUseCaseBlock"
+import { SwipeCardBlock } from "@/blocks/SwipeCardBlock"
 import { BlogBlock } from "../blocks/BlogBlock"
 import { BrandBlock } from "../blocks/BrandBlock"
+import { CardRowBlock } from "../blocks/CardRowBlock"
 import { ContactBlock } from "../blocks/ContactBlock"
 import { CtaBlock } from "../blocks/CtaBlock"
-import { DeploymentBlock } from "../blocks/DeploymentBlock"
-import { EditionFeaturesBlock } from "../blocks/EditionFeaturesBlock"
-import { EditionInstallBlock } from "../blocks/EditionInstallBlock"
 import { FaqBlock } from "../blocks/FaqBlock"
 import { HeroBlock } from "../blocks/HeroBlock"
+import { InstallBlock } from "../blocks/InstallBlock"
 import { JobsBlock } from "../blocks/JobsBlock"
 import { MarkdownBlock } from "../blocks/MarkdownBlock"
-import { UseCaseBlock } from "../blocks/UseCaseBlock"
+import { OffsetCardsBlock } from "../blocks/OffsetCardsBlock"
 import type { CollectionConfig } from "payload"
 
 export const Pages: CollectionConfig = {
@@ -59,7 +58,7 @@ export const Pages: CollectionConfig = {
       name: "layout",
       label: "Layout",
       type: "blocks",
-      blocks: [HeroBlock, EditionFeaturesBlock, EditionInstallBlock, EditionUseCaseBlock, BrandBlock, UseCaseBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, DeploymentBlock],
+      blocks: [HeroBlock, OffsetCardsBlock, InstallBlock, SwipeCardBlock, BrandBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, CardRowBlock],
       required: false,
       localized: true,
     },
diff --git a/src/collections/sections.ts b/src/collections/sections.ts
index e7c26cf2..71865708 100644
--- a/src/collections/sections.ts
+++ b/src/collections/sections.ts
@@ -48,6 +48,10 @@ export const Sections: CollectionConfig = {
                     label: 'DeploymentSection',
                     value: 'DeploymentSection',
                 },
+                {
+                    label: 'CardRowSection',
+                    value: 'CardRowSection',
+                },
             ],
         },
         {
diff --git a/src/components/PageBlockRenderer.tsx b/src/components/PageBlockRenderer.tsx
index 9f42106b..33ae46df 100644
--- a/src/components/PageBlockRenderer.tsx
+++ b/src/components/PageBlockRenderer.tsx
@@ -1,58 +1,56 @@
 import { BrandSection } from "@/components/sections/BrandSection"
+import { CardRowSection } from "@/components/sections/CardRowSection"
 import { CtaSection } from "@/components/sections/CtaSection"
-import { DeploymentSection } from "@/components/sections/DeploymentSection"
-import { EditionFeatureSection } from "@/components/sections/EditionFeatureSection"
-import { EditionInstallSection } from "@/components/sections/EditionInstallSection"
-import { EditionUseCaseSection } from "@/components/sections/EditionUseCaseSection"
 import { FaqSection } from "@/components/sections/FaqSection"
 import { HeroSection } from "@/components/sections/HeroSection"
-import { UseCaseSection } from "@/components/sections/UseCaseSection"
+import { InstallSection } from "@/components/sections/InstallSection"
+import { OffsetCardsSection } from "@/components/sections/OffsetCardsSection"
+import { SwipeCardSection } from "@/components/sections/SwipeCardSection"
 import type { AppLocale } from "@/lib/i18n"
 import type { Page } from "@/payload-types"
-import React from "react"
+import React, { type ReactNode } from "react"
 
 type PageBlock = NonNullable<Page["layout"]>[number]
 
 interface PageBlocksRendererProps {
     blocks?: PageBlock[] | null
+    cardRowChildren?: ReactNode
     ctaFloating?: boolean
     locale?: AppLocale
 }
 
-function renderPageBlock(block: PageBlock, options: Pick<PageBlocksRendererProps, "ctaFloating" | "locale">) {
+function renderPageBlock(block: PageBlock, options: Pick<PageBlocksRendererProps, "cardRowChildren" | "ctaFloating" | "locale">) {
     switch (block.blockType) {
         case "hero":
             return <HeroSection content={block} />
         case "brand":
             return <BrandSection content={block} />
-        case "usecase":
-            return <UseCaseSection content={block} />
-        case "deployment":
-            return <DeploymentSection content={block} />
+        case "offsetCards":
+            return <OffsetCardsSection content={block} />
+        case "cardRow":
+            return <CardRowSection content={block}>{options.cardRowChildren}</CardRowSection>
         case "faq":
             return <FaqSection content={block} />
         case "cta":
             return <CtaSection content={block} floatingCta={options.ctaFloating} locale={options.locale} />
-        case "editionFeatures":
-            return <EditionFeatureSection content={block} />
-        case "editionInstall":
-            return <EditionInstallSection content={block} />
-        case "editionUseCases":
-            return <EditionUseCaseSection content={block} />
+        case "install":
+            return <InstallSection content={block} />
+        case "swipeCards":
+            return <SwipeCardSection content={block} />
         default:
             return null
     }
 }
 
-export function PageBlocks({ blocks, ctaFloating = false, locale }: PageBlocksRendererProps) {
-    const renderableBlocks = blocks?.filter((block) => renderPageBlock(block, { ctaFloating, locale }) !== null) ?? []
+export function PageBlocks({ blocks, cardRowChildren, ctaFloating = false, locale }: PageBlocksRendererProps) {
+    const renderableBlocks = blocks?.filter((block) => renderPageBlock(block, { cardRowChildren, ctaFloating, locale }) !== null) ?? []
 
     return (
         <>
             {renderableBlocks.map((block, index) => (
                 <React.Fragment key={block.id ?? index}>
                     {index > 0 && <div className="h-32" aria-hidden="true" />}
-                    {renderPageBlock(block, { ctaFloating, locale })}
+                    {renderPageBlock(block, { cardRowChildren, ctaFloating, locale })}
                 </React.Fragment>
             ))}
         </>
diff --git a/src/components/sections/CardRowSection.tsx b/src/components/sections/CardRowSection.tsx
new file mode 100644
index 00000000..1185da14
--- /dev/null
+++ b/src/components/sections/CardRowSection.tsx
@@ -0,0 +1,112 @@
+"use client"
+
+import { LinkButton } from "@/components/ui/LinkButton"
+import { Section } from "@/components/ui/Section"
+import type { Media } from "@/payload-types"
+import { m as motion, type Variants } from "motion/react"
+import Image from "next/image"
+import React, { Children, type ReactNode } from "react"
+
+interface CardRowCard {
+    title?: string | null
+    description?: string | null
+    link?: {
+        label?: string | null
+        url?: string | null
+    } | null
+    image?: number | Media | null
+    id?: string | null
+}
+
+interface CardRowSectionContent {
+    cards?: CardRowCard[] | null
+}
+
+interface CardRowSectionProps {
+    content?: CardRowSectionContent | null
+    children?: ReactNode
+}
+
+function getImageUrl(image: CardRowCard["image"]) {
+    return typeof image === "object" && image?.url ? image.url : null
+}
+
+export const CardRowSection: React.FC<CardRowSectionProps> = ({ content, children }) => {
+    const cards = content?.cards?.filter((card) => Boolean(card.title)) ?? []
+    const fallbackImages = Children.toArray(children)
+    if (cards.length === 0) return null
+
+    const staggerContainer: Variants = {
+        hidden: {},
+        show: {
+            transition: {
+                staggerChildren: 0.12,
+                delayChildren: 0.08,
+            },
+        },
+    }
+
+    const staggerItem: Variants = {
+        hidden: { opacity: 0, y: 20 },
+        show: {
+            opacity: 1,
+            y: 0,
+            transition: {
+                duration: 0.42,
+                ease: [0.22, 1, 0.36, 1],
+            },
+        },
+    }
+
+    return (
+        <Section sectionType="CardRowSection" funnelType="left" animationPreset="zoom-in">
+            <div aria-hidden="true" className="pointer-events-none absolute -bottom-40 -top-16 inset-x-0 [background:radial-gradient(circle,rgba(114,201,248,0.1),transparent_50%)]" />
+
+            <motion.div
+                className="grid grid-cols-1 gap-16 lg:grid-cols-3 lg:gap-8 z-10"
+                variants={staggerContainer}
+                initial="hidden"
+                whileInView="show"
+                viewport={{ once: true, amount: 0.2 }}
+            >
+                {cards.map((card, index) => {
+                    const mediaImage = typeof card.image === "object" ? card.image : null
+                    const imageUrl = getImageUrl(card.image)
+                    const fallbackImage = fallbackImages[index]
+
+                    return (
+                        <motion.article
+                            key={card.id ?? `${card.title}-${index}`}
+                            variants={staggerItem}
+                            className="glass-card-shell group flex h-full flex-col rounded-[1.75rem] p-2 shadow-[0_18px_60px_rgba(0,0,0,0.28)] transition-transform before:pointer-events-none before:absolute before:inset-1px before:rounded-[calc(1.75rem-1px)] before:border before:border-white/6 before:content-['']"
+                        >
+                            <div aria-hidden="true" className="glass-card-topline" />
+
+                            {imageUrl ? (
+                                <div className="relative aspect-[243.476/160] overflow-hidden rounded-[1.2rem] border border-white/8 bg-primary/40">
+                                    <Image
+                                        src={imageUrl}
+                                        alt={mediaImage?.alt ?? card.title ?? ""}
+                                        fill
+                                        sizes="(min-width: 1024px) 33vw, 100vw"
+                                        className="object-cover"
+                                    />
+                                </div>
+                            ) : fallbackImage}
+
+                            <div className="relative z-10 flex h-full flex-1 flex-col px-2 pb-2 pt-4">
+                                <h3 className="text-xl font-semibold text-white">{card.title}</h3>
+                                {card.description && <p className="mt-2 text-sm text-white/75">{card.description}</p>}
+                                {card.link?.url && (
+                                    <LinkButton href={card.link.url} className="mt-auto pt-4">
+                                        {card.link.label}
+                                    </LinkButton>
+                                )}
+                            </div>
+                        </motion.article>
+                    )
+                })}
+            </motion.div>
+        </Section>
+    )
+}
diff --git a/src/components/sections/DeploymentSection.tsx b/src/components/sections/DeploymentSection.tsx
deleted file mode 100644
index aabd4701..00000000
--- a/src/components/sections/DeploymentSection.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-"use client"
-
-import { Section } from "@/components/ui/Section"
-import { LinkButton } from "@/components/ui/LinkButton"
-import { m as motion, type Variants } from "motion/react"
-import React from "react"
-import { DeploymentImage } from "../DeploymentImage"
-
-interface DeploymentSectionContent {
-    cloudTitle?: string | null
-    cloudDescription?: string | null
-    cloudLink?: {
-        label?: string | null
-        url?: string | null
-    }
-    selfhostTitle?: string | null
-    selfhostDescription?: string | null
-    selfhostLink?: {
-        label?: string | null
-        url?: string | null
-    }
-    dynamicTitle?: string | null
-    dynamicDescription?: string | null
-    dynamicLink?: {
-        label?: string | null
-        url?: string | null
-    }
-}
-
-interface DeploymentSectionProps {
-    content?: DeploymentSectionContent | null
-}
-
-export const DeploymentSection: React.FC<DeploymentSectionProps> = ({ content }) => {
-    if (!content) return null
-
-    const staggerContainer: Variants = {
-        hidden: {},
-        show: {
-            transition: {
-                staggerChildren: 0.12,
-                delayChildren: 0.08,
-            },
-        },
-    }
-
-    const staggerItem: Variants = {
-        hidden: { opacity: 0, y: 20 },
-        show: {
-            opacity: 1,
-            y: 0,
-            transition: {
-                duration: 0.42,
-                ease: [0.22, 1, 0.36, 1],
-            },
-        },
-    }
-
-    const deploymentCards = [
-        {
-            badge: "Cloud",
-            title: content.cloudTitle,
-            description: content.cloudDescription,
-            link: content.cloudLink,
-            imageColor: "aqua",
-            imageIcon: "cloud",
-            imageText: "Cloud",
-        },
-        {
-            badge: "Self-hosted",
-            title: content.selfhostTitle,
-            description: content.selfhostDescription,
-            link: content.selfhostLink,
-            imageColor: "pink",
-            imageIcon: "server",
-            imageText: "Selfhost",
-        },
-        {
-            badge: "Dynamic",
-            title: content.dynamicTitle,
-            description: content.dynamicDescription,
-            link: content.dynamicLink,
-            imageColor: "brand",
-            imageIcon: "cloud-computing",
-            imageText: "Dynamic",
-        },
-    ] as const
-
-    return (
-        <Section sectionType="DeploymentSection" funnelType="left" animationPreset="zoom-in">
-            <div aria-hidden="true" className="pointer-events-none absolute -bottom-40 -top-16 inset-x-0 [background:radial-gradient(circle,rgba(114,201,248,0.1),transparent_50%)]" />
-
-            <motion.div
-                className="grid grid-cols-1 gap-16 lg:grid-cols-3 lg:gap-8 z-10"
-                variants={staggerContainer}
-                initial="hidden"
-                whileInView="show"
-                viewport={{ once: true, amount: 0.2 }}
-            >
-                {deploymentCards.map((card) => (
-                    <motion.article
-                        key={card.badge}
-                        variants={staggerItem}
-                        className="glass-card-shell group flex h-full flex-col rounded-[1.75rem] p-2 shadow-[0_18px_60px_rgba(0,0,0,0.28)] transition-transform before:pointer-events-none before:absolute before:inset-1px before:rounded-[calc(1.75rem-1px)] before:border before:border-white/6 before:content-['']"
-                    >
-                        <div aria-hidden="true" className="glass-card-topline" />
-
-                        <DeploymentImage color={card.imageColor} icon={card.imageIcon} text={card.imageText} />
-                        <div className="relative z-10 flex h-full flex-1 flex-col px-2 pb-2 pt-4">
-                            <h3 className="text-xl font-semibold text-white">{card.title}</h3>
-                            <p className="mt-2 text-sm text-white/75">{card.description}</p>
-                            {card.link?.url && (
-                                <LinkButton href={card.link.url} className="mt-auto pt-4">
-                                    {card.link.label}
-                                </LinkButton>
-                            )}
-                        </div>
-                    </motion.article>
-                ))}
-            </motion.div>
-        </Section>
-    )
-}
diff --git a/src/components/sections/EditionFeatureSection.tsx b/src/components/sections/EditionFeatureSection.tsx
deleted file mode 100644
index 2ca98f81..00000000
--- a/src/components/sections/EditionFeatureSection.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-"use client"
-
-import { LinkButton } from "@/components/ui/LinkButton"
-import { Section } from "@/components/ui/Section"
-import type { EditionFeaturesLayoutBlock } from "@/lib/cms"
-import { ANIMATION_PRESETS, type AnimationPreset } from "@/lib/utils"
-import type { Media } from "@/payload-types"
-import { m as motion, type Variants } from "motion/react"
-import Image from "next/image"
-import React from "react"
-
-interface EditionFeatureSectionProps {
-    content?: EditionFeaturesLayoutBlock | null
-}
-
-const EDITION_FEATURE_ANIMATION_SEQUENCE: Exclude<AnimationPreset, "none">[] = [
-    "slide-left",
-    "slide-right",
-    "slide-left",
-]
-
-export const EditionFeatureSection: React.FC<EditionFeatureSectionProps> = ({ content }) => {
-    if (!content?.features?.length) return null
-
-    const staggerContainer: Variants = {
-        hidden: {},
-        show: {
-            transition: {
-                staggerChildren: 0.08,
-                delayChildren: 0.06,
-            },
-        },
-    }
-
-    const staggerItem: Variants = {
-        hidden: { opacity: 0, y: 14 },
-        show: {
-            opacity: 1,
-            y: 0,
-            transition: {
-                duration: 0.38,
-                ease: [0.22, 1, 0.36, 1],
-            },
-        },
-    }
-
-    return (
-        <Section showBlur={false} showFunnel={false} animationPreset="none">
-            <div className="relative flex w-full flex-col items-stretch gap-32">
-                {content.features.map((item, index) => {
-                    const animationPreset = EDITION_FEATURE_ANIMATION_SEQUENCE[index % EDITION_FEATURE_ANIMATION_SEQUENCE.length]
-                    const animationConfig = ANIMATION_PRESETS[animationPreset]
-                    const image = item.image as Media
-
-                    return (
-                        <motion.div
-                            key={item.id ?? item.label}
-                            className={`flex w-full flex-col items-center gap-8 ${index % 2 === 0 ? "lg:flex-row" : "lg:flex-row-reverse"}`}
-                            initial={animationConfig.initial}
-                            whileInView={animationConfig.whileInView}
-                            viewport={{ once: true, amount: 0.2 }}
-                            transition={{
-                                ...animationConfig.transition,
-                                delay: index * 0.08,
-                            }}
-                        >
-                            <motion.div
-                                className="mt-4 hidden w-1/2 px-2 pb-2 text-center lg:block lg:text-left"
-                                variants={staggerContainer}
-                                initial="hidden"
-                                whileInView="show"
-                                viewport={{ once: true, amount: 0.35 }}
-                            >
-                                <motion.p variants={staggerItem} className="text-xl font-semibold text-white lg:text-3xl">{item.title}</motion.p>
-                                <motion.p variants={staggerItem} className="mt-3 max-w-xl text-sm leading-7 text-white/75 lg:text-base">{item.description}</motion.p>
-                                {item.bulletPoints?.length ? (
-                                    <motion.ul variants={staggerItem} className="mt-5 space-y-2.5 text-sm text-white/80 lg:text-base">
-                                        {item.bulletPoints.map((point, pointIndex) => (
-                                            <li key={`${item.id ?? item.label}-point-${pointIndex}`} className="flex items-center gap-2">
-                                                <span className="h-1.5 w-1.5 shrink-0 rounded-full bg-brand" />
-                                                <span>{point}</span>
-                                            </li>
-                                        ))}
-                                    </motion.ul>
-                                ) : null}
-                                {item.link?.label && item.link?.url ? (
-                                    <motion.div variants={staggerItem} className="mt-5">
-                                        <LinkButton href={item.link.url}>
-                                            {item.link.label}
-                                        </LinkButton>
-                                    </motion.div>
-                                ) : null}
-                            </motion.div>
-                            <div className="glass-card-shell aspect-video w-full lg:w-2/3">
-                                <div aria-hidden="true" className="glass-card-topline" />
-                                {image?.url ? (
-                                    <Image
-                                        src={image.url}
-                                        alt={image.alt ?? item.title}
-                                        fill
-                                        sizes="(min-width: 768px) 66vw, 100vw"
-                                        className="object-contain"
-                                    />
-                                ) : null}
-                            </div>
-                            <motion.div
-                                className="w-full px-2 pb-2 text-left lg:hidden lg:text-center"
-                                variants={staggerContainer}
-                                initial="hidden"
-                                whileInView="show"
-                                viewport={{ once: true, amount: 0.35 }}
-                            >
-                                <motion.p variants={staggerItem} className="text-xl font-semibold tracking-tight text-white">{item.title}</motion.p>
-                                <motion.p variants={staggerItem} className="mt-3 text-sm leading-7 text-white/75">{item.description}</motion.p>
-                                {item.bulletPoints?.length ? (
-                                    <motion.ul variants={staggerItem} className="mt-5 space-y-2.5 text-left text-sm text-white/80">
-                                        {item.bulletPoints.map((point, pointIndex) => (
-                                            <li key={`${item.id ?? item.label}-mobile-point-${pointIndex}`} className="flex items-start gap-3">
-                                                <span className="mt-2 h-1.5 w-1.5 shrink-0 rounded-full bg-brand" />
-                                                <span>{point}</span>
-                                            </li>
-                                        ))}
-                                    </motion.ul>
-                                ) : null}
-                                {item.link?.label && item.link?.url ? (
-                                    <motion.div variants={staggerItem} className="mt-5">
-                                        <LinkButton href={item.link.url}>
-                                            {item.link.label}
-                                        </LinkButton>
-                                    </motion.div>
-                                ) : null}
-                            </motion.div>
-                        </motion.div>
-                    )
-                })}
-            </div>
-        </Section>
-    )
-}
diff --git a/src/components/sections/EditionInstallSection.tsx b/src/components/sections/InstallSection.tsx
similarity index 95%
rename from src/components/sections/EditionInstallSection.tsx
rename to src/components/sections/InstallSection.tsx
index ba8a1882..d9b56bb3 100644
--- a/src/components/sections/EditionInstallSection.tsx
+++ b/src/components/sections/InstallSection.tsx
@@ -2,16 +2,16 @@
 
 import { DotBackground } from "@/components/ui/DotBackground"
 import { Section } from "@/components/ui/Section"
-import type { EditionInstallLayoutBlock } from "@/lib/cms"
+import type { InstallLayoutBlock } from "@/lib/cms"
 import { IconCheck, IconCopy } from "@tabler/icons-react"
 import { AnimatePresence, m as motion, type Variants } from "motion/react"
 import { useEffect, useState } from "react"
 
-type EditionInstallSectionProps = {
-    content?: EditionInstallLayoutBlock | null
+type InstallSectionProps = {
+    content?: InstallLayoutBlock | null
 }
 
-export function EditionInstallSection({ content }: EditionInstallSectionProps) {
+export function InstallSection({ content }: InstallSectionProps) {
     const [copied, setCopied] = useState(false)
 
     if (!content?.heading || !content.subheading || !content.code) return null
diff --git a/src/components/sections/UseCaseSection.tsx b/src/components/sections/OffsetCardsSection.tsx
similarity index 85%
rename from src/components/sections/UseCaseSection.tsx
rename to src/components/sections/OffsetCardsSection.tsx
index e672f295..b513bb91 100644
--- a/src/components/sections/UseCaseSection.tsx
+++ b/src/components/sections/OffsetCardsSection.tsx
@@ -8,7 +8,7 @@ import { m as motion, type Variants } from "motion/react"
 import Image from "next/image"
 import React from "react"
 
-interface UseCaseItem {
+interface OffsetCardItem {
     label: string
     title: string
     description: string
@@ -21,22 +21,23 @@ interface UseCaseItem {
     id?: string | null
 }
 
-interface UseCaseSectionContent {
-    useCases: UseCaseItem[] | null
+interface OffsetCardsSectionContent {
+    showSectionHeader?: boolean | null
+    cards: OffsetCardItem[] | null
 }
 
-interface UseCaseSectionProps {
-    content?: UseCaseSectionContent | null
+interface OffsetCardsSectionProps {
+    content?: OffsetCardsSectionContent | null
 }
 
-const USE_CASE_ANIMATION_SEQUENCE: Exclude<AnimationPreset, "none">[] = [
+const OFFSET_CARD_ANIMATION_SEQUENCE: Exclude<AnimationPreset, "none">[] = [
     "slide-left",
     "slide-right",
-    "slide-left"
+    "slide-left",
 ]
 
-export const UseCaseSection: React.FC<UseCaseSectionProps> = ({ content }) => {
-    if (!content?.useCases?.length) return null
+export const OffsetCardsSection: React.FC<OffsetCardsSectionProps> = ({ content }) => {
+    if (!content?.cards?.length) return null
 
     const staggerContainer: Variants = {
         hidden: {},
@@ -61,17 +62,22 @@ export const UseCaseSection: React.FC<UseCaseSectionProps> = ({ content }) => {
     }
 
     return (
-        <Section sectionType="UseCaseSection" showBlur={false} animationPreset="none">
-            <div className="relative w-full flex flex-col items-stretch gap-32">
-                {content.useCases.map((item, index) => {
-                    const animationPreset = USE_CASE_ANIMATION_SEQUENCE[index % USE_CASE_ANIMATION_SEQUENCE.length]
+        <Section
+            sectionType={content.showSectionHeader ? "UseCaseSection" : undefined}
+            showBlur={false}
+            showFunnel={Boolean(content.showSectionHeader)}
+            animationPreset="none"
+        >
+            <div className="relative flex w-full flex-col items-stretch gap-32">
+                {content.cards.map((item, index) => {
+                    const animationPreset = OFFSET_CARD_ANIMATION_SEQUENCE[index % OFFSET_CARD_ANIMATION_SEQUENCE.length]
                     const animationConfig = ANIMATION_PRESETS[animationPreset]
                     const image = item.image as Media
 
                     return (
                         <motion.div
                             key={item.id ?? item.label}
-                            className={`w-full flex flex-col items-center gap-8 ${index % 2 === 0 ? "lg:flex-row" : "lg:flex-row-reverse"}`}
+                            className={`flex w-full flex-col items-center gap-8 ${index % 2 === 0 ? "lg:flex-row" : "lg:flex-row-reverse"}`}
                             initial={animationConfig.initial}
                             whileInView={animationConfig.whileInView}
                             viewport={{ once: true, amount: 0.2 }}
@@ -107,7 +113,7 @@ export const UseCaseSection: React.FC<UseCaseSectionProps> = ({ content }) => {
                                     </motion.div>
                                 ) : null}
                             </motion.div>
-                            <div className="glass-card-shell w-full lg:w-2/3 aspect-video">
+                            <div className="glass-card-shell aspect-video w-full lg:w-2/3">
                                 <div aria-hidden="true" className="glass-card-topline" />
                                 {image?.url ? (
                                     <Image
diff --git a/src/components/sections/EditionUseCaseSection.tsx b/src/components/sections/SwipeCardSection.tsx
similarity index 78%
rename from src/components/sections/EditionUseCaseSection.tsx
rename to src/components/sections/SwipeCardSection.tsx
index 01e4a565..73752834 100644
--- a/src/components/sections/EditionUseCaseSection.tsx
+++ b/src/components/sections/SwipeCardSection.tsx
@@ -1,36 +1,35 @@
 "use client"
 
-import { useState } from "react"
-import { Section } from "@/components/ui/Section"
-import type { EditionUseCaseLayoutBlock } from "@/lib/cms"
-import { Media } from "@/payload-types"
 import { EditionUseCaseCard } from "@/components/cards/EditionUseCaseCard"
+import { Section } from "@/components/ui/Section"
 import { cn } from "@/lib/utils"
+import type { SwipeCardsLayoutBlock } from "@/lib/cms"
 import { Button } from "@code0-tech/pictor"
 import { IconChevronLeft, IconChevronRight } from "@tabler/icons-react"
-import { useWebHaptics } from "web-haptics/react"
 import { m as motion, type PanInfo, type Variants } from "motion/react"
+import { useState } from "react"
+import { useWebHaptics } from "web-haptics/react"
 
-interface EditionUseCaseSectionProps {
-    content?: EditionUseCaseLayoutBlock | null
+interface SwipeCardSectionProps {
+    content?: SwipeCardsLayoutBlock | null
 }
 
-export function EditionUseCaseSection({ content }: EditionUseCaseSectionProps) {
+export function SwipeCardSection({ content }: SwipeCardSectionProps) {
     const [focusedIndex, setFocusedIndex] = useState(0)
     const { trigger } = useWebHaptics()
 
-    if (!content?.heading || !content?.subheading || !content?.useCases?.length) return null
+    if (!content?.heading || !content?.subheading || !content?.cards?.length) return null
 
-    const useCases = content.useCases
+    const cards = content.cards
 
     const handlePrevious = () => {
         trigger("light")
-        setFocusedIndex((prev) => (prev === 0 ? useCases.length - 1 : prev - 1))
+        setFocusedIndex((prev) => (prev === 0 ? cards.length - 1 : prev - 1))
     }
 
     const handleNext = () => {
         trigger("light")
-        setFocusedIndex((prev) => (prev === useCases.length - 1 ? 0 : prev + 1))
+        setFocusedIndex((prev) => (prev === cards.length - 1 ? 0 : prev + 1))
     }
 
     const handleDragEnd = (_event: MouseEvent | TouchEvent | PointerEvent, info: PanInfo) => {
@@ -106,7 +105,7 @@ export function EditionUseCaseSection({ content }: EditionUseCaseSectionProps) {
                             onClick={handlePrevious}
                             variant="filled"
                             className="absolute left-0 z-20 shrink-0 size-12! rounded-full! p-0!"
-                            aria-label="Previous use case"
+                            aria-label="Previous card"
                         >
                             <IconChevronLeft className="size-6 mr-0.5" />
                         </Button>
@@ -118,41 +117,39 @@ export function EditionUseCaseSection({ content }: EditionUseCaseSectionProps) {
                             dragElastic={0.08}
                             onDragEnd={handleDragEnd}
                         >
-                            <div
-                                className="relative flex w-full items-stretch justify-center"
-                            >
+                            <div className="relative flex w-full items-stretch justify-center">
                                 <div className="w-full max-w-full md:max-w-md opacity-0 pointer-events-none">
                                     <EditionUseCaseCard
-                                        title={useCases[focusedIndex]?.title ?? ""}
-                                        description={useCases[focusedIndex]?.description ?? ""}
-                                        image={useCases[focusedIndex]?.image}
-                                        link={useCases[focusedIndex]?.link}
+                                        title={cards[focusedIndex]?.title ?? ""}
+                                        description={cards[focusedIndex]?.description ?? ""}
+                                        image={cards[focusedIndex]?.image}
+                                        link={cards[focusedIndex]?.link}
                                         isFocused
                                     />
                                 </div>
-                                {useCases.map((useCase, index) => {
+                                {cards.map((card, index) => {
                                     const offset = index - focusedIndex
                                     const isVisibleMobile = offset === 0
                                     const isVisibleDesktop = Math.abs(offset) <= 1
 
                                     return (
                                         <div
-                                            key={useCase.id || index}
+                                            key={card.id || index}
                                             className={cn(
                                                 "absolute top-0 w-full transition-all duration-500 ease-out",
                                                 "max-w-full md:max-w-md",
                                                 !isVisibleMobile && "lg:opacity-100 lg:pointer-events-auto opacity-0 pointer-events-none",
-                                                !isVisibleDesktop && "lg:opacity-0 lg:pointer-events-none"
+                                                !isVisibleDesktop && "lg:opacity-0 lg:pointer-events-none",
                                             )}
                                             style={{
                                                 transform: `translateX(${offset * 110}%)`,
                                             }}
                                         >
                                             <EditionUseCaseCard
-                                                title={useCase.title}
-                                                description={useCase.description}
-                                                image={useCase.image}
-                                                link={useCase.link}
+                                                title={card.title}
+                                                description={card.description}
+                                                image={card.image}
+                                                link={card.link}
                                                 isFocused={index === focusedIndex}
                                             />
                                         </div>
@@ -165,7 +162,7 @@ export function EditionUseCaseSection({ content }: EditionUseCaseSectionProps) {
                             onClick={handleNext}
                             variant="filled"
                             className="absolute right-0 z-20 shrink-0 size-12! rounded-full! p-0!"
-                            aria-label="Next use case"
+                            aria-label="Next card"
                         >
                             <IconChevronRight className="size-6 ml-0.5" />
                         </Button>
diff --git a/src/lib/cms.ts b/src/lib/cms.ts
index e9bf9dd4..4c86bac2 100644
--- a/src/lib/cms.ts
+++ b/src/lib/cms.ts
@@ -11,14 +11,13 @@ const hasDatabaseUrl = Boolean(process.env.DATABASE_URL?.trim())
 type PageLayoutBlock = NonNullable<Page["layout"]>[number]
 
 export type HeroLayoutBlock = Extract<PageLayoutBlock, { blockType: "hero" }>
-export type EditionFeaturesLayoutBlock = Extract<PageLayoutBlock, { blockType: "editionFeatures" }>
-export type EditionInstallLayoutBlock = Extract<PageLayoutBlock, { blockType: "editionInstall" }>
-export type EditionUseCaseLayoutBlock = Extract<PageLayoutBlock, { blockType: "editionUseCases" }>
+export type OffsetCardsLayoutBlock = Extract<PageLayoutBlock, { blockType: "offsetCards" }>
+export type InstallLayoutBlock = Extract<PageLayoutBlock, { blockType: "install" }>
+export type SwipeCardsLayoutBlock = Extract<PageLayoutBlock, { blockType: "swipeCards" }>
 export type BrandLayoutBlock = Extract<PageLayoutBlock, { blockType: "brand" }>
 export type CtaLayoutBlock = Extract<PageLayoutBlock, { blockType: "cta" }>
 export type FaqLayoutBlock = Extract<PageLayoutBlock, { blockType: "faq" }>
-export type UseCaseLayoutBlock = Extract<PageLayoutBlock, { blockType: "usecase" }>
-export type DeploymentLayoutBlock = Extract<PageLayoutBlock, { blockType: "deployment" }>
+export type CardRowLayoutBlock = Extract<PageLayoutBlock, { blockType: "cardRow" }>
 export type JobsLayoutBlock = Extract<PageLayoutBlock, { blockType: "jobs" }>
 export type ActionsLayoutBlock = Extract<PageLayoutBlock, { blockType: "actions" }>
 export type MarkdownLayoutBlock = Extract<PageLayoutBlock, { blockType: "markdown" }>
diff --git a/src/migrations/20260428_011_card_row_block.ts b/src/migrations/20260428_011_card_row_block.ts
new file mode 100644
index 00000000..8a7998b7
--- /dev/null
+++ b/src/migrations/20260428_011_card_row_block.ts
@@ -0,0 +1,230 @@
+import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
+
+export async function up({ db }: MigrateUpArgs): Promise<void> {
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_card_row" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_card_row_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar,
+      "link_label" varchar,
+      "link_url" varchar,
+      "image_id" integer
+    );
+
+    ALTER TABLE "pages_blocks_card_row"
+      ADD CONSTRAINT "pages_blocks_card_row_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_card_row_cards"
+      ADD CONSTRAINT "pages_blocks_card_row_cards_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_card_row_cards"
+      ADD CONSTRAINT "pages_blocks_card_row_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_card_row"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_order_idx" ON "pages_blocks_card_row" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_parent_id_idx" ON "pages_blocks_card_row" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_path_idx" ON "pages_blocks_card_row" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_locale_idx" ON "pages_blocks_card_row" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_order_idx" ON "pages_blocks_card_row_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_parent_id_idx" ON "pages_blocks_card_row_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_locale_idx" ON "pages_blocks_card_row_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_image_idx" ON "pages_blocks_card_row_cards" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_card_row" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "block_name"
+    FROM "pages_blocks_deployment"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_card_row_cards" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "title",
+      "description",
+      "link_label",
+      "link_url"
+    )
+    SELECT
+      0,
+      "id",
+      "_locale",
+      "id" || '-cloud',
+      COALESCE("cloud_title", ''),
+      "cloud_description",
+      "cloud_link_label",
+      "cloud_link_url"
+    FROM "pages_blocks_deployment"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_card_row_cards" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "title",
+      "description",
+      "link_label",
+      "link_url"
+    )
+    SELECT
+      1,
+      "id",
+      "_locale",
+      "id" || '-selfhost',
+      COALESCE("selfhost_title", ''),
+      "selfhost_description",
+      "selfhost_link_label",
+      "selfhost_link_url"
+    FROM "pages_blocks_deployment"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_card_row_cards" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "title",
+      "description",
+      "link_label",
+      "link_url"
+    )
+    SELECT
+      2,
+      "id",
+      "_locale",
+      "id" || '-dynamic',
+      COALESCE("dynamic_title", ''),
+      "dynamic_description",
+      "dynamic_link_label",
+      "dynamic_link_url"
+    FROM "pages_blocks_deployment"
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_deployment" CASCADE;
+
+    UPDATE "sections"
+    SET "section_type" = 'CardRowSection'
+    WHERE "section_type" = 'DeploymentSection';
+  `)
+}
+
+export async function down({ db }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_deployment" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "cloud_title" varchar,
+      "cloud_description" varchar,
+      "cloud_link_label" varchar,
+      "cloud_link_url" varchar,
+      "selfhost_title" varchar,
+      "selfhost_description" varchar,
+      "selfhost_link_label" varchar,
+      "selfhost_link_url" varchar,
+      "dynamic_title" varchar,
+      "dynamic_description" varchar,
+      "dynamic_link_label" varchar,
+      "dynamic_link_url" varchar,
+      "block_name" varchar
+    );
+
+    ALTER TABLE "pages_blocks_deployment"
+      ADD CONSTRAINT "pages_blocks_deployment_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_order_idx" ON "pages_blocks_deployment" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_parent_id_idx" ON "pages_blocks_deployment" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_path_idx" ON "pages_blocks_deployment" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_locale_idx" ON "pages_blocks_deployment" USING btree ("_locale");
+
+    INSERT INTO "pages_blocks_deployment" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "cloud_title",
+      "cloud_description",
+      "cloud_link_label",
+      "cloud_link_url",
+      "selfhost_title",
+      "selfhost_description",
+      "selfhost_link_label",
+      "selfhost_link_url",
+      "dynamic_title",
+      "dynamic_description",
+      "dynamic_link_label",
+      "dynamic_link_url",
+      "block_name"
+    )
+    SELECT
+      card_row."_order",
+      card_row."_parent_id",
+      card_row."_path",
+      card_row."_locale",
+      card_row."id",
+      cloud."title",
+      cloud."description",
+      cloud."link_label",
+      cloud."link_url",
+      selfhost."title",
+      selfhost."description",
+      selfhost."link_label",
+      selfhost."link_url",
+      dynamic."title",
+      dynamic."description",
+      dynamic."link_label",
+      dynamic."link_url",
+      card_row."block_name"
+    FROM "pages_blocks_card_row" card_row
+    LEFT JOIN "pages_blocks_card_row_cards" cloud
+      ON cloud."_parent_id" = card_row."id" AND cloud."_order" = 0
+    LEFT JOIN "pages_blocks_card_row_cards" selfhost
+      ON selfhost."_parent_id" = card_row."id" AND selfhost."_order" = 1
+    LEFT JOIN "pages_blocks_card_row_cards" dynamic
+      ON dynamic."_parent_id" = card_row."id" AND dynamic."_order" = 2
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_card_row_cards" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_card_row" CASCADE;
+
+    UPDATE "sections"
+    SET "section_type" = 'DeploymentSection'
+    WHERE "section_type" = 'CardRowSection';
+  `)
+}
diff --git a/src/migrations/20260428_012_offset_cards_block.ts b/src/migrations/20260428_012_offset_cards_block.ts
new file mode 100644
index 00000000..3177423e
--- /dev/null
+++ b/src/migrations/20260428_012_offset_cards_block.ts
@@ -0,0 +1,342 @@
+import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
+
+export async function up({ db }: MigrateUpArgs): Promise<void> {
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_offset_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "show_section_header" boolean DEFAULT false,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_offset_cards_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "label" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "bullet_points" jsonb,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_offset_cards"
+      ADD CONSTRAINT "pages_blocks_offset_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_offset_cards_cards"
+      ADD CONSTRAINT "pages_blocks_offset_cards_cards_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_offset_cards_cards"
+      ADD CONSTRAINT "pages_blocks_offset_cards_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_offset_cards"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_order_idx" ON "pages_blocks_offset_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_parent_id_idx" ON "pages_blocks_offset_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_path_idx" ON "pages_blocks_offset_cards" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_locale_idx" ON "pages_blocks_offset_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_order_idx" ON "pages_blocks_offset_cards_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_parent_id_idx" ON "pages_blocks_offset_cards_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_locale_idx" ON "pages_blocks_offset_cards_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_image_idx" ON "pages_blocks_offset_cards_cards" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_offset_cards" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "show_section_header",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      true,
+      "block_name"
+    FROM "pages_blocks_usecase"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_offset_cards_cards" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "label",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "label",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    FROM "pages_blocks_usecase_use_cases"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_offset_cards" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "show_section_header",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      false,
+      "block_name"
+    FROM "pages_blocks_edition_features"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_offset_cards_cards" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "label",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "label",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    FROM "pages_blocks_edition_features_features"
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_usecase_use_cases" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_usecase" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_features_features" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_features" CASCADE;
+  `)
+}
+
+export async function down({ db }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_usecase" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_usecase_use_cases" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "label" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_features" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_features_features" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "label" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_usecase"
+      ADD CONSTRAINT "pages_blocks_usecase_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_usecase_use_cases"
+      ADD CONSTRAINT "pages_blocks_usecase_use_cases_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_usecase_use_cases"
+      ADD CONSTRAINT "pages_blocks_usecase_use_cases_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_usecase"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_features"
+      ADD CONSTRAINT "pages_blocks_edition_features_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_features_features"
+      ADD CONSTRAINT "pages_blocks_edition_features_features_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_features_features"
+      ADD CONSTRAINT "pages_blocks_edition_features_features_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_edition_features"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_order_idx" ON "pages_blocks_usecase" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_parent_id_idx" ON "pages_blocks_usecase" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_path_idx" ON "pages_blocks_usecase" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_locale_idx" ON "pages_blocks_usecase" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_order_idx" ON "pages_blocks_usecase_use_cases" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_parent_id_idx" ON "pages_blocks_usecase_use_cases" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_locale_idx" ON "pages_blocks_usecase_use_cases" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_image_idx" ON "pages_blocks_usecase_use_cases" USING btree ("image_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_order_idx" ON "pages_blocks_edition_features" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_parent_id_idx" ON "pages_blocks_edition_features" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_path_idx" ON "pages_blocks_edition_features" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_locale_idx" ON "pages_blocks_edition_features" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_order_idx" ON "pages_blocks_edition_features_features" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_parent_id_idx" ON "pages_blocks_edition_features_features" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_locale_idx" ON "pages_blocks_edition_features_features" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_image_idx" ON "pages_blocks_edition_features_features" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_usecase" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "block_name"
+    FROM "pages_blocks_offset_cards"
+    WHERE "show_section_header" = true
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_usecase_use_cases" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "label",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    )
+    SELECT
+      card."_order",
+      card."_parent_id",
+      card."_locale",
+      card."id",
+      card."label",
+      card."title",
+      card."description",
+      card."image_id",
+      card."link_label",
+      card."link_url"
+    FROM "pages_blocks_offset_cards_cards" card
+    INNER JOIN "pages_blocks_offset_cards" block ON block."id" = card."_parent_id"
+    WHERE block."show_section_header" = true
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_edition_features" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "block_name"
+    FROM "pages_blocks_offset_cards"
+    WHERE COALESCE("show_section_header", false) = false
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_edition_features_features" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "label",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    )
+    SELECT
+      card."_order",
+      card."_parent_id",
+      card."_locale",
+      card."id",
+      card."label",
+      card."title",
+      card."description",
+      card."image_id",
+      card."link_label",
+      card."link_url"
+    FROM "pages_blocks_offset_cards_cards" card
+    INNER JOIN "pages_blocks_offset_cards" block ON block."id" = card."_parent_id"
+    WHERE COALESCE(block."show_section_header", false) = false
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_offset_cards_cards" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_offset_cards" CASCADE;
+  `)
+}
diff --git a/src/migrations/20260428_013_install_and_swipe_cards_blocks.ts b/src/migrations/20260428_013_install_and_swipe_cards_blocks.ts
new file mode 100644
index 00000000..9f749beb
--- /dev/null
+++ b/src/migrations/20260428_013_install_and_swipe_cards_blocks.ts
@@ -0,0 +1,299 @@
+import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
+
+export async function up({ db }: MigrateUpArgs): Promise<void> {
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_install" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "heading" varchar NOT NULL,
+      "subheading" varchar NOT NULL,
+      "label" varchar,
+      "code" varchar NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_swipe_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "heading" varchar NOT NULL,
+      "subheading" varchar NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_swipe_cards_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_install"
+      ADD CONSTRAINT "pages_blocks_install_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_swipe_cards"
+      ADD CONSTRAINT "pages_blocks_swipe_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_swipe_cards_cards"
+      ADD CONSTRAINT "pages_blocks_swipe_cards_cards_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_swipe_cards_cards"
+      ADD CONSTRAINT "pages_blocks_swipe_cards_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_swipe_cards"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_install_order_idx" ON "pages_blocks_install" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_install_parent_id_idx" ON "pages_blocks_install" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_install_path_idx" ON "pages_blocks_install" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_install_locale_idx" ON "pages_blocks_install" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_order_idx" ON "pages_blocks_swipe_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_parent_id_idx" ON "pages_blocks_swipe_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_path_idx" ON "pages_blocks_swipe_cards" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_locale_idx" ON "pages_blocks_swipe_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_order_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_parent_id_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_locale_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_image_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_install" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      "subheading",
+      "label",
+      "code",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      "subheading",
+      "label",
+      "code",
+      "block_name"
+    FROM "pages_blocks_edition_install"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_swipe_cards" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      "subheading",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      "subheading",
+      "block_name"
+    FROM "pages_blocks_edition_use_cases"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_swipe_cards_cards" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    FROM "pages_blocks_edition_use_cases_use_cases"
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_edition_install" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_use_cases_use_cases" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_use_cases" CASCADE;
+  `)
+}
+
+export async function down({ db }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_install" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "heading" varchar NOT NULL,
+      "subheading" varchar NOT NULL,
+      "label" varchar,
+      "code" varchar NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_use_cases" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "heading" varchar NOT NULL,
+      "subheading" varchar NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_edition_install"
+      ADD CONSTRAINT "pages_blocks_edition_install_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_use_cases"
+      ADD CONSTRAINT "pages_blocks_edition_use_cases_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_use_cases_use_cases"
+      ADD CONSTRAINT "pages_blocks_edition_use_cases_use_cases_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_use_cases_use_cases"
+      ADD CONSTRAINT "pages_blocks_edition_use_cases_use_cases_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_edition_use_cases"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_order_idx" ON "pages_blocks_edition_install" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_parent_id_idx" ON "pages_blocks_edition_install" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_path_idx" ON "pages_blocks_edition_install" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_locale_idx" ON "pages_blocks_edition_install" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_order_idx" ON "pages_blocks_edition_use_cases" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_parent_id_idx" ON "pages_blocks_edition_use_cases" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_path_idx" ON "pages_blocks_edition_use_cases" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_locale_idx" ON "pages_blocks_edition_use_cases" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_order_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_parent_id_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_locale_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_image_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_edition_install" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      "subheading",
+      "label",
+      "code",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      "subheading",
+      "label",
+      "code",
+      "block_name"
+    FROM "pages_blocks_install"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_edition_use_cases" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      "subheading",
+      "block_name"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id",
+      "heading",
+      "subheading",
+      "block_name"
+    FROM "pages_blocks_swipe_cards"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_edition_use_cases_use_cases" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    )
+    SELECT
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "title",
+      "description",
+      "image_id",
+      "link_label",
+      "link_url"
+    FROM "pages_blocks_swipe_cards_cards"
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_swipe_cards_cards" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_swipe_cards" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_install" CASCADE;
+  `)
+}
diff --git a/src/migrations/index.ts b/src/migrations/index.ts
index f1f21361..54ec8508 100644
--- a/src/migrations/index.ts
+++ b/src/migrations/index.ts
@@ -10,6 +10,9 @@ import * as migration_20260415_025537_007_subscription_workflow_executions from
 import * as migration_20260425_134031_009_actions from './20260425_134031_009_actions';
 import * as migration_20260424_151900_008_footer_contact_legal_fields from './20260424_151900_008_footer_contact_legal_fields';
 import * as migration_20260427_010_remove_edition_hero_block from './20260427_010_remove_edition_hero_block';
+import * as migration_20260428_011_card_row_block from './20260428_011_card_row_block';
+import * as migration_20260428_012_offset_cards_block from './20260428_012_offset_cards_block';
+import * as migration_20260428_013_install_and_swipe_cards_blocks from './20260428_013_install_and_swipe_cards_blocks';
 
 export const migrations = [
   {
@@ -72,4 +75,19 @@ export const migrations = [
     down: migration_20260427_010_remove_edition_hero_block.down,
     name: '20260427_010_remove_edition_hero_block'
   },
+  {
+    up: migration_20260428_011_card_row_block.up,
+    down: migration_20260428_011_card_row_block.down,
+    name: '20260428_011_card_row_block'
+  },
+  {
+    up: migration_20260428_012_offset_cards_block.up,
+    down: migration_20260428_012_offset_cards_block.down,
+    name: '20260428_012_offset_cards_block'
+  },
+  {
+    up: migration_20260428_013_install_and_swipe_cards_blocks.up,
+    down: migration_20260428_013_install_and_swipe_cards_blocks.down,
+    name: '20260428_013_install_and_swipe_cards_blocks'
+  },
 ];
diff --git a/src/payload-types.ts b/src/payload-types.ts
index d205ef9d..e562ea73 100644
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -243,7 +243,8 @@ export interface Section {
     | 'RoadmapSection'
     | 'RuntimeFeatureSection'
     | 'UseCaseSection'
-    | 'DeploymentSection';
+    | 'DeploymentSection'
+    | 'CardRowSection';
   link_button?: {
     label?: string | null;
     url?: string | null;
@@ -389,7 +390,8 @@ export interface Page {
             blockType: 'hero';
           }
         | {
-            features: {
+            showSectionHeader?: boolean | null;
+            cards: {
               label: string;
               title: string;
               description: string;
@@ -403,7 +405,7 @@ export interface Page {
             }[];
             id?: string | null;
             blockName?: string | null;
-            blockType: 'editionFeatures';
+            blockType: 'offsetCards';
           }
         | {
             heading: string;
@@ -412,12 +414,12 @@ export interface Page {
             code: string;
             id?: string | null;
             blockName?: string | null;
-            blockType: 'editionInstall';
+            blockType: 'install';
           }
         | {
             heading: string;
             subheading: string;
-            useCases: {
+            cards: {
               title: string;
               description: string;
               image?: (number | null) | Media;
@@ -429,7 +431,7 @@ export interface Page {
             }[];
             id?: string | null;
             blockName?: string | null;
-            blockType: 'editionUseCases';
+            blockType: 'swipeCards';
           }
         | {
             description: string;
@@ -443,23 +445,6 @@ export interface Page {
             blockName?: string | null;
             blockType: 'brand';
           }
-        | {
-            useCases: {
-              label: string;
-              title: string;
-              description: string;
-              image?: (number | null) | Media;
-              bulletPoints?: string[] | null;
-              link?: {
-                label?: string | null;
-                url?: string | null;
-              };
-              id?: string | null;
-            }[];
-            id?: string | null;
-            blockName?: string | null;
-            blockType: 'usecase';
-          }
         | {
             items: {
               question: string;
@@ -554,27 +539,21 @@ export interface Page {
             blockType: 'contact';
           }
         | {
-            cloudTitle?: string | null;
-            cloudDescription?: string | null;
-            cloudLink?: {
-              label?: string | null;
-              url?: string | null;
-            };
-            selfhostTitle?: string | null;
-            selfhostDescription?: string | null;
-            selfhostLink?: {
-              label?: string | null;
-              url?: string | null;
-            };
-            dynamicTitle?: string | null;
-            dynamicDescription?: string | null;
-            dynamicLink?: {
-              label?: string | null;
-              url?: string | null;
-            };
+            cards?:
+              | {
+                  title: string;
+                  description?: string | null;
+                  link?: {
+                    label?: string | null;
+                    url?: string | null;
+                  };
+                  image?: (number | null) | Media;
+                  id?: string | null;
+                }[]
+              | null;
             id?: string | null;
             blockName?: string | null;
-            blockType: 'deployment';
+            blockType: 'cardRow';
           }
       )[]
     | null;
@@ -1394,10 +1373,11 @@ export interface PagesSelect<T extends boolean = true> {
               id?: T;
               blockName?: T;
             };
-        editionFeatures?:
+        offsetCards?:
           | T
           | {
-              features?:
+              showSectionHeader?: T;
+              cards?:
                 | T
                 | {
                     label?: T;
@@ -1416,7 +1396,7 @@ export interface PagesSelect<T extends boolean = true> {
               id?: T;
               blockName?: T;
             };
-        editionInstall?:
+        install?:
           | T
           | {
               heading?: T;
@@ -1426,12 +1406,12 @@ export interface PagesSelect<T extends boolean = true> {
               id?: T;
               blockName?: T;
             };
-        editionUseCases?:
+        swipeCards?:
           | T
           | {
               heading?: T;
               subheading?: T;
-              useCases?:
+              cards?:
                 | T
                 | {
                     title?: T;
@@ -1461,28 +1441,6 @@ export interface PagesSelect<T extends boolean = true> {
               id?: T;
               blockName?: T;
             };
-        usecase?:
-          | T
-          | {
-              useCases?:
-                | T
-                | {
-                    label?: T;
-                    title?: T;
-                    description?: T;
-                    image?: T;
-                    bulletPoints?: T;
-                    link?:
-                      | T
-                      | {
-                          label?: T;
-                          url?: T;
-                        };
-                    id?: T;
-                  };
-              id?: T;
-              blockName?: T;
-            };
         faq?:
           | T
           | {
@@ -1573,32 +1531,22 @@ export interface PagesSelect<T extends boolean = true> {
               id?: T;
               blockName?: T;
             };
-        deployment?:
+        cardRow?:
           | T
           | {
-              cloudTitle?: T;
-              cloudDescription?: T;
-              cloudLink?:
-                | T
-                | {
-                    label?: T;
-                    url?: T;
-                  };
-              selfhostTitle?: T;
-              selfhostDescription?: T;
-              selfhostLink?:
-                | T
-                | {
-                    label?: T;
-                    url?: T;
-                  };
-              dynamicTitle?: T;
-              dynamicDescription?: T;
-              dynamicLink?:
+              cards?:
                 | T
                 | {
-                    label?: T;
-                    url?: T;
+                    title?: T;
+                    description?: T;
+                    link?:
+                      | T
+                      | {
+                          label?: T;
+                          url?: T;
+                        };
+                    image?: T;
+                    id?: T;
                   };
               id?: T;
               blockName?: T;

From 768301ec8f32511dfd15fca8d7e5557bda434f92 Mon Sep 17 00:00:00 2001
From: Marius Ahsmus <marius.ahsmus@gmail.com>
Date: Fri, 1 May 2026 06:04:19 +0200
Subject: [PATCH 03/11] feat: created block for bentos

---
 src/blocks/BentoBlock.ts                      | 28 ++++++++++++++
 src/collections/pages.ts                      |  3 +-
 src/components/PageBlockRenderer.tsx          |  3 ++
 src/components/bentos/FeatureBento.tsx        | 21 ++++++++++
 src/components/bentos/RuntimeBento.tsx        | 21 ++++++++++
 src/components/sections/AppFeatureSection.tsx | 24 ------------
 src/components/sections/BentoSection.tsx      | 30 +++++++++++++++
 .../sections/RuntimeFeatureSection.tsx        | 25 ------------
 src/lib/cms.ts                                |  1 +
 src/migrations/20260501_014_bento_block.ts    | 38 +++++++++++++++++++
 src/migrations/index.ts                       |  6 +++
 src/payload-types.ts                          | 13 +++++++
 12 files changed, 163 insertions(+), 50 deletions(-)
 create mode 100644 src/blocks/BentoBlock.ts
 create mode 100644 src/components/bentos/FeatureBento.tsx
 create mode 100644 src/components/bentos/RuntimeBento.tsx
 delete mode 100644 src/components/sections/AppFeatureSection.tsx
 create mode 100644 src/components/sections/BentoSection.tsx
 delete mode 100644 src/components/sections/RuntimeFeatureSection.tsx
 create mode 100644 src/migrations/20260501_014_bento_block.ts

diff --git a/src/blocks/BentoBlock.ts b/src/blocks/BentoBlock.ts
new file mode 100644
index 00000000..6e13f6d6
--- /dev/null
+++ b/src/blocks/BentoBlock.ts
@@ -0,0 +1,28 @@
+import type { Block } from "payload"
+
+export const BentoBlock: Block = {
+  slug: "bento",
+  labels: {
+    singular: "Bento",
+    plural: "Bento Blocks",
+  },
+  fields: [
+    {
+      name: "variant",
+      label: "Variant",
+      type: "select",
+      required: true,
+      defaultValue: "feature",
+      options: [
+        {
+          label: "Feature",
+          value: "feature",
+        },
+        {
+          label: "Runtime",
+          value: "runtime",
+        },
+      ],
+    },
+  ],
+}
diff --git a/src/collections/pages.ts b/src/collections/pages.ts
index fcf77bcf..e43cc073 100644
--- a/src/collections/pages.ts
+++ b/src/collections/pages.ts
@@ -6,6 +6,7 @@ import { CardRowBlock } from "../blocks/CardRowBlock"
 import { ContactBlock } from "../blocks/ContactBlock"
 import { CtaBlock } from "../blocks/CtaBlock"
 import { FaqBlock } from "../blocks/FaqBlock"
+import { BentoBlock } from "../blocks/BentoBlock"
 import { HeroBlock } from "../blocks/HeroBlock"
 import { InstallBlock } from "../blocks/InstallBlock"
 import { JobsBlock } from "../blocks/JobsBlock"
@@ -58,7 +59,7 @@ export const Pages: CollectionConfig = {
       name: "layout",
       label: "Layout",
       type: "blocks",
-      blocks: [HeroBlock, OffsetCardsBlock, InstallBlock, SwipeCardBlock, BrandBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, CardRowBlock],
+      blocks: [HeroBlock, BentoBlock, OffsetCardsBlock, InstallBlock, SwipeCardBlock, BrandBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, CardRowBlock],
       required: false,
       localized: true,
     },
diff --git a/src/components/PageBlockRenderer.tsx b/src/components/PageBlockRenderer.tsx
index 33ae46df..ae244085 100644
--- a/src/components/PageBlockRenderer.tsx
+++ b/src/components/PageBlockRenderer.tsx
@@ -2,6 +2,7 @@ import { BrandSection } from "@/components/sections/BrandSection"
 import { CardRowSection } from "@/components/sections/CardRowSection"
 import { CtaSection } from "@/components/sections/CtaSection"
 import { FaqSection } from "@/components/sections/FaqSection"
+import { BentoSection } from "@/components/sections/BentoSection"
 import { HeroSection } from "@/components/sections/HeroSection"
 import { InstallSection } from "@/components/sections/InstallSection"
 import { OffsetCardsSection } from "@/components/sections/OffsetCardsSection"
@@ -23,6 +24,8 @@ function renderPageBlock(block: PageBlock, options: Pick<PageBlocksRendererProps
     switch (block.blockType) {
         case "hero":
             return <HeroSection content={block} />
+        case "bento":
+            return <BentoSection content={block} locale={options.locale} />
         case "brand":
             return <BrandSection content={block} />
         case "offsetCards":
diff --git a/src/components/bentos/FeatureBento.tsx b/src/components/bentos/FeatureBento.tsx
new file mode 100644
index 00000000..72d67b92
--- /dev/null
+++ b/src/components/bentos/FeatureBento.tsx
@@ -0,0 +1,21 @@
+import { type AppLocale } from "@/lib/i18n"
+import { BentoGrid } from "../ui/BentoGrid"
+import { ProjectsCard } from "../cards/ProjectsCard"
+import { RoleSystemCard } from "../cards/RoleSystemCard"
+import { OrganizationCard } from "../cards/OrganizationCard"
+import { MemberManagementCard } from "../cards/MemberManagementCard"
+
+interface FeatureBentoProps {
+    locale: AppLocale
+}
+
+export function FeatureBento({ locale }: FeatureBentoProps) {
+    return (
+        <BentoGrid>
+            <ProjectsCard locale={locale} animationDelay={0} />
+            <RoleSystemCard locale={locale} animationDelay={120} />
+            <OrganizationCard locale={locale} animationDelay={240} />
+            <MemberManagementCard locale={locale} animationDelay={360} />
+        </BentoGrid>
+    )
+}
diff --git a/src/components/bentos/RuntimeBento.tsx b/src/components/bentos/RuntimeBento.tsx
new file mode 100644
index 00000000..0fac284d
--- /dev/null
+++ b/src/components/bentos/RuntimeBento.tsx
@@ -0,0 +1,21 @@
+import { type AppLocale } from "@/lib/i18n"
+import { ActionListCard } from "../cards/ActionListCard"
+import { NodeCard } from "../cards/NodeCard"
+import { RuntimeTypesCard } from "../cards/RuntimeTypesCard"
+import { SuggestionMenuCard } from "../cards/SuggestionMenuCard"
+import { BentoGrid } from "../ui/BentoGrid"
+
+interface RuntimeFeatureSectionProps {
+    locale: AppLocale
+}
+
+export function RuntimeBento({ locale }: RuntimeFeatureSectionProps) {
+    return (
+        <BentoGrid columns={3}>
+            <NodeCard locale={locale} animationDelay={0} />
+            <SuggestionMenuCard locale={locale} animationDelay={120} />
+            <ActionListCard locale={locale} animationDelay={240} />
+            <RuntimeTypesCard locale={locale} animationDelay={360} />
+        </BentoGrid>
+    )
+}
diff --git a/src/components/sections/AppFeatureSection.tsx b/src/components/sections/AppFeatureSection.tsx
deleted file mode 100644
index e2c952ec..00000000
--- a/src/components/sections/AppFeatureSection.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Section } from "@/components/ui/Section"
-import { type AppLocale } from "@/lib/i18n"
-import { MemberManagementCard } from "../cards/MemberManagementCard"
-import { OrganizationCard } from "../cards/OrganizationCard"
-import { RoleSystemCard } from "../cards/RoleSystemCard"
-import { ProjectsCard } from "../cards/ProjectsCard"
-import { BentoGrid } from "../ui/BentoGrid"
-
-interface AppFeatureSectionProps {
-    locale: AppLocale
-}
-
-export const AppFeatureSection: React.FC<AppFeatureSectionProps> = ({ locale }) => {
-    return (
-        <Section sectionType="AppFeatureSection" fullHeight>
-            <BentoGrid>
-                <ProjectsCard locale={locale} animationDelay={0} />
-                <RoleSystemCard locale={locale} animationDelay={120} />
-                <OrganizationCard locale={locale} animationDelay={240} />
-                <MemberManagementCard locale={locale} animationDelay={360} />
-            </BentoGrid>
-        </Section>
-    )
-}
diff --git a/src/components/sections/BentoSection.tsx b/src/components/sections/BentoSection.tsx
new file mode 100644
index 00000000..fd85bfc3
--- /dev/null
+++ b/src/components/sections/BentoSection.tsx
@@ -0,0 +1,30 @@
+import { FeatureBento } from "@/components/bentos/FeatureBento"
+import { RuntimeBento } from "@/components/bentos/RuntimeBento"
+import { Section } from "@/components/ui/Section"
+import type { AppLocale } from "@/lib/i18n"
+
+interface BentoSectionContent {
+    variant?: "feature" | "runtime" | null
+}
+
+interface BentoSectionProps {
+    content?: BentoSectionContent | null
+    locale?: AppLocale
+}
+
+export function BentoSection({ content, locale = "en" }: BentoSectionProps) {
+    const variant = content?.variant ?? "feature"
+
+    return (
+        <Section
+            sectionType={variant === "runtime" ? "RuntimeFeatureSection" : "AppFeatureSection"}
+            fullHeight
+        >
+            {variant === "runtime" ? (
+                <RuntimeBento locale={locale} />
+            ) : (
+                <FeatureBento locale={locale} />
+            )}
+        </Section>
+    )
+}
diff --git a/src/components/sections/RuntimeFeatureSection.tsx b/src/components/sections/RuntimeFeatureSection.tsx
deleted file mode 100644
index b4e9e3f6..00000000
--- a/src/components/sections/RuntimeFeatureSection.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Section } from "@/components/ui/Section"
-import { type AppLocale } from "@/lib/i18n"
-import React from "react"
-import { ActionListCard } from "../cards/ActionListCard"
-import { NodeCard } from "../cards/NodeCard"
-import { RuntimeTypesCard } from "../cards/RuntimeTypesCard"
-import { SuggestionMenuCard } from "../cards/SuggestionMenuCard"
-import { BentoGrid } from "../ui/BentoGrid"
-
-interface RuntimeFeatureSectionProps {
-    locale: AppLocale
-}
-
-export const RuntimeFeatureSection: React.FC<RuntimeFeatureSectionProps> = ({ locale }) => {
-    return (
-        <Section sectionType="RuntimeFeatureSection" fullHeight>
-            <BentoGrid columns={3}>
-                <NodeCard locale={locale} animationDelay={0} />
-                <SuggestionMenuCard locale={locale} animationDelay={120} />
-                <ActionListCard locale={locale} animationDelay={240} />
-                <RuntimeTypesCard locale={locale} animationDelay={360} />
-            </BentoGrid>
-        </Section>
-    )
-}
diff --git a/src/lib/cms.ts b/src/lib/cms.ts
index 4c86bac2..14a55336 100644
--- a/src/lib/cms.ts
+++ b/src/lib/cms.ts
@@ -11,6 +11,7 @@ const hasDatabaseUrl = Boolean(process.env.DATABASE_URL?.trim())
 type PageLayoutBlock = NonNullable<Page["layout"]>[number]
 
 export type HeroLayoutBlock = Extract<PageLayoutBlock, { blockType: "hero" }>
+export type BentoLayoutBlock = Extract<PageLayoutBlock, { blockType: "bento" }>
 export type OffsetCardsLayoutBlock = Extract<PageLayoutBlock, { blockType: "offsetCards" }>
 export type InstallLayoutBlock = Extract<PageLayoutBlock, { blockType: "install" }>
 export type SwipeCardsLayoutBlock = Extract<PageLayoutBlock, { blockType: "swipeCards" }>
diff --git a/src/migrations/20260501_014_bento_block.ts b/src/migrations/20260501_014_bento_block.ts
new file mode 100644
index 00000000..537f9231
--- /dev/null
+++ b/src/migrations/20260501_014_bento_block.ts
@@ -0,0 +1,38 @@
+import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
+
+export async function up({ db }: MigrateUpArgs): Promise<void> {
+  await db.execute(sql`
+    DO $$ BEGIN
+      CREATE TYPE "public"."enum_pages_blocks_bento_variant" AS ENUM('feature', 'runtime');
+    EXCEPTION
+      WHEN duplicate_object THEN null;
+    END $$;
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_bento" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "variant" "enum_pages_blocks_bento_variant" DEFAULT 'feature' NOT NULL,
+      "block_name" varchar
+    );
+
+    ALTER TABLE "pages_blocks_bento"
+      ADD CONSTRAINT "pages_blocks_bento_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_order_idx" ON "pages_blocks_bento" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_parent_id_idx" ON "pages_blocks_bento" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_path_idx" ON "pages_blocks_bento" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_locale_idx" ON "pages_blocks_bento" USING btree ("_locale");
+  `)
+}
+
+export async function down({ db }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+    DROP TABLE IF EXISTS "pages_blocks_bento" CASCADE;
+    DROP TYPE IF EXISTS "public"."enum_pages_blocks_bento_variant";
+  `)
+}
diff --git a/src/migrations/index.ts b/src/migrations/index.ts
index 54ec8508..ede159c0 100644
--- a/src/migrations/index.ts
+++ b/src/migrations/index.ts
@@ -13,6 +13,7 @@ import * as migration_20260427_010_remove_edition_hero_block from './20260427_01
 import * as migration_20260428_011_card_row_block from './20260428_011_card_row_block';
 import * as migration_20260428_012_offset_cards_block from './20260428_012_offset_cards_block';
 import * as migration_20260428_013_install_and_swipe_cards_blocks from './20260428_013_install_and_swipe_cards_blocks';
+import * as migration_20260501_014_bento_block from './20260501_014_bento_block';
 
 export const migrations = [
   {
@@ -90,4 +91,9 @@ export const migrations = [
     down: migration_20260428_013_install_and_swipe_cards_blocks.down,
     name: '20260428_013_install_and_swipe_cards_blocks'
   },
+  {
+    up: migration_20260501_014_bento_block.up,
+    down: migration_20260501_014_bento_block.down,
+    name: '20260501_014_bento_block'
+  },
 ];
diff --git a/src/payload-types.ts b/src/payload-types.ts
index e562ea73..063efb65 100644
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -389,6 +389,12 @@ export interface Page {
             blockName?: string | null;
             blockType: 'hero';
           }
+        | {
+            variant: 'feature' | 'runtime';
+            id?: string | null;
+            blockName?: string | null;
+            blockType: 'bento';
+          }
         | {
             showSectionHeader?: boolean | null;
             cards: {
@@ -1373,6 +1379,13 @@ export interface PagesSelect<T extends boolean = true> {
               id?: T;
               blockName?: T;
             };
+        bento?:
+          | T
+          | {
+              variant?: T;
+              id?: T;
+              blockName?: T;
+            };
         offsetCards?:
           | T
           | {

From 2c32d4ea3e86cc10bc3e80ad3268e42948b86637 Mon Sep 17 00:00:00 2001
From: Marius Ahsmus <marius.ahsmus@gmail.com>
Date: Fri, 1 May 2026 06:14:18 +0200
Subject: [PATCH 04/11] feat: roadmapBlock, removed section interfaces and used
 LayoutBlocks

---
 src/blocks/RoadmapBlock.ts                    |  37 +++++
 src/collections/pages.ts                      |   3 +-
 src/collections/roadmapItems.ts               |  35 ----
 src/components/PageBlockRenderer.tsx          |   3 +
 src/components/sections/BentoSection.tsx      |   7 +-
 src/components/sections/BrandSection.tsx      |  15 +-
 src/components/sections/CardRowSection.tsx    |  22 +--
 src/components/sections/CtaSection.tsx        |  15 +-
 src/components/sections/FaqSection.tsx        |  17 +-
 src/components/sections/HeroSection.tsx       |  32 +---
 .../sections/OffsetCardsSection.tsx           |  23 +--
 src/components/sections/RoadmapSection.tsx    |  11 +-
 src/lib/cms.ts                                |  25 +--
 src/migrations/20260501_015_roadmap_block.ts  | 153 ++++++++++++++++++
 src/migrations/index.ts                       |   6 +
 src/payload-types.ts                          |  55 +++----
 src/payload.config.ts                         |   4 +-
 17 files changed, 256 insertions(+), 207 deletions(-)
 create mode 100644 src/blocks/RoadmapBlock.ts
 delete mode 100644 src/collections/roadmapItems.ts
 create mode 100644 src/migrations/20260501_015_roadmap_block.ts

diff --git a/src/blocks/RoadmapBlock.ts b/src/blocks/RoadmapBlock.ts
new file mode 100644
index 00000000..ab4af6c0
--- /dev/null
+++ b/src/blocks/RoadmapBlock.ts
@@ -0,0 +1,37 @@
+import type { Block } from "payload"
+
+export const RoadmapBlock: Block = {
+  slug: "roadmap",
+  labels: {
+    singular: "Roadmap",
+    plural: "Roadmap Blocks",
+  },
+  fields: [
+    {
+      name: "items",
+      label: "Items",
+      type: "array",
+      required: true,
+      fields: [
+        {
+          name: "time",
+          type: "text",
+          required: true,
+          localized: true,
+        },
+        {
+          name: "title",
+          type: "text",
+          required: true,
+          localized: true,
+        },
+        {
+          name: "description",
+          type: "text",
+          required: true,
+          localized: true,
+        },
+      ],
+    },
+  ],
+}
diff --git a/src/collections/pages.ts b/src/collections/pages.ts
index e43cc073..c37e5d87 100644
--- a/src/collections/pages.ts
+++ b/src/collections/pages.ts
@@ -12,6 +12,7 @@ import { InstallBlock } from "../blocks/InstallBlock"
 import { JobsBlock } from "../blocks/JobsBlock"
 import { MarkdownBlock } from "../blocks/MarkdownBlock"
 import { OffsetCardsBlock } from "../blocks/OffsetCardsBlock"
+import { RoadmapBlock } from "../blocks/RoadmapBlock"
 import type { CollectionConfig } from "payload"
 
 export const Pages: CollectionConfig = {
@@ -59,7 +60,7 @@ export const Pages: CollectionConfig = {
       name: "layout",
       label: "Layout",
       type: "blocks",
-      blocks: [HeroBlock, BentoBlock, OffsetCardsBlock, InstallBlock, SwipeCardBlock, BrandBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, CardRowBlock],
+      blocks: [HeroBlock, BentoBlock, OffsetCardsBlock, InstallBlock, SwipeCardBlock, BrandBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, CardRowBlock, RoadmapBlock],
       required: false,
       localized: true,
     },
diff --git a/src/collections/roadmapItems.ts b/src/collections/roadmapItems.ts
deleted file mode 100644
index d64262e0..00000000
--- a/src/collections/roadmapItems.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import type { CollectionConfig } from "payload"
-
-export const RoadmapItems: CollectionConfig = {
-  slug: "roadmapItems",
-  admin: {
-    useAsTitle: "title",
-    defaultColumns: ["time", "title", "updatedAt"],
-  },
-  access: {
-    read: () => true,
-    create: ({ req }) => Boolean(req.user),
-    update: ({ req }) => Boolean(req.user),
-    delete: ({ req }) => Boolean(req.user),
-  },
-  fields: [
-    {
-      name: "time",
-      type: "text",
-        required: true,
-        localized: true,
-    },
-    {
-      name: "title",
-      type: "text",
-        required: true,
-        localized: true,
-    },
-    {
-      name: "description",
-      type: "text",
-        required: true,
-        localized: true,
-    },
-  ],
-}
diff --git a/src/components/PageBlockRenderer.tsx b/src/components/PageBlockRenderer.tsx
index ae244085..054882ca 100644
--- a/src/components/PageBlockRenderer.tsx
+++ b/src/components/PageBlockRenderer.tsx
@@ -6,6 +6,7 @@ import { BentoSection } from "@/components/sections/BentoSection"
 import { HeroSection } from "@/components/sections/HeroSection"
 import { InstallSection } from "@/components/sections/InstallSection"
 import { OffsetCardsSection } from "@/components/sections/OffsetCardsSection"
+import { RoadmapSection } from "@/components/sections/RoadmapSection"
 import { SwipeCardSection } from "@/components/sections/SwipeCardSection"
 import type { AppLocale } from "@/lib/i18n"
 import type { Page } from "@/payload-types"
@@ -38,6 +39,8 @@ function renderPageBlock(block: PageBlock, options: Pick<PageBlocksRendererProps
             return <CtaSection content={block} floatingCta={options.ctaFloating} locale={options.locale} />
         case "install":
             return <InstallSection content={block} />
+        case "roadmap":
+            return <RoadmapSection content={block} />
         case "swipeCards":
             return <SwipeCardSection content={block} />
         default:
diff --git a/src/components/sections/BentoSection.tsx b/src/components/sections/BentoSection.tsx
index fd85bfc3..f02b5ceb 100644
--- a/src/components/sections/BentoSection.tsx
+++ b/src/components/sections/BentoSection.tsx
@@ -1,14 +1,11 @@
 import { FeatureBento } from "@/components/bentos/FeatureBento"
 import { RuntimeBento } from "@/components/bentos/RuntimeBento"
 import { Section } from "@/components/ui/Section"
+import { BentoLayoutBlock } from "@/lib/cms"
 import type { AppLocale } from "@/lib/i18n"
 
-interface BentoSectionContent {
-    variant?: "feature" | "runtime" | null
-}
-
 interface BentoSectionProps {
-    content?: BentoSectionContent | null
+    content?: BentoLayoutBlock | null
     locale?: AppLocale
 }
 
diff --git a/src/components/sections/BrandSection.tsx b/src/components/sections/BrandSection.tsx
index bf59481d..2b5e36fa 100644
--- a/src/components/sections/BrandSection.tsx
+++ b/src/components/sections/BrandSection.tsx
@@ -5,22 +5,13 @@ import { Section } from "@/components/ui/Section"
 import Image from "next/image"
 import type { Media } from "@/payload-types"
 import { m as motion, type Variants } from "motion/react"
-
-interface BrandSectionLogo {
-    logo: number | Media
-    id?: string | null
-}
-
-interface BrandSectionContent {
-    description?: string | null
-    logos?: BrandSectionLogo[] | null
-}
+import { BrandLayoutBlock } from "@/lib/cms"
 
 interface BrandSectionProps {
-    content?: BrandSectionContent | null
+    content?: BrandLayoutBlock | null
 }
 
-export const BrandSection: React.FC<BrandSectionProps> = ({ content }) => {
+export function BrandSection({ content }: BrandSectionProps) {
     if (!content) return
 
     const logos = (content.logos ?? [])
diff --git a/src/components/sections/CardRowSection.tsx b/src/components/sections/CardRowSection.tsx
index 1185da14..c9f181e6 100644
--- a/src/components/sections/CardRowSection.tsx
+++ b/src/components/sections/CardRowSection.tsx
@@ -2,36 +2,22 @@
 
 import { LinkButton } from "@/components/ui/LinkButton"
 import { Section } from "@/components/ui/Section"
+import { CardRowLayoutBlock } from "@/lib/cms"
 import type { Media } from "@/payload-types"
 import { m as motion, type Variants } from "motion/react"
 import Image from "next/image"
 import React, { Children, type ReactNode } from "react"
 
-interface CardRowCard {
-    title?: string | null
-    description?: string | null
-    link?: {
-        label?: string | null
-        url?: string | null
-    } | null
-    image?: number | Media | null
-    id?: string | null
-}
-
-interface CardRowSectionContent {
-    cards?: CardRowCard[] | null
-}
-
 interface CardRowSectionProps {
-    content?: CardRowSectionContent | null
+    content?: CardRowLayoutBlock | null
     children?: ReactNode
 }
 
-function getImageUrl(image: CardRowCard["image"]) {
+function getImageUrl(image: number | Media | null | undefined) {
     return typeof image === "object" && image?.url ? image.url : null
 }
 
-export const CardRowSection: React.FC<CardRowSectionProps> = ({ content, children }) => {
+export function CardRowSection({ content, children }: CardRowSectionProps) {
     const cards = content?.cards?.filter((card) => Boolean(card.title)) ?? []
     const fallbackImages = Children.toArray(children)
     if (cards.length === 0) return null
diff --git a/src/components/sections/CtaSection.tsx b/src/components/sections/CtaSection.tsx
index 441dcbe2..210ef02d 100644
--- a/src/components/sections/CtaSection.tsx
+++ b/src/components/sections/CtaSection.tsx
@@ -4,28 +4,19 @@ import { InteractiveGridPattern } from "@/components/InteractiveGridPattern"
 import { HapticButtonLink } from "@/components/ui/HapticButtonLink"
 import { Section } from "@/components/ui/Section"
 import { useMediaQuery } from "@/hooks/useMediaQuery"
+import { CtaLayoutBlock } from "@/lib/cms"
 import type { AppLocale } from "@/lib/i18n"
 import { cn } from "@/lib/utils"
 import { m as motion, type Variants } from "motion/react"
 import Image from "next/image"
 import React, { useEffect, useRef, useState } from "react"
 
-interface CtaSectionContent {
-    heading: string
-    subheading: string
-    ctaLink: {
-        label: string
-        url: string
-    }
-}
-
 interface CtaSectionProps {
-    content?: CtaSectionContent | null
+    content?: CtaLayoutBlock | null
     floatingCta?: boolean
-    locale?: AppLocale
 }
 
-export const CtaSection: React.FC<CtaSectionProps> = ({ content, floatingCta = false, locale }) => {
+export function CtaSection({ content, floatingCta = false }: CtaSectionProps) {
     const isTouchDevice = useMediaQuery("(hover: none), (pointer: coarse)")
     const [mounted, setMounted] = useState(false)
     const [docked, setDocked] = useState(false)
diff --git a/src/components/sections/FaqSection.tsx b/src/components/sections/FaqSection.tsx
index 4b4e2996..43cb5f26 100644
--- a/src/components/sections/FaqSection.tsx
+++ b/src/components/sections/FaqSection.tsx
@@ -2,25 +2,16 @@
 
 import { AccordionItem } from "@/components/ui/Accordion"
 import { Section } from "@/components/ui/Section"
+import { FaqLayoutBlock } from "@/lib/cms"
 import { m as motion } from "motion/react"
 import React, { useCallback, useState } from "react"
 import { useWebHaptics } from "web-haptics/react"
 
-interface FaqItem {
-    question: string
-    answer: string
-    id?: string | null
-}
-
-interface FaqSectionContent {
-    items: FaqItem[] | null
-}
-
 interface FaqSectionProps {
-    content?: FaqSectionContent | null
+    content?: FaqLayoutBlock | null
 }
 
-export const FaqSection: React.FC<FaqSectionProps> = ({ content }) => {
+export function FaqSection({ content }: FaqSectionProps) {
     const [openItem, setOpenItem] = useState<number | null>(null)
     const { trigger } =useWebHaptics()
 
@@ -34,7 +25,7 @@ export const FaqSection: React.FC<FaqSectionProps> = ({ content }) => {
     return (
         <Section sectionType="FaqSection" showLinkButton={false} showBlur={false}>
             <div aria-hidden="true" className="pointer-events-none absolute inset-0 [background:radial-gradient(circle,rgba(255,255,255,0.05),transparent_50%)]" />
-            <div className={" md:w-[50vw] flex flex-col gap-4 mx-auto"}>
+            <div className={"md:w-[50vw] flex flex-col gap-4 mx-auto"}>
                 {content.items.map((faq, index) => (
                     <motion.div
                         key={`${faq.question}-${index}`}
diff --git a/src/components/sections/HeroSection.tsx b/src/components/sections/HeroSection.tsx
index 081a7b68..ea8018be 100644
--- a/src/components/sections/HeroSection.tsx
+++ b/src/components/sections/HeroSection.tsx
@@ -10,40 +10,14 @@ import React, { useState } from "react"
 import Grainient from "../ui/Granient"
 import { HapticButtonLink } from "../ui/HapticButtonLink"
 import { StableBadge } from "../ui/StableBadge"
-
-interface HeroSectionButton {
-    label: string
-    url: string
-    variant?: "none" | "normal" | "outlined" | "filled" | null
-    id?: string | null
-}
-
-interface HeroSectionText {
-    text: string
-    id?: string | null
-}
-
-interface HeroSectionContent {
-    badge?: string | null
-    badge_link?: string | null
-    heading?: string | null
-    centered?: boolean | null
-    grainientColors?: {
-        color1?: string | null
-        color2?: string | null
-        color3?: string | null
-        backgroundColor?: string | null
-    } | null
-    texts?: HeroSectionText[] | null
-    buttons?: HeroSectionButton[] | null
-}
+import { HeroLayoutBlock } from "@/lib/cms"
 
 interface HeroSectionProps {
-    content?: HeroSectionContent | null
+    content?: HeroLayoutBlock | null
     imageSrc?: string
 }
 
-export const HeroSection: React.FC<HeroSectionProps> = ({ content, imageSrc = "/code0_software.png" }) => {
+export function HeroSection({ content, imageSrc = "/code0_software.png" }: HeroSectionProps) {
     const [isProductHuntBadgeVisible, setIsProductHuntBadgeVisible] = useState(false)
 
     if (!content?.heading) return
diff --git a/src/components/sections/OffsetCardsSection.tsx b/src/components/sections/OffsetCardsSection.tsx
index b513bb91..b612907f 100644
--- a/src/components/sections/OffsetCardsSection.tsx
+++ b/src/components/sections/OffsetCardsSection.tsx
@@ -2,32 +2,15 @@
 
 import { LinkButton } from "@/components/ui/LinkButton"
 import { Section } from "@/components/ui/Section"
+import { OffsetCardsLayoutBlock } from "@/lib/cms"
 import { ANIMATION_PRESETS, type AnimationPreset } from "@/lib/utils"
 import type { Media } from "@/payload-types"
 import { m as motion, type Variants } from "motion/react"
 import Image from "next/image"
 import React from "react"
 
-interface OffsetCardItem {
-    label: string
-    title: string
-    description: string
-    image?: Media | number | null
-    bulletPoints?: string[] | null
-    link?: {
-        label?: string | null
-        url?: string | null
-    } | null
-    id?: string | null
-}
-
-interface OffsetCardsSectionContent {
-    showSectionHeader?: boolean | null
-    cards: OffsetCardItem[] | null
-}
-
 interface OffsetCardsSectionProps {
-    content?: OffsetCardsSectionContent | null
+    content?: OffsetCardsLayoutBlock | null
 }
 
 const OFFSET_CARD_ANIMATION_SEQUENCE: Exclude<AnimationPreset, "none">[] = [
@@ -36,7 +19,7 @@ const OFFSET_CARD_ANIMATION_SEQUENCE: Exclude<AnimationPreset, "none">[] = [
     "slide-left",
 ]
 
-export const OffsetCardsSection: React.FC<OffsetCardsSectionProps> = ({ content }) => {
+export function OffsetCardsSection({ content }: OffsetCardsSectionProps) {
     if (!content?.cards?.length) return null
 
     const staggerContainer: Variants = {
diff --git a/src/components/sections/RoadmapSection.tsx b/src/components/sections/RoadmapSection.tsx
index 452fb77b..1adcf723 100644
--- a/src/components/sections/RoadmapSection.tsx
+++ b/src/components/sections/RoadmapSection.tsx
@@ -1,16 +1,15 @@
 import { Section } from "@/components/ui/Section"
-import { getRoadmapItems } from "@/lib/cms"
-import { AppLocale } from "@/lib/i18n"
 import React from "react"
 import { RoadmapItemCard } from "../cards/RoadmapItemCard"
 import { cn } from "@/lib/utils"
+import { RoadmapLayoutBlock } from "@/lib/cms"
 
 interface RoadmapSectionProps {
-    locale: AppLocale
+    content?: RoadmapLayoutBlock | null
 }
 
-export const RoadmapSection: React.FC<RoadmapSectionProps> = async ({ locale }) => {
-    const items = await getRoadmapItems(locale)
+export function RoadmapSection({ content }: RoadmapSectionProps) {
+    const items = content?.items ?? []
     if (!items?.length) return null
 
     return (
@@ -19,7 +18,7 @@ export const RoadmapSection: React.FC<RoadmapSectionProps> = async ({ locale })
             <div aria-hidden="true" className="pointer-events-none absolute left-3 top-0 h-full w-0.5 rounded-full bg-linear-to-b from-brand/10 via-white/20 to-blue/10 md:left-1/2 md:-translate-x-1/2" />
                 <div className="flex flex-col gap-10 md:gap-14">
                     {items.map((item, index) => (
-                        <div key={`roadmap-item-${item.id}`} className="relative">
+                        <div key={item.id ?? `roadmap-item-${index}`} className="relative">
                             <div aria-hidden="true" className="absolute left-3 top-6 h-3 w-3 -translate-x-1/2 rounded-full border border-brand/70 bg-brand md:left-1/2" />
                             <div className={cn("grid grid-cols-1 md:grid-cols-2 md:gap-12", index % 2 === 0 && "md:[&>*:first-child]:order-2 md:[&>*:last-child]:order-1")}>
                                 <div aria-hidden="true" className="hidden md:block" />
diff --git a/src/lib/cms.ts b/src/lib/cms.ts
index 14a55336..6a9dbd54 100644
--- a/src/lib/cms.ts
+++ b/src/lib/cms.ts
@@ -2,7 +2,7 @@
 
 import { DEFAULT_LOCALE, type AppLocale } from "@/lib/i18n"
 import { getPayloadClient } from "@/lib/payloadClient"
-import type { Action, Blog, CookieBanner, Feature, Footer, Job, Media, NavbarItem, Page, RoadmapItem as PayloadRoadmapItem, Section, TeamMember } from "@/payload-types"
+import type { Action, Blog, CookieBanner, Feature, Footer, Job, Media, NavbarItem, Page, Section, TeamMember } from "@/payload-types"
 import { cache } from "react"
 
 const isBuildPhase = process.env.NEXT_PHASE === "phase-production-build" || process.env.npm_lifecycle_event === "build"
@@ -24,6 +24,7 @@ export type ActionsLayoutBlock = Extract<PageLayoutBlock, { blockType: "actions"
 export type MarkdownLayoutBlock = Extract<PageLayoutBlock, { blockType: "markdown" }>
 export type ContactLayoutBlock = Extract<PageLayoutBlock, { blockType: "contact" }>
 export type BlogLayoutBlock = Extract<PageLayoutBlock, { blockType: "blog" }>
+export type RoadmapLayoutBlock = Extract<PageLayoutBlock, { blockType: "roadmap" }>
 
 
 type FeatureSlug = Feature["slug"]
@@ -58,8 +59,6 @@ type ActionDetailItem = Pick<Action, "id" | "slug" | "title" | "shortDescription
 export type JobItem = Pick<Job, "id" | "title" | "slug" | "category" | "type" | "location" | "description" | "order">
 type JobDetailItem = Pick<Job, "id" | "title" | "slug" | "category" | "type" | "location" | "description" | "order" | "content">
 export type TeamMemberItem = Pick<TeamMember, "id" | "name" | "image" | "shortDescription" | "about" | "role" | "joinedAt">
-type RoadmapItem = Pick<PayloadRoadmapItem, "id" | "time" | "title" | "description">
-
 export type BlogPostItem = Pick<Blog, "id" | "title" | "slug" | "content" | "createdAt" | "shortDescription" | "isPinned"> & {
     heroImage?: (number | null) | Media
     meta?: Blog["meta"]
@@ -518,22 +517,6 @@ const getBlogSlugsCached = cache(async (locale: AppLocale): Promise<string[]> =>
     })
 })
 
-const getRoadmapItemsCached = cache(async (locale: AppLocale): Promise<RoadmapItem[]> => {
-    return withCmsFallback(`getRoadmapItems(${locale})`, [], async () => {
-        const payload = await getPayloadClient()
-        const result = await payload.find({
-            collection: "roadmapItems",
-            locale,
-            fallbackLocale: DEFAULT_LOCALE,
-            pagination: false,
-            sort: "-createdAt",
-            depth: 0,
-        })
-
-        return (result.docs as RoadmapItem[]) ?? []
-    })
-})
-
 const getSectionsCached = cache(async (locale: AppLocale): Promise<Section[]> => {
     return withCmsFallback(`getSections(${locale})`, [], async () => {
         const payload = await getPayloadClient()
@@ -629,10 +612,6 @@ export async function getBlogSlugs(locale: AppLocale = DEFAULT_LOCALE): Promise<
     return getBlogSlugsCached(locale)
 }
 
-export async function getRoadmapItems(locale: AppLocale = DEFAULT_LOCALE): Promise<RoadmapItem[]> {
-    return getRoadmapItemsCached(locale)
-}
-
 export async function getSections(locale: AppLocale = DEFAULT_LOCALE): Promise<Section[]> {
     return getSectionsCached(locale)
 }
diff --git a/src/migrations/20260501_015_roadmap_block.ts b/src/migrations/20260501_015_roadmap_block.ts
new file mode 100644
index 00000000..97bec99e
--- /dev/null
+++ b/src/migrations/20260501_015_roadmap_block.ts
@@ -0,0 +1,153 @@
+import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
+
+export async function up({ db }: MigrateUpArgs): Promise<void> {
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_roadmap" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_roadmap_items" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "time" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL
+    );
+
+    ALTER TABLE "pages_blocks_roadmap"
+      ADD CONSTRAINT "pages_blocks_roadmap_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_roadmap_items"
+      ADD CONSTRAINT "pages_blocks_roadmap_items_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_roadmap"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_order_idx" ON "pages_blocks_roadmap" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_parent_id_idx" ON "pages_blocks_roadmap" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_path_idx" ON "pages_blocks_roadmap" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_locale_idx" ON "pages_blocks_roadmap" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_items_order_idx" ON "pages_blocks_roadmap_items" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_items_parent_id_idx" ON "pages_blocks_roadmap_items" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_items_locale_idx" ON "pages_blocks_roadmap_items" USING btree ("_locale");
+
+    INSERT INTO "pages_blocks_roadmap" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id"
+    )
+    SELECT
+      COALESCE((
+        SELECT MAX("_order") + 1
+        FROM (
+          SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_hero"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_brand"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_faq"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_cta"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_jobs"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_blog"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_actions"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_markdown"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_contact"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_bento"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_offset_cards"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_install"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_swipe_cards"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_card_row"
+        ) layout_orders
+        WHERE layout_orders."_parent_id" = pages."id"
+          AND layout_orders."_locale" = locale_values."_locale"
+      ), 0),
+      pages."id",
+      'layout',
+      locale_values."_locale",
+      'roadmap-' || pages."id" || '-' || locale_values."_locale"::text
+    FROM "pages" pages
+    CROSS JOIN (
+      SELECT DISTINCT "_locale" FROM "roadmap_items_locales"
+    ) locale_values
+    WHERE pages."slug" = 'main'
+      AND EXISTS (
+        SELECT 1 FROM "roadmap_items_locales"
+        WHERE "roadmap_items_locales"."_locale" = locale_values."_locale"
+      )
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_roadmap_items" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "time",
+      "title",
+      "description"
+    )
+    SELECT
+      ROW_NUMBER() OVER (PARTITION BY roadmap_locale."_locale" ORDER BY roadmap."created_at" DESC, roadmap."id" DESC) - 1,
+      'roadmap-' || pages."id" || '-' || roadmap_locale."_locale"::text,
+      roadmap_locale."_locale",
+      'roadmap-item-' || roadmap."id" || '-' || roadmap_locale."_locale"::text,
+      roadmap_locale."time",
+      roadmap_locale."title",
+      roadmap_locale."description"
+    FROM "roadmap_items" roadmap
+    INNER JOIN "roadmap_items_locales" roadmap_locale ON roadmap_locale."_parent_id" = roadmap."id"
+    INNER JOIN "pages" pages ON pages."slug" = 'main'
+    ON CONFLICT ("id") DO NOTHING;
+
+    ALTER TABLE "payload_locked_documents_rels" DROP CONSTRAINT IF EXISTS "payload_locked_documents_rels_roadmap_items_fk";
+    DROP INDEX IF EXISTS "payload_locked_documents_rels_roadmap_items_id_idx";
+    ALTER TABLE "payload_locked_documents_rels" DROP COLUMN IF EXISTS "roadmap_items_id";
+
+    DROP TABLE IF EXISTS "roadmap_items_locales" CASCADE;
+    DROP TABLE IF EXISTS "roadmap_items" CASCADE;
+  `)
+}
+
+export async function down({ db }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "roadmap_items" (
+      "id" serial PRIMARY KEY NOT NULL,
+      "updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+      "created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS "roadmap_items_locales" (
+      "time" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "id" serial PRIMARY KEY NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "_parent_id" integer NOT NULL
+    );
+
+    ALTER TABLE "roadmap_items_locales"
+      ADD CONSTRAINT "roadmap_items_locales_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."roadmap_items"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "roadmap_items_updated_at_idx" ON "roadmap_items" USING btree ("updated_at");
+    CREATE INDEX IF NOT EXISTS "roadmap_items_created_at_idx" ON "roadmap_items" USING btree ("created_at");
+    CREATE UNIQUE INDEX IF NOT EXISTS "roadmap_items_locales_locale_parent_id_unique" ON "roadmap_items_locales" USING btree ("_locale","_parent_id");
+
+    ALTER TABLE "payload_locked_documents_rels" ADD COLUMN IF NOT EXISTS "roadmap_items_id" integer;
+    ALTER TABLE "payload_locked_documents_rels"
+      ADD CONSTRAINT "payload_locked_documents_rels_roadmap_items_fk"
+      FOREIGN KEY ("roadmap_items_id") REFERENCES "public"."roadmap_items"("id")
+      ON DELETE cascade ON UPDATE no action;
+    CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_roadmap_items_id_idx" ON "payload_locked_documents_rels" USING btree ("roadmap_items_id");
+
+    DROP TABLE IF EXISTS "pages_blocks_roadmap_items" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_roadmap" CASCADE;
+  `)
+}
diff --git a/src/migrations/index.ts b/src/migrations/index.ts
index ede159c0..3c9ec908 100644
--- a/src/migrations/index.ts
+++ b/src/migrations/index.ts
@@ -14,6 +14,7 @@ import * as migration_20260428_011_card_row_block from './20260428_011_card_row_
 import * as migration_20260428_012_offset_cards_block from './20260428_012_offset_cards_block';
 import * as migration_20260428_013_install_and_swipe_cards_blocks from './20260428_013_install_and_swipe_cards_blocks';
 import * as migration_20260501_014_bento_block from './20260501_014_bento_block';
+import * as migration_20260501_015_roadmap_block from './20260501_015_roadmap_block';
 
 export const migrations = [
   {
@@ -96,4 +97,9 @@ export const migrations = [
     down: migration_20260501_014_bento_block.down,
     name: '20260501_014_bento_block'
   },
+  {
+    up: migration_20260501_015_roadmap_block.up,
+    down: migration_20260501_015_roadmap_block.down,
+    name: '20260501_015_roadmap_block'
+  },
 ];
diff --git a/src/payload-types.ts b/src/payload-types.ts
index 063efb65..b39bc7b0 100644
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -78,7 +78,6 @@ export interface Config {
     actions: Action;
     jobs: Job;
     blog: Blog;
-    roadmapItems: RoadmapItem;
     'team-members': TeamMember;
     subscriptionConfig: SubscriptionConfig;
     exports: Export;
@@ -102,7 +101,6 @@ export interface Config {
     actions: ActionsSelect<false> | ActionsSelect<true>;
     jobs: JobsSelect<false> | JobsSelect<true>;
     blog: BlogSelect<false> | BlogSelect<true>;
-    roadmapItems: RoadmapItemsSelect<false> | RoadmapItemsSelect<true>;
     'team-members': TeamMembersSelect<false> | TeamMembersSelect<true>;
     subscriptionConfig: SubscriptionConfigSelect<false> | SubscriptionConfigSelect<true>;
     exports: ExportsSelect<false> | ExportsSelect<true>;
@@ -561,6 +559,17 @@ export interface Page {
             blockName?: string | null;
             blockType: 'cardRow';
           }
+        | {
+            items: {
+              time: string;
+              title: string;
+              description: string;
+              id?: string | null;
+            }[];
+            id?: string | null;
+            blockName?: string | null;
+            blockType: 'roadmap';
+          }
       )[]
     | null;
   meta?: {
@@ -710,18 +719,6 @@ export interface TeamMember {
   updatedAt: string;
   createdAt: string;
 }
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "roadmapItems".
- */
-export interface RoadmapItem {
-  id: number;
-  time: string;
-  title: string;
-  description: string;
-  updatedAt: string;
-  createdAt: string;
-}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "subscriptionConfig".
@@ -1089,10 +1086,6 @@ export interface PayloadLockedDocument {
         relationTo: 'blog';
         value: number | Blog;
       } | null)
-    | ({
-        relationTo: 'roadmapItems';
-        value: number | RoadmapItem;
-      } | null)
     | ({
         relationTo: 'team-members';
         value: number | TeamMember;
@@ -1564,6 +1557,20 @@ export interface PagesSelect<T extends boolean = true> {
               id?: T;
               blockName?: T;
             };
+        roadmap?:
+          | T
+          | {
+              items?:
+                | T
+                | {
+                    time?: T;
+                    title?: T;
+                    description?: T;
+                    id?: T;
+                  };
+              id?: T;
+              blockName?: T;
+            };
       };
   meta?:
     | T
@@ -1653,17 +1660,6 @@ export interface BlogSelect<T extends boolean = true> {
   updatedAt?: T;
   createdAt?: T;
 }
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "roadmapItems_select".
- */
-export interface RoadmapItemsSelect<T extends boolean = true> {
-  time?: T;
-  title?: T;
-  description?: T;
-  updatedAt?: T;
-  createdAt?: T;
-}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "team-members_select".
@@ -1967,7 +1963,6 @@ export interface TaskCreateCollectionExport {
       | 'actions'
       | 'jobs'
       | 'blog'
-      | 'roadmapItems'
       | 'team-members'
       | 'subscriptionConfig'
       | 'exports'
diff --git a/src/payload.config.ts b/src/payload.config.ts
index c711e92e..96606cfc 100644
--- a/src/payload.config.ts
+++ b/src/payload.config.ts
@@ -16,7 +16,6 @@ import { Jobs } from './collections/jobs'
 import { Media } from './collections/media'
 import { NavbarItems } from './collections/navbarItems'
 import { Pages } from './collections/pages'
-import { RoadmapItems } from './collections/roadmapItems'
 import { Sections } from './collections/sections'
 import { SubscriptionCollection } from './collections/subscriptionConfig'
 import { TeamMembers } from './collections/teamMembers'
@@ -43,7 +42,7 @@ export default buildConfig({
         locales: ['en', 'de'],
         defaultLocale: 'en',
     },
-    collections: [Users, Media, NavbarItems, Sections, Footer, CookieBanner, Pages, Features, Actions, Jobs, Blog, RoadmapItems, TeamMembers, SubscriptionCollection],
+    collections: [Users, Media, NavbarItems, Sections, Footer, CookieBanner, Pages, Features, Actions, Jobs, Blog, TeamMembers, SubscriptionCollection],
     jobs: {
         autoRun: [{
             cron: '*/5 * * * *', // Check every 5 minutes
@@ -97,7 +96,6 @@ export default buildConfig({
                 { slug: 'actions' },
                 { slug: 'jobs' },
                 { slug: 'blog' },
-                { slug: 'roadmapItems' },
                 { slug: 'team-members' },
                 { slug: 'subscriptionConfig' }
             ]

From efe573ea859e4d3318ba3fb1320d6ec5aa0696af Mon Sep 17 00:00:00 2001
From: Marius Ahsmus <marius.ahsmus@gmail.com>
Date: Fri, 1 May 2026 07:10:45 +0200
Subject: [PATCH 05/11] feat: remove section collection

---
 src/app/(landing)/[locale]/layout.tsx         |  13 +-
 src/blocks/BentoBlock.ts                      |  38 ++++
 src/blocks/CardRowBlock.ts                    |  38 ++++
 src/blocks/FaqBlock.ts                        |  38 ++++
 src/blocks/OffsetCardsBlock.ts                |  40 +++-
 src/blocks/RoadmapBlock.ts                    |  38 ++++
 src/collections/sections.ts                   |  76 -------
 src/components/PageBlockRenderer.tsx          |   2 +-
 src/components/providers/SectionsProvider.tsx |  35 ---
 src/components/sections/BentoSection.tsx      |   4 +-
 src/components/sections/CardRowSection.tsx    |   8 +-
 src/components/sections/FaqSection.tsx        |   8 +-
 .../sections/OffsetCardsSection.tsx           |   5 +-
 src/components/sections/RoadmapSection.tsx    |   8 +-
 src/components/ui/Section.tsx                 |  45 ++--
 src/lib/cms.ts                                |  21 +-
 src/migrations/20260428_011_card_row_block.ts |   6 -
 .../20260501_016_inline_section_fields.ts     | 214 ++++++++++++++++++
 src/migrations/index.ts                       |   6 +
 src/payload-types.ts                          | 119 ++++++----
 src/payload.config.ts                         |   6 +-
 21 files changed, 542 insertions(+), 226 deletions(-)
 delete mode 100644 src/collections/sections.ts
 delete mode 100644 src/components/providers/SectionsProvider.tsx
 create mode 100644 src/migrations/20260501_016_inline_section_fields.ts

diff --git a/src/app/(landing)/[locale]/layout.tsx b/src/app/(landing)/[locale]/layout.tsx
index b860d4fb..ac34d5f5 100644
--- a/src/app/(landing)/[locale]/layout.tsx
+++ b/src/app/(landing)/[locale]/layout.tsx
@@ -1,10 +1,8 @@
 import ConsentManager from "@/components/providers/ConsentManager"
 import { Navigation } from "@/components/navigation/Navigation"
-import { SectionsProvider } from "@/components/providers/SectionsProvider"
 import { FooterSection } from "@/components/sections/FooterSection"
 import { getFooter } from "@/lib/cms"
 import { getNavbarItems } from "@/lib/cms"
-import { getSections } from "@/lib/cms"
 import { SUPPORTED_LOCALES, isSupportedLocale } from "@/lib/i18n"
 import type { ReactNode } from "react"
 import { notFound } from "next/navigation"
@@ -26,21 +24,18 @@ export default async function LocaleLayout({ children, params }: LocaleLayoutPro
         notFound()
     }
 
-    const [items, footer, sections] = await Promise.all([
+    const [items, footer] = await Promise.all([
         getNavbarItems(locale),
         getFooter(locale),
-        getSections(locale),
     ])
 
     return (
         <ConsentManager locale={locale}>
             <div className="relative bg-primary overflow-x-hidden">
                 <Navigation locale={locale} items={items} footer={footer} />
-                <SectionsProvider sections={sections}>
-                    <main id="main-content" className="bg-primary">
-                        {children}
-                    </main>
-                </SectionsProvider>
+                <main id="main-content" className="bg-primary">
+                    {children}
+                </main>
                 <FooterSection locale={locale} footer={footer} />
                 <div className="pointer-events-none absolute inset-x-0 bottom-0 z-50 flex justify-center" aria-hidden="true">
                     <div className="h-16 w-full bg-blue/20 blur-3xl" />
diff --git a/src/blocks/BentoBlock.ts b/src/blocks/BentoBlock.ts
index 6e13f6d6..2f6d8382 100644
--- a/src/blocks/BentoBlock.ts
+++ b/src/blocks/BentoBlock.ts
@@ -7,6 +7,44 @@ export const BentoBlock: Block = {
     plural: "Bento Blocks",
   },
   fields: [
+    {
+      type: "collapsible",
+      label: "Section",
+      fields: [
+        {
+          name: "sectionHeading",
+          label: "Section Heading",
+          type: "text",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionDescription",
+          label: "Section Description",
+          type: "textarea",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionLinkButton",
+          label: "Section Link Button",
+          type: "group",
+          fields: [
+            {
+              name: "label",
+              type: "text",
+              required: false,
+              localized: true,
+            },
+            {
+              name: "url",
+              type: "text",
+              required: false,
+            },
+          ],
+        },
+      ],
+    },
     {
       name: "variant",
       label: "Variant",
diff --git a/src/blocks/CardRowBlock.ts b/src/blocks/CardRowBlock.ts
index ac8de114..768c75f9 100644
--- a/src/blocks/CardRowBlock.ts
+++ b/src/blocks/CardRowBlock.ts
@@ -7,6 +7,44 @@ export const CardRowBlock: Block = {
     plural: "Card Rows",
   },
   fields: [
+    {
+      type: "collapsible",
+      label: "Section",
+      fields: [
+        {
+          name: "sectionHeading",
+          label: "Section Heading",
+          type: "text",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionDescription",
+          label: "Section Description",
+          type: "textarea",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionLinkButton",
+          label: "Section Link Button",
+          type: "group",
+          fields: [
+            {
+              name: "label",
+              type: "text",
+              required: false,
+              localized: true,
+            },
+            {
+              name: "url",
+              type: "text",
+              required: false,
+            },
+          ],
+        },
+      ],
+    },
     {
       name: "cards",
       label: "Cards",
diff --git a/src/blocks/FaqBlock.ts b/src/blocks/FaqBlock.ts
index d2100f3d..8a0d0e0c 100644
--- a/src/blocks/FaqBlock.ts
+++ b/src/blocks/FaqBlock.ts
@@ -7,6 +7,44 @@ export const FaqBlock: Block = {
     plural: "FAQ Blocks",
   },
   fields: [
+    {
+      type: "collapsible",
+      label: "Section",
+      fields: [
+        {
+          name: "sectionHeading",
+          label: "Section Heading",
+          type: "text",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionDescription",
+          label: "Section Description",
+          type: "textarea",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionLinkButton",
+          label: "Section Link Button",
+          type: "group",
+          fields: [
+            {
+              name: "label",
+              type: "text",
+              required: false,
+              localized: true,
+            },
+            {
+              name: "url",
+              type: "text",
+              required: false,
+            },
+          ],
+        },
+      ],
+    },
     {
       name: "items",
       label: "FAQ Items",
diff --git a/src/blocks/OffsetCardsBlock.ts b/src/blocks/OffsetCardsBlock.ts
index a120e086..2bda514c 100644
--- a/src/blocks/OffsetCardsBlock.ts
+++ b/src/blocks/OffsetCardsBlock.ts
@@ -8,10 +8,42 @@ export const OffsetCardsBlock: Block = {
   },
   fields: [
     {
-      name: "showSectionHeader",
-      label: "Show Section Header",
-      type: "checkbox",
-      defaultValue: false,
+      type: "collapsible",
+      label: "Section",
+      fields: [
+        {
+          name: "sectionHeading",
+          label: "Section Heading",
+          type: "text",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionDescription",
+          label: "Section Description",
+          type: "textarea",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionLinkButton",
+          label: "Section Link Button",
+          type: "group",
+          fields: [
+            {
+              name: "label",
+              type: "text",
+              required: false,
+              localized: true,
+            },
+            {
+              name: "url",
+              type: "text",
+              required: false,
+            },
+          ],
+        },
+      ],
     },
     {
       name: "cards",
diff --git a/src/blocks/RoadmapBlock.ts b/src/blocks/RoadmapBlock.ts
index ab4af6c0..0f6129cf 100644
--- a/src/blocks/RoadmapBlock.ts
+++ b/src/blocks/RoadmapBlock.ts
@@ -7,6 +7,44 @@ export const RoadmapBlock: Block = {
     plural: "Roadmap Blocks",
   },
   fields: [
+    {
+      type: "collapsible",
+      label: "Section",
+      fields: [
+        {
+          name: "sectionHeading",
+          label: "Section Heading",
+          type: "text",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionDescription",
+          label: "Section Description",
+          type: "textarea",
+          required: false,
+          localized: true,
+        },
+        {
+          name: "sectionLinkButton",
+          label: "Section Link Button",
+          type: "group",
+          fields: [
+            {
+              name: "label",
+              type: "text",
+              required: false,
+              localized: true,
+            },
+            {
+              name: "url",
+              type: "text",
+              required: false,
+            },
+          ],
+        },
+      ],
+    },
     {
       name: "items",
       label: "Items",
diff --git a/src/collections/sections.ts b/src/collections/sections.ts
deleted file mode 100644
index 71865708..00000000
--- a/src/collections/sections.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { CollectionConfig } from 'payload'
-
-export const Sections: CollectionConfig = {
-    slug: 'sections',
-    admin: {
-      useAsTitle: 'heading',
-    },
-    fields: [
-        {
-            name: 'heading',
-            type: 'text',
-            required: true,
-            localized: true,
-        },
-        {
-            name: 'subheading',
-            type: 'text',
-            required: false,
-            localized: true,
-        },
-        {
-            name: 'sectionType',
-            label: 'Section Type',
-            type: 'select',
-            required: true,
-            options: [
-                {
-                    label: 'AppFeatureSection',
-                    value: 'AppFeatureSection',
-                },
-                {
-                    label: 'FaqSection',
-                    value: 'FaqSection',
-                },
-                {
-                    label: 'RoadmapSection',
-                    value: 'RoadmapSection',
-                },
-                {
-                    label: 'RuntimeFeatureSection',
-                    value: 'RuntimeFeatureSection',
-                },
-                {
-                    label: 'UseCaseSection',
-                    value: 'UseCaseSection',
-                },
-                {
-                    label: 'DeploymentSection',
-                    value: 'DeploymentSection',
-                },
-                {
-                    label: 'CardRowSection',
-                    value: 'CardRowSection',
-                },
-            ],
-        },
-        {
-            name: 'link_button',
-            label: 'Link Button',
-            type: 'group',
-            fields: [
-                {
-                    name: 'label',
-                    type: 'text',
-                    required: false,
-                    localized: true,
-                },
-                {
-                    name: 'url',
-                    type: 'text',
-                    required: false,
-                },
-            ],
-        },
-    ],
-}
diff --git a/src/components/PageBlockRenderer.tsx b/src/components/PageBlockRenderer.tsx
index 054882ca..6e52af9f 100644
--- a/src/components/PageBlockRenderer.tsx
+++ b/src/components/PageBlockRenderer.tsx
@@ -36,7 +36,7 @@ function renderPageBlock(block: PageBlock, options: Pick<PageBlocksRendererProps
         case "faq":
             return <FaqSection content={block} />
         case "cta":
-            return <CtaSection content={block} floatingCta={options.ctaFloating} locale={options.locale} />
+            return <CtaSection content={block} floatingCta={options.ctaFloating} />
         case "install":
             return <InstallSection content={block} />
         case "roadmap":
diff --git a/src/components/providers/SectionsProvider.tsx b/src/components/providers/SectionsProvider.tsx
deleted file mode 100644
index 24a870c6..00000000
--- a/src/components/providers/SectionsProvider.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-"use client"
-
-import type { Section } from "@/payload-types"
-import { createContext, type ReactNode, useContext, useMemo } from "react"
-
-type SectionType = NonNullable<Section["sectionType"]>
-type SectionsMap = Partial<Record<SectionType, Section>>
-
-const SectionsContext = createContext<SectionsMap>({})
-
-interface SectionsProviderProps {
-    sections: Section[]
-    children: ReactNode
-}
-
-export function SectionsProvider({ sections, children }: SectionsProviderProps) {
-    const sectionsMap = useMemo<SectionsMap>(() => {
-        return sections.reduce<SectionsMap>((acc, section) => {
-            acc[section.sectionType] = section
-            return acc
-        }, {})
-    }, [sections])
-
-    return (
-        <SectionsContext.Provider value={sectionsMap}>
-            {children}
-        </SectionsContext.Provider>
-    )
-}
-
-export function usePreloadedSection(sectionType?: SectionType) {
-    const sections = useContext(SectionsContext)
-    if (!sectionType) return null
-    return sections[sectionType] ?? null
-}
diff --git a/src/components/sections/BentoSection.tsx b/src/components/sections/BentoSection.tsx
index f02b5ceb..6c064fa7 100644
--- a/src/components/sections/BentoSection.tsx
+++ b/src/components/sections/BentoSection.tsx
@@ -14,7 +14,9 @@ export function BentoSection({ content, locale = "en" }: BentoSectionProps) {
 
     return (
         <Section
-            sectionType={variant === "runtime" ? "RuntimeFeatureSection" : "AppFeatureSection"}
+            heading={content?.sectionHeading}
+            description={content?.sectionDescription}
+            linkButton={content?.sectionLinkButton}
             fullHeight
         >
             {variant === "runtime" ? (
diff --git a/src/components/sections/CardRowSection.tsx b/src/components/sections/CardRowSection.tsx
index c9f181e6..fb78bd0f 100644
--- a/src/components/sections/CardRowSection.tsx
+++ b/src/components/sections/CardRowSection.tsx
@@ -45,7 +45,13 @@ export function CardRowSection({ content, children }: CardRowSectionProps) {
     }
 
     return (
-        <Section sectionType="CardRowSection" funnelType="left" animationPreset="zoom-in">
+        <Section
+            heading={content?.sectionHeading}
+            description={content?.sectionDescription}
+            linkButton={content?.sectionLinkButton}
+            funnelType="left"
+            animationPreset="zoom-in"
+        >
             <div aria-hidden="true" className="pointer-events-none absolute -bottom-40 -top-16 inset-x-0 [background:radial-gradient(circle,rgba(114,201,248,0.1),transparent_50%)]" />
 
             <motion.div
diff --git a/src/components/sections/FaqSection.tsx b/src/components/sections/FaqSection.tsx
index 43cb5f26..05b40fbd 100644
--- a/src/components/sections/FaqSection.tsx
+++ b/src/components/sections/FaqSection.tsx
@@ -23,7 +23,13 @@ export function FaqSection({ content }: FaqSectionProps) {
     if (!content || !content.items) return
 
     return (
-        <Section sectionType="FaqSection" showLinkButton={false} showBlur={false}>
+        <Section
+            heading={content.sectionHeading}
+            description={content.sectionDescription}
+            linkButton={content.sectionLinkButton}
+            showLinkButton={false}
+            showBlur={false}
+        >
             <div aria-hidden="true" className="pointer-events-none absolute inset-0 [background:radial-gradient(circle,rgba(255,255,255,0.05),transparent_50%)]" />
             <div className={"md:w-[50vw] flex flex-col gap-4 mx-auto"}>
                 {content.items.map((faq, index) => (
diff --git a/src/components/sections/OffsetCardsSection.tsx b/src/components/sections/OffsetCardsSection.tsx
index b612907f..bda6c4a2 100644
--- a/src/components/sections/OffsetCardsSection.tsx
+++ b/src/components/sections/OffsetCardsSection.tsx
@@ -46,9 +46,10 @@ export function OffsetCardsSection({ content }: OffsetCardsSectionProps) {
 
     return (
         <Section
-            sectionType={content.showSectionHeader ? "UseCaseSection" : undefined}
+            heading={content.sectionHeading}
+            description={content.sectionDescription}
+            linkButton={content.sectionLinkButton}
             showBlur={false}
-            showFunnel={Boolean(content.showSectionHeader)}
             animationPreset="none"
         >
             <div className="relative flex w-full flex-col items-stretch gap-32">
diff --git a/src/components/sections/RoadmapSection.tsx b/src/components/sections/RoadmapSection.tsx
index 1adcf723..5dff59b4 100644
--- a/src/components/sections/RoadmapSection.tsx
+++ b/src/components/sections/RoadmapSection.tsx
@@ -13,7 +13,13 @@ export function RoadmapSection({ content }: RoadmapSectionProps) {
     if (!items?.length) return null
 
     return (
-        <Section sectionType="RoadmapSection" funnelType="left" animationPreset="zoom-in">
+        <Section
+            heading={content?.sectionHeading}
+            description={content?.sectionDescription}
+            linkButton={content?.sectionLinkButton}
+            funnelType="left"
+            animationPreset="zoom-in"
+        >
             <div className="relative w-full py-8 md:py-16">
             <div aria-hidden="true" className="pointer-events-none absolute left-3 top-0 h-full w-0.5 rounded-full bg-linear-to-b from-brand/10 via-white/20 to-blue/10 md:left-1/2 md:-translate-x-1/2" />
                 <div className="flex flex-col gap-10 md:gap-14">
diff --git a/src/components/ui/Section.tsx b/src/components/ui/Section.tsx
index a8325ace..3f0904c2 100644
--- a/src/components/ui/Section.tsx
+++ b/src/components/ui/Section.tsx
@@ -1,19 +1,24 @@
 "use client"
 
-import { usePreloadedSection } from "@/components/providers/SectionsProvider"
 import { LinkButton } from "@/components/ui/LinkButton"
 import { getLocaleFromPath, localizeHref } from "@/lib/i18n"
 import { ANIMATION_PRESETS, cn, type AnimationPreset } from "@/lib/utils"
-import { Section as SectionDocument } from "@/payload-types"
 import { m as motion, type Variants } from "motion/react"
 import { usePathname } from "next/navigation"
 import { createElement, ReactNode, useEffect, useRef, useState } from "react"
 
+interface SectionLinkButton {
+    label?: string | null
+    url?: string | null
+}
+
 interface SectionProps {
     children: ReactNode
     funnelType?: "center" | "left"
     className?: string
-    sectionType?: NonNullable<SectionDocument["sectionType"]>
+    heading?: string | null
+    description?: string | null
+    linkButton?: SectionLinkButton | null
     showBlur?: boolean
     showFunnel?: boolean
     showLinkButton?: boolean
@@ -28,7 +33,9 @@ interface SectionProps {
 }
 
 export function Section({
-    sectionType,
+    heading,
+    description,
+    linkButton,
     children,
     className,
     funnelType = "center",
@@ -44,13 +51,13 @@ export function Section({
     animationViewportMargin,
     headingLevel = 2,
 }: SectionProps) {
-    const sectionData = usePreloadedSection(sectionType) as SectionDocument | null
     const sectionRef = useRef<HTMLElement | null>(null)
     const pathname = usePathname()
     const locale = getLocaleFromPath(pathname)
     const [isInView, setIsInView] = useState(false)
-    const rawLinkUrl = sectionData?.link_button?.url?.trim()
+    const rawLinkUrl = linkButton?.url?.trim()
     const linkUrl = rawLinkUrl ? localizeHref(rawLinkUrl, locale) : undefined
+    const shouldShowFunnel = showFunnel && Boolean(heading || description || (showLinkButton && linkUrl && linkButton?.label))
     const animationConfig = animationPreset === "none" ? null : ANIMATION_PRESETS[animationPreset]
     const staggerContainer: Variants = {
         hidden: {},
@@ -116,7 +123,7 @@ export function Section({
             {showBlur && funnelType === "center" && (
                 <div aria-hidden="true" className="pointer-events-none absolute -bottom-60 -top-24 left-1/2 w-[120vw] max-w-none -translate-x-1/2 [background:radial-gradient(circle,rgba(255,255,255,0.1),transparent_70%)] md:inset-x-0 md:w-auto md:translate-x-0" />
             )}
-            {showFunnel && (
+            {shouldShowFunnel && (
                 funnelType === "center" ? (
                     <motion.div
                         className={"flex flex-col gap-4 items-center justify-center text-center"}
@@ -128,15 +135,17 @@ export function Section({
                         {createElement(
                             motion[headingTag],
                             { variants: staggerItem, className: "text-4xl text-white font-semibold" },
-                            sectionData?.heading,
+                            heading,
+                        )}
+                        {description && (
+                            <motion.p variants={staggerItem} className="relative z-10 max-w-[90vw] lg:w-1/2 text-center font-medium text-white/75 text-xl">
+                                {description}
+                            </motion.p>
                         )}
-                        <motion.p variants={staggerItem} className="relative z-10 max-w-[90vw] lg:w-1/2 text-center font-medium text-white/75 text-xl">
-                            {sectionData?.subheading}
-                        </motion.p>
                         {showLinkButton && linkUrl &&
                             <motion.div variants={staggerItem}>
                                 <LinkButton href={linkUrl}>
-                                    {sectionData?.link_button?.label}
+                                    {linkButton?.label}
                                 </LinkButton>
                             </motion.div>
                         }
@@ -152,15 +161,17 @@ export function Section({
                         {createElement(
                             motion[headingTag],
                             { variants: staggerItem, className: "text-4xl text-white font-semibold" },
-                            sectionData?.heading,
+                            heading,
+                        )}
+                        {description && (
+                            <motion.p variants={staggerItem} className="relative z-10 max-w-[90vw] lg:w-1/2 font-medium text-white/75 text-xl">
+                                {description}
+                            </motion.p>
                         )}
-                        <motion.p variants={staggerItem} className="relative z-10 max-w-[90vw] lg:w-1/2 font-medium text-white/75 text-xl">
-                            {sectionData?.subheading}
-                        </motion.p>
                         {showLinkButton && linkUrl &&
                             <motion.div variants={staggerItem}>
                                 <LinkButton href={linkUrl}>
-                                    {sectionData?.link_button?.label}
+                                    {linkButton?.label}
                                 </LinkButton>
                             </motion.div>
                         }
diff --git a/src/lib/cms.ts b/src/lib/cms.ts
index 6a9dbd54..ca29046c 100644
--- a/src/lib/cms.ts
+++ b/src/lib/cms.ts
@@ -2,7 +2,7 @@
 
 import { DEFAULT_LOCALE, type AppLocale } from "@/lib/i18n"
 import { getPayloadClient } from "@/lib/payloadClient"
-import type { Action, Blog, CookieBanner, Feature, Footer, Job, Media, NavbarItem, Page, Section, TeamMember } from "@/payload-types"
+import type { Action, Blog, CookieBanner, Feature, Footer, Job, Media, NavbarItem, Page, TeamMember } from "@/payload-types"
 import { cache } from "react"
 
 const isBuildPhase = process.env.NEXT_PHASE === "phase-production-build" || process.env.npm_lifecycle_event === "build"
@@ -517,21 +517,6 @@ const getBlogSlugsCached = cache(async (locale: AppLocale): Promise<string[]> =>
     })
 })
 
-const getSectionsCached = cache(async (locale: AppLocale): Promise<Section[]> => {
-    return withCmsFallback(`getSections(${locale})`, [], async () => {
-        const payload = await getPayloadClient()
-        const result = await payload.find({
-            collection: "sections",
-            locale,
-            fallbackLocale: DEFAULT_LOCALE,
-            pagination: false,
-            depth: 0,
-        })
-
-        return result.docs as Section[]
-    })
-})
-
 const getSubscriptionConfigCached = cache(async (locale: AppLocale): Promise<SubscriptionConfigData | null> => {
     return withCmsFallback(`getSubscriptionConfig(${locale})`, null, async () => {
         const payload = await getPayloadClient()
@@ -612,10 +597,6 @@ export async function getBlogSlugs(locale: AppLocale = DEFAULT_LOCALE): Promise<
     return getBlogSlugsCached(locale)
 }
 
-export async function getSections(locale: AppLocale = DEFAULT_LOCALE): Promise<Section[]> {
-    return getSectionsCached(locale)
-}
-
 export async function getSubscriptionConfig(locale: AppLocale = DEFAULT_LOCALE): Promise<SubscriptionConfigData | null> {
     return getSubscriptionConfigCached(locale)
 }
diff --git a/src/migrations/20260428_011_card_row_block.ts b/src/migrations/20260428_011_card_row_block.ts
index 8a7998b7..dbf3b296 100644
--- a/src/migrations/20260428_011_card_row_block.ts
+++ b/src/migrations/20260428_011_card_row_block.ts
@@ -133,9 +133,6 @@ export async function up({ db }: MigrateUpArgs): Promise<void> {
 
     DROP TABLE IF EXISTS "pages_blocks_deployment" CASCADE;
 
-    UPDATE "sections"
-    SET "section_type" = 'CardRowSection'
-    WHERE "section_type" = 'DeploymentSection';
   `)
 }
 
@@ -223,8 +220,5 @@ export async function down({ db }: MigrateDownArgs): Promise<void> {
     DROP TABLE IF EXISTS "pages_blocks_card_row_cards" CASCADE;
     DROP TABLE IF EXISTS "pages_blocks_card_row" CASCADE;
 
-    UPDATE "sections"
-    SET "section_type" = 'DeploymentSection'
-    WHERE "section_type" = 'CardRowSection';
   `)
 }
diff --git a/src/migrations/20260501_016_inline_section_fields.ts b/src/migrations/20260501_016_inline_section_fields.ts
new file mode 100644
index 00000000..d2309471
--- /dev/null
+++ b/src/migrations/20260501_016_inline_section_fields.ts
@@ -0,0 +1,214 @@
+import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
+
+export async function up({ db }: MigrateUpArgs): Promise<void> {
+  await db.execute(sql`
+    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_bento" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND (
+        (block."variant" = 'feature' AND section_source."section_type" = 'AppFeatureSection')
+        OR (block."variant" = 'runtime' AND section_source."section_type" = 'RuntimeFeatureSection')
+      );
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_roadmap" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND section_source."section_type" = 'RoadmapSection';
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_faq" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND section_source."section_type" = 'FaqSection';
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_offset_cards" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND COALESCE(block."show_section_header", false) = true
+      AND section_source."section_type" = 'UseCaseSection';
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_card_row" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND section_source."section_type" IN ('CardRowSection', 'DeploymentSection');
+
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "show_section_header";
+
+    ALTER TABLE "payload_locked_documents_rels" DROP CONSTRAINT IF EXISTS "payload_locked_documents_rels_sections_fk";
+    DROP INDEX IF EXISTS "payload_locked_documents_rels_sections_id_idx";
+    ALTER TABLE "payload_locked_documents_rels" DROP COLUMN IF EXISTS "sections_id";
+
+    DROP TABLE IF EXISTS "sections_locales" CASCADE;
+    DROP TABLE IF EXISTS "sections" CASCADE;
+    DROP TYPE IF EXISTS "public"."enum_sections_section_type";
+  `)
+}
+
+export async function down({ db }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+    DO $$ BEGIN
+      CREATE TYPE "public"."enum_sections_section_type" AS ENUM('AppFeatureSection', 'FaqSection', 'RoadmapSection', 'RuntimeFeatureSection', 'UseCaseSection', 'DeploymentSection', 'CardRowSection');
+    EXCEPTION
+      WHEN duplicate_object THEN null;
+    END $$;
+
+    CREATE TABLE IF NOT EXISTS "sections" (
+      "id" serial PRIMARY KEY NOT NULL,
+      "section_type" "enum_sections_section_type" NOT NULL,
+      "link_button_url" varchar,
+      "updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+      "created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS "sections_locales" (
+      "heading" varchar NOT NULL,
+      "subheading" varchar,
+      "link_button_label" varchar,
+      "id" serial PRIMARY KEY NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "_parent_id" integer NOT NULL
+    );
+
+    ALTER TABLE "sections_locales"
+      ADD CONSTRAINT "sections_locales_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."sections"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "sections_updated_at_idx" ON "sections" USING btree ("updated_at");
+    CREATE INDEX IF NOT EXISTS "sections_created_at_idx" ON "sections" USING btree ("created_at");
+    CREATE UNIQUE INDEX IF NOT EXISTS "sections_locales_locale_parent_id_unique" ON "sections_locales" USING btree ("_locale","_parent_id");
+
+    ALTER TABLE "payload_locked_documents_rels" ADD COLUMN IF NOT EXISTS "sections_id" integer;
+    ALTER TABLE "payload_locked_documents_rels"
+      ADD CONSTRAINT "payload_locked_documents_rels_sections_fk"
+      FOREIGN KEY ("sections_id") REFERENCES "public"."sections"("id")
+      ON DELETE cascade ON UPDATE no action;
+    CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_sections_id_idx" ON "payload_locked_documents_rels" USING btree ("sections_id");
+
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "show_section_header" boolean DEFAULT false;
+    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_link_button_url";
+    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_link_button_url";
+    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_link_button_url";
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_link_button_url";
+    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_link_button_url";
+  `)
+}
diff --git a/src/migrations/index.ts b/src/migrations/index.ts
index 3c9ec908..4eea6e64 100644
--- a/src/migrations/index.ts
+++ b/src/migrations/index.ts
@@ -15,6 +15,7 @@ import * as migration_20260428_012_offset_cards_block from './20260428_012_offse
 import * as migration_20260428_013_install_and_swipe_cards_blocks from './20260428_013_install_and_swipe_cards_blocks';
 import * as migration_20260501_014_bento_block from './20260501_014_bento_block';
 import * as migration_20260501_015_roadmap_block from './20260501_015_roadmap_block';
+import * as migration_20260501_016_inline_section_fields from './20260501_016_inline_section_fields';
 
 export const migrations = [
   {
@@ -102,4 +103,9 @@ export const migrations = [
     down: migration_20260501_015_roadmap_block.down,
     name: '20260501_015_roadmap_block'
   },
+  {
+    up: migration_20260501_016_inline_section_fields.up,
+    down: migration_20260501_016_inline_section_fields.down,
+    name: '20260501_016_inline_section_fields'
+  },
 ];
diff --git a/src/payload-types.ts b/src/payload-types.ts
index b39bc7b0..e427d655 100644
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -70,7 +70,6 @@ export interface Config {
     users: User;
     media: Media;
     navbarItems: NavbarItem;
-    sections: Section;
     footer: Footer;
     'cookie-banner': CookieBanner;
     pages: Page;
@@ -93,7 +92,6 @@ export interface Config {
     users: UsersSelect<false> | UsersSelect<true>;
     media: MediaSelect<false> | MediaSelect<true>;
     navbarItems: NavbarItemsSelect<false> | NavbarItemsSelect<true>;
-    sections: SectionsSelect<false> | SectionsSelect<true>;
     footer: FooterSelect<false> | FooterSelect<true>;
     'cookie-banner': CookieBannerSelect<false> | CookieBannerSelect<true>;
     pages: PagesSelect<false> | PagesSelect<true>;
@@ -227,29 +225,6 @@ export interface NavbarItem {
   updatedAt: string;
   createdAt: string;
 }
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "sections".
- */
-export interface Section {
-  id: number;
-  heading: string;
-  subheading?: string | null;
-  sectionType:
-    | 'AppFeatureSection'
-    | 'FaqSection'
-    | 'RoadmapSection'
-    | 'RuntimeFeatureSection'
-    | 'UseCaseSection'
-    | 'DeploymentSection'
-    | 'CardRowSection';
-  link_button?: {
-    label?: string | null;
-    url?: string | null;
-  };
-  updatedAt: string;
-  createdAt: string;
-}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "footer".
@@ -388,13 +363,24 @@ export interface Page {
             blockType: 'hero';
           }
         | {
+            sectionHeading?: string | null;
+            sectionDescription?: string | null;
+            sectionLinkButton?: {
+              label?: string | null;
+              url?: string | null;
+            };
             variant: 'feature' | 'runtime';
             id?: string | null;
             blockName?: string | null;
             blockType: 'bento';
           }
         | {
-            showSectionHeader?: boolean | null;
+            sectionHeading?: string | null;
+            sectionDescription?: string | null;
+            sectionLinkButton?: {
+              label?: string | null;
+              url?: string | null;
+            };
             cards: {
               label: string;
               title: string;
@@ -450,6 +436,12 @@ export interface Page {
             blockType: 'brand';
           }
         | {
+            sectionHeading?: string | null;
+            sectionDescription?: string | null;
+            sectionLinkButton?: {
+              label?: string | null;
+              url?: string | null;
+            };
             items: {
               question: string;
               answer: string;
@@ -543,6 +535,12 @@ export interface Page {
             blockType: 'contact';
           }
         | {
+            sectionHeading?: string | null;
+            sectionDescription?: string | null;
+            sectionLinkButton?: {
+              label?: string | null;
+              url?: string | null;
+            };
             cards?:
               | {
                   title: string;
@@ -560,6 +558,12 @@ export interface Page {
             blockType: 'cardRow';
           }
         | {
+            sectionHeading?: string | null;
+            sectionDescription?: string | null;
+            sectionLinkButton?: {
+              label?: string | null;
+              url?: string | null;
+            };
             items: {
               time: string;
               title: string;
@@ -1054,10 +1058,6 @@ export interface PayloadLockedDocument {
         relationTo: 'navbarItems';
         value: number | NavbarItem;
       } | null)
-    | ({
-        relationTo: 'sections';
-        value: number | Section;
-      } | null)
     | ({
         relationTo: 'footer';
         value: number | Footer;
@@ -1200,23 +1200,6 @@ export interface NavbarItemsSelect<T extends boolean = true> {
   updatedAt?: T;
   createdAt?: T;
 }
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "sections_select".
- */
-export interface SectionsSelect<T extends boolean = true> {
-  heading?: T;
-  subheading?: T;
-  sectionType?: T;
-  link_button?:
-    | T
-    | {
-        label?: T;
-        url?: T;
-      };
-  updatedAt?: T;
-  createdAt?: T;
-}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "footer_select".
@@ -1375,6 +1358,14 @@ export interface PagesSelect<T extends boolean = true> {
         bento?:
           | T
           | {
+              sectionHeading?: T;
+              sectionDescription?: T;
+              sectionLinkButton?:
+                | T
+                | {
+                    label?: T;
+                    url?: T;
+                  };
               variant?: T;
               id?: T;
               blockName?: T;
@@ -1382,7 +1373,14 @@ export interface PagesSelect<T extends boolean = true> {
         offsetCards?:
           | T
           | {
-              showSectionHeader?: T;
+              sectionHeading?: T;
+              sectionDescription?: T;
+              sectionLinkButton?:
+                | T
+                | {
+                    label?: T;
+                    url?: T;
+                  };
               cards?:
                 | T
                 | {
@@ -1450,6 +1448,14 @@ export interface PagesSelect<T extends boolean = true> {
         faq?:
           | T
           | {
+              sectionHeading?: T;
+              sectionDescription?: T;
+              sectionLinkButton?:
+                | T
+                | {
+                    label?: T;
+                    url?: T;
+                  };
               items?:
                 | T
                 | {
@@ -1540,6 +1546,14 @@ export interface PagesSelect<T extends boolean = true> {
         cardRow?:
           | T
           | {
+              sectionHeading?: T;
+              sectionDescription?: T;
+              sectionLinkButton?:
+                | T
+                | {
+                    label?: T;
+                    url?: T;
+                  };
               cards?:
                 | T
                 | {
@@ -1560,6 +1574,14 @@ export interface PagesSelect<T extends boolean = true> {
         roadmap?:
           | T
           | {
+              sectionHeading?: T;
+              sectionDescription?: T;
+              sectionLinkButton?:
+                | T
+                | {
+                    label?: T;
+                    url?: T;
+                  };
               items?:
                 | T
                 | {
@@ -1955,7 +1977,6 @@ export interface TaskCreateCollectionExport {
       | 'users'
       | 'media'
       | 'navbarItems'
-      | 'sections'
       | 'footer'
       | 'cookie-banner'
       | 'pages'
diff --git a/src/payload.config.ts b/src/payload.config.ts
index 96606cfc..fe0f891d 100644
--- a/src/payload.config.ts
+++ b/src/payload.config.ts
@@ -16,7 +16,6 @@ import { Jobs } from './collections/jobs'
 import { Media } from './collections/media'
 import { NavbarItems } from './collections/navbarItems'
 import { Pages } from './collections/pages'
-import { Sections } from './collections/sections'
 import { SubscriptionCollection } from './collections/subscriptionConfig'
 import { TeamMembers } from './collections/teamMembers'
 import { Users } from './collections/users'
@@ -26,7 +25,9 @@ const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 const smtpHost = process.env.SMTP_HOST
 const isBuildPhase = process.env.NEXT_PHASE === "phase-production-build" || process.env.npm_lifecycle_event === "build"
+const isDevelopment = process.env.NODE_ENV === "development"
 const shouldSkipEmailVerify =
+    isDevelopment ||
     isBuildPhase ||
     process.env.PAYLOAD_SKIP_EMAIL_VERIFY === "true" ||
     !smtpHost
@@ -42,7 +43,7 @@ export default buildConfig({
         locales: ['en', 'de'],
         defaultLocale: 'en',
     },
-    collections: [Users, Media, NavbarItems, Sections, Footer, CookieBanner, Pages, Features, Actions, Jobs, Blog, TeamMembers, SubscriptionCollection],
+    collections: [Users, Media, NavbarItems, Footer, CookieBanner, Pages, Features, Actions, Jobs, Blog, TeamMembers, SubscriptionCollection],
     jobs: {
         autoRun: [{
             cron: '*/5 * * * *', // Check every 5 minutes
@@ -88,7 +89,6 @@ export default buildConfig({
                 { slug: 'users', },
                 { slug: 'media', },
                 { slug: 'navbarItems' },
-                { slug: 'sections' },
                 { slug: 'footer' },
                 { slug: 'cookie-banner' },
                 { slug: 'pages' },

From 8eea6c6d55b252c80726dfad44e0ba5d6dc9f834 Mon Sep 17 00:00:00 2001
From: Marius Ahsmus <marius.ahsmus@gmail.com>
Date: Fri, 1 May 2026 15:28:57 +0200
Subject: [PATCH 06/11] feat: scrollcard block

---
 src/blocks/ScrollCardBlock.ts                 | 145 ++++++++++++
 src/collections/pages.ts                      |   3 +-
 src/components/PageBlockRenderer.tsx          |   3 +
 src/components/sections/ScrollCardSection.tsx | 222 ++++++++++++++++++
 src/lib/cms.ts                                |   1 +
 .../20260501_017_scroll_card_block.ts         |  62 +++++
 src/migrations/index.ts                       |   6 +
 src/payload-types.ts                          |  45 ++++
 8 files changed, 486 insertions(+), 1 deletion(-)
 create mode 100644 src/blocks/ScrollCardBlock.ts
 create mode 100644 src/components/sections/ScrollCardSection.tsx
 create mode 100644 src/migrations/20260501_017_scroll_card_block.ts

diff --git a/src/blocks/ScrollCardBlock.ts b/src/blocks/ScrollCardBlock.ts
new file mode 100644
index 00000000..1270e38b
--- /dev/null
+++ b/src/blocks/ScrollCardBlock.ts
@@ -0,0 +1,145 @@
+import type { Block } from "payload"
+
+export const ScrollCardBlock: Block = {
+  slug: "scrollCards",
+  labels: {
+    singular: "Scroll Cards",
+    plural: "Scroll Cards Blocks",
+  },
+  fields: [
+    {
+      name: "items",
+      label: "Items",
+      type: "array",
+      required: true,
+      fields: [
+        {
+          name: "title",
+          type: "text",
+          required: true,
+          localized: true,
+        },
+        {
+          name: "description",
+          type: "textarea",
+          required: true,
+          localized: true,
+        },
+        {
+          name: "showImageBorder",
+          label: "Show Image Border",
+          type: "checkbox",
+          defaultValue: true,
+        },
+        {
+          name: "sectionLayout",
+          label: "Section Layout",
+          type: "select",
+          required: true,
+          defaultValue: "imageRight",
+          options: [
+            {
+              label: "Image right",
+              value: "imageRight",
+            },
+            {
+              label: "Image left",
+              value: "imageLeft",
+            },
+          ],
+        },
+        {
+          name: "gradient",
+          label: "Gradient",
+          type: "select",
+          required: false,
+          defaultValue: "blue",
+          options: [
+            {
+              label: "Blue",
+              value: "blue",
+            },
+            {
+              label: "Yellow",
+              value: "yellow",
+            },
+            {
+              label: "Pink",
+              value: "pink",
+            },
+            {
+              label: "Aqua",
+              value: "aqua",
+            },
+            {
+              label: "Brand",
+              value: "brand",
+            },
+            {
+              label: "Neutral",
+              value: "neutral",
+            },
+          ],
+        },
+        {
+          name: "gradientDirection",
+          label: "Gradient Direction",
+          type: "select",
+          required: false,
+          defaultValue: "topLeft",
+          options: [
+            {
+              label: "Top left",
+              value: "topLeft",
+            },
+            {
+              label: "Top right",
+              value: "topRight",
+            },
+            {
+              label: "Bottom left",
+              value: "bottomLeft",
+            },
+            {
+              label: "Bottom right",
+              value: "bottomRight",
+            },
+          ],
+        },
+        {
+          name: "bulletPoints",
+          label: "Bullet Points",
+          type: "text",
+          required: false,
+          hasMany: true,
+          localized: true,
+        },
+        {
+          name: "image",
+          label: "Image",
+          type: "upload",
+          relationTo: "media",
+          required: false,
+        },
+        {
+          name: "link",
+          label: "Link",
+          type: "group",
+          fields: [
+            {
+              name: "label",
+              type: "text",
+              required: false,
+              localized: true,
+            },
+            {
+              name: "url",
+              type: "text",
+              required: false,
+            },
+          ],
+        },
+      ],
+    },
+  ],
+}
diff --git a/src/collections/pages.ts b/src/collections/pages.ts
index c37e5d87..b0ec96ba 100644
--- a/src/collections/pages.ts
+++ b/src/collections/pages.ts
@@ -13,6 +13,7 @@ import { JobsBlock } from "../blocks/JobsBlock"
 import { MarkdownBlock } from "../blocks/MarkdownBlock"
 import { OffsetCardsBlock } from "../blocks/OffsetCardsBlock"
 import { RoadmapBlock } from "../blocks/RoadmapBlock"
+import { ScrollCardBlock } from "../blocks/ScrollCardBlock"
 import type { CollectionConfig } from "payload"
 
 export const Pages: CollectionConfig = {
@@ -60,7 +61,7 @@ export const Pages: CollectionConfig = {
       name: "layout",
       label: "Layout",
       type: "blocks",
-      blocks: [HeroBlock, BentoBlock, OffsetCardsBlock, InstallBlock, SwipeCardBlock, BrandBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, CardRowBlock, RoadmapBlock],
+      blocks: [HeroBlock, BentoBlock, OffsetCardsBlock, InstallBlock, SwipeCardBlock, BrandBlock, FaqBlock, CtaBlock, JobsBlock, BlogBlock, ActionBlock, MarkdownBlock, ContactBlock, CardRowBlock, RoadmapBlock, ScrollCardBlock],
       required: false,
       localized: true,
     },
diff --git a/src/components/PageBlockRenderer.tsx b/src/components/PageBlockRenderer.tsx
index 6e52af9f..94b11f27 100644
--- a/src/components/PageBlockRenderer.tsx
+++ b/src/components/PageBlockRenderer.tsx
@@ -7,6 +7,7 @@ import { HeroSection } from "@/components/sections/HeroSection"
 import { InstallSection } from "@/components/sections/InstallSection"
 import { OffsetCardsSection } from "@/components/sections/OffsetCardsSection"
 import { RoadmapSection } from "@/components/sections/RoadmapSection"
+import { ScrollCardSection } from "@/components/sections/ScrollCardSection"
 import { SwipeCardSection } from "@/components/sections/SwipeCardSection"
 import type { AppLocale } from "@/lib/i18n"
 import type { Page } from "@/payload-types"
@@ -41,6 +42,8 @@ function renderPageBlock(block: PageBlock, options: Pick<PageBlocksRendererProps
             return <InstallSection content={block} />
         case "roadmap":
             return <RoadmapSection content={block} />
+        case "scrollCards":
+            return <ScrollCardSection content={block} />
         case "swipeCards":
             return <SwipeCardSection content={block} />
         default:
diff --git a/src/components/sections/ScrollCardSection.tsx b/src/components/sections/ScrollCardSection.tsx
new file mode 100644
index 00000000..a7510650
--- /dev/null
+++ b/src/components/sections/ScrollCardSection.tsx
@@ -0,0 +1,222 @@
+"use client"
+
+import { LinkButton } from "@/components/ui/LinkButton"
+import { Section } from "@/components/ui/Section"
+import type { ScrollCardsLayoutBlock } from "@/lib/cms"
+import { cn } from "@/lib/utils"
+import type { Media } from "@/payload-types"
+import { m as motion } from "motion/react"
+import Image from "next/image"
+import React, { useEffect, useRef, useState } from "react"
+
+interface ScrollCardSectionProps {
+    content?: ScrollCardsLayoutBlock | null
+}
+
+interface PinState {
+    phase: "before" | "active" | "after"
+    left: number
+    width: number
+}
+
+function getImage(image: number | Media | null | undefined) {
+    return typeof image === "object" ? image : null
+}
+
+function clamp(value: number, min: number, max: number) {
+    return Math.min(Math.max(value, min), max)
+}
+
+const cardGradients = {
+    blue: "rgba(114,201,248,0.2)",
+    yellow: "rgba(248,241,114,0.2)",
+    pink: "rgba(248,114,226,0.2)",
+    aqua: "rgba(122,203,255,0.2)",
+    brand: "rgba(145,232,120,0.2)",
+    neutral: "rgba(255,255,255,0.1)",
+} as const
+
+const gradientDirections = {
+    topLeft: "top left",
+    topRight: "top right",
+    bottomLeft: "bottom left",
+    bottomRight: "bottom right",
+} as const
+
+export function ScrollCardSection({ content }: ScrollCardSectionProps) {
+    const containerRef = useRef<HTMLDivElement | null>(null)
+    const [scrollProgress, setScrollProgress] = useState(0)
+    const [viewportHeight, setViewportHeight] = useState(1)
+    const [pinState, setPinState] = useState<PinState>({
+        phase: "before",
+        left: 0,
+        width: 0,
+    })
+    const items = content?.items?.filter((item) => Boolean(item.title)) ?? []
+
+    useEffect(() => {
+        let frame = 0
+
+        const updateProgress = () => {
+            const container = containerRef.current
+            if (!container) return
+
+            const rect = container.getBoundingClientRect()
+            const topOffset = 96
+            const height = window.innerHeight
+            const containerTop = rect.top + window.scrollY
+            const rawProgress = window.scrollY - containerTop
+            const activeEnd = Math.max((items.length - 1) * height, 0)
+
+            setViewportHeight(height)
+            setScrollProgress(clamp(rawProgress, 0, activeEnd))
+            setPinState({
+                phase: rect.top > topOffset ? "before" : rect.bottom <= height ? "after" : "active",
+                left: rect.left,
+                width: rect.width,
+            })
+        }
+
+        const handleViewportChange = () => {
+            if (frame) return
+            frame = window.requestAnimationFrame(() => {
+                frame = 0
+                updateProgress()
+            })
+        }
+
+        updateProgress()
+        window.addEventListener("scroll", handleViewportChange, { passive: true })
+        window.addEventListener("resize", handleViewportChange)
+
+        return () => {
+            if (frame) window.cancelAnimationFrame(frame)
+            window.removeEventListener("scroll", handleViewportChange)
+            window.removeEventListener("resize", handleViewportChange)
+        }
+    }, [])
+
+    if (items.length === 0) return null
+    const activeShadowIndex = Math.min(
+        items.length - 1,
+        Math.floor(scrollProgress / viewportHeight) + 1,
+    )
+
+    return (
+        <Section showBlur={false} showFunnel={false} animationPreset="none">
+            <div
+                ref={containerRef}
+                className="relative"
+                style={{ height: `${Math.max(items.length, 1) * 100}vh` }}
+            >
+                <div
+                    className="h-[calc(100vh-6rem)]"
+                    style={{
+                        left: pinState.phase === "active" ? pinState.left : undefined,
+                        position: pinState.phase === "active" ? "fixed" : pinState.phase === "after" ? "absolute" : "relative",
+                        right: pinState.phase === "active" ? "auto" : undefined,
+                        top: pinState.phase === "active" ? 96 : pinState.phase === "after" ? "auto" : undefined,
+                        bottom: pinState.phase === "after" ? 0 : undefined,
+                        width: pinState.phase === "active" ? pinState.width : "100%",
+                        zIndex: 10,
+                    }}
+                >
+                {items.map((item, index) => {
+                    const image = getImage(item.image)
+                    const itemSettings = item as {
+                        gradient?: keyof typeof cardGradients | null
+                        gradientDirection?: keyof typeof gradientDirections | null
+                        sectionLayout?: "imageRight" | "imageLeft" | null
+                        showImageBorder?: boolean | null
+                    }
+                    const isImageLeft = itemSettings.sectionLayout === "imageLeft"
+                    const showImageBorder = itemSettings.showImageBorder ?? true
+                    const gradient = cardGradients[itemSettings.gradient ?? "blue"] ?? cardGradients.blue
+                    const gradientDirection = gradientDirections[itemSettings.gradientDirection ?? "topLeft"] ?? gradientDirections.topLeft
+                    const segmentProgress = index === 0
+                        ? 1
+                        : clamp((scrollProgress - (index - 1) * viewportHeight) / viewportHeight, 0, 1)
+                    const translateY = (1 - segmentProgress) * 100
+
+                    return (
+                        <motion.article
+                            key={item.id ?? `${item.title}-${index}`}
+                            className={cn(
+                                "absolute inset-0 will-change-transform [&>div]:shadow-none!",
+                                index === activeShadowIndex && "[&>div]:shadow-[0_16px_44px_rgba(0,0,0,0.3)]!",
+                            )}
+                            style={{
+                                opacity: 1,
+                                transform: `translateY(${translateY}%)`,
+                                zIndex: index + 1,
+                            }}
+                        >
+                            <div
+                                className="relative grid h-[80%] overflow-hidden rounded-3xl border border-white/10 bg-primary! p-4 md:grid-cols-[0.95fr_1.05fr] shadow-xl"
+                            >
+                                <div aria-hidden="true" className="glass-card-topline" />
+                                <div
+                                    aria-hidden="true"
+                                    className="pointer-events-none absolute inset-0"
+                                    style={{
+                                        backgroundImage: `radial-gradient(circle at ${gradientDirection}, ${gradient}, transparent 36%)`,
+                                    }}
+                                />
+
+                                <div className={cn(
+                                    "relative z-10 flex h-full flex-col justify-between gap-10 rounded-3xl p-4 md:p-8",
+                                    isImageLeft && "md:order-2",
+                                )}>
+                                    <div className="flex flex-col gap-4">
+                                        <h2 className="max-w-xl text-3xl font-semibold text-white md:text-5xl">
+                                            {item.title}
+                                        </h2>
+                                        <p className="max-w-xl text-base leading-7 text-white/75 md:text-lg">
+                                            {item.description}
+                                        </p>
+                                    </div>
+
+                                    <div className="space-y-6">
+                                        {item.bulletPoints?.length ? (
+                                            <ul className="grid gap-2 text-sm text-white/75 md:text-base">
+                                                {item.bulletPoints.map((point, pointIndex) => (
+                                                    <li key={`${item.id ?? item.title}-point-${pointIndex}`} className="flex items-start gap-3">
+                                                        <span className="mt-2 h-1.5 w-1.5 shrink-0 rounded-full bg-brand" />
+                                                        <span>{point}</span>
+                                                    </li>
+                                                ))}
+                                            </ul>
+                                        ) : null}
+
+                                        {item.link?.label && item.link?.url ? (
+                                            <LinkButton href={item.link.url}>
+                                                {item.link.label}
+                                            </LinkButton>
+                                        ) : null}
+                                    </div>
+                                </div>
+
+                                <div className={cn(
+                                    "relative z-10 min-h-72 overflow-hidden rounded-2xl md:min-h-full",
+                                    showImageBorder && "border border-white/10",
+                                    isImageLeft && "md:order-1",
+                                )}>
+                                    {image?.url && (
+                                        <Image
+                                            src={image.url}
+                                            alt={image.alt ?? item.title}
+                                            fill
+                                            sizes="(min-width: 768px) 50vw, 100vw"
+                                            className="object-cover"
+                                        />
+                                    )}
+                                </div>
+                            </div>
+                        </motion.article>
+                    )
+                })}
+                </div>
+            </div>
+        </Section>
+    )
+}
diff --git a/src/lib/cms.ts b/src/lib/cms.ts
index ca29046c..13207974 100644
--- a/src/lib/cms.ts
+++ b/src/lib/cms.ts
@@ -25,6 +25,7 @@ export type MarkdownLayoutBlock = Extract<PageLayoutBlock, { blockType: "markdow
 export type ContactLayoutBlock = Extract<PageLayoutBlock, { blockType: "contact" }>
 export type BlogLayoutBlock = Extract<PageLayoutBlock, { blockType: "blog" }>
 export type RoadmapLayoutBlock = Extract<PageLayoutBlock, { blockType: "roadmap" }>
+export type ScrollCardsLayoutBlock = Extract<PageLayoutBlock, { blockType: "scrollCards" }>
 
 
 type FeatureSlug = Feature["slug"]
diff --git a/src/migrations/20260501_017_scroll_card_block.ts b/src/migrations/20260501_017_scroll_card_block.ts
new file mode 100644
index 00000000..9fe95dbe
--- /dev/null
+++ b/src/migrations/20260501_017_scroll_card_block.ts
@@ -0,0 +1,62 @@
+import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
+
+export async function up({ db }: MigrateUpArgs): Promise<void> {
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_scroll_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_scroll_cards_items" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "show_image_border" boolean DEFAULT true,
+      "section_layout" varchar DEFAULT 'imageRight' NOT NULL,
+      "gradient" varchar DEFAULT 'blue',
+      "gradient_direction" varchar DEFAULT 'topLeft',
+      "bullet_points" jsonb,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_scroll_cards"
+      ADD CONSTRAINT "pages_blocks_scroll_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_scroll_cards_items"
+      ADD CONSTRAINT "pages_blocks_scroll_cards_items_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_scroll_cards_items"
+      ADD CONSTRAINT "pages_blocks_scroll_cards_items_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_scroll_cards"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_order_idx" ON "pages_blocks_scroll_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_parent_id_idx" ON "pages_blocks_scroll_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_path_idx" ON "pages_blocks_scroll_cards" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_locale_idx" ON "pages_blocks_scroll_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_order_idx" ON "pages_blocks_scroll_cards_items" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_parent_id_idx" ON "pages_blocks_scroll_cards_items" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_locale_idx" ON "pages_blocks_scroll_cards_items" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_image_idx" ON "pages_blocks_scroll_cards_items" USING btree ("image_id");
+  `)
+}
+
+export async function down({ db }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+    DROP TABLE IF EXISTS "pages_blocks_scroll_cards_items" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_scroll_cards" CASCADE;
+  `)
+}
diff --git a/src/migrations/index.ts b/src/migrations/index.ts
index 4eea6e64..955c7331 100644
--- a/src/migrations/index.ts
+++ b/src/migrations/index.ts
@@ -16,6 +16,7 @@ import * as migration_20260428_013_install_and_swipe_cards_blocks from './202604
 import * as migration_20260501_014_bento_block from './20260501_014_bento_block';
 import * as migration_20260501_015_roadmap_block from './20260501_015_roadmap_block';
 import * as migration_20260501_016_inline_section_fields from './20260501_016_inline_section_fields';
+import * as migration_20260501_017_scroll_card_block from './20260501_017_scroll_card_block';
 
 export const migrations = [
   {
@@ -108,4 +109,9 @@ export const migrations = [
     down: migration_20260501_016_inline_section_fields.down,
     name: '20260501_016_inline_section_fields'
   },
+  {
+    up: migration_20260501_017_scroll_card_block.up,
+    down: migration_20260501_017_scroll_card_block.down,
+    name: '20260501_017_scroll_card_block'
+  },
 ];
diff --git a/src/payload-types.ts b/src/payload-types.ts
index e427d655..3d6590f9 100644
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -574,6 +574,26 @@ export interface Page {
             blockName?: string | null;
             blockType: 'roadmap';
           }
+        | {
+            items: {
+              title: string;
+              description: string;
+              showImageBorder?: boolean | null;
+              sectionLayout: 'imageRight' | 'imageLeft';
+              gradient?: ('blue' | 'yellow' | 'pink' | 'aqua' | 'brand' | 'neutral') | null;
+              gradientDirection?: ('topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight') | null;
+              bulletPoints?: string[] | null;
+              image?: (number | null) | Media;
+              link?: {
+                label?: string | null;
+                url?: string | null;
+              };
+              id?: string | null;
+            }[];
+            id?: string | null;
+            blockName?: string | null;
+            blockType: 'scrollCards';
+          }
       )[]
     | null;
   meta?: {
@@ -1593,6 +1613,31 @@ export interface PagesSelect<T extends boolean = true> {
               id?: T;
               blockName?: T;
             };
+        scrollCards?:
+          | T
+          | {
+              items?:
+                | T
+                | {
+                    title?: T;
+                    description?: T;
+                    showImageBorder?: T;
+                    sectionLayout?: T;
+                    gradient?: T;
+                    gradientDirection?: T;
+                    bulletPoints?: T;
+                    image?: T;
+                    link?:
+                      | T
+                      | {
+                          label?: T;
+                          url?: T;
+                        };
+                    id?: T;
+                  };
+              id?: T;
+              blockName?: T;
+            };
       };
   meta?:
     | T

From 36d9e64fe4cc0aa164c63d8fb85b2577e1ba33c3 Mon Sep 17 00:00:00 2001
From: Marius Ahsmus <marius.ahsmus@gmail.com>
Date: Fri, 1 May 2026 20:10:00 +0200
Subject: [PATCH 07/11] feat: scrollcardsection keep image ratio

---
 src/components/sections/ScrollCardSection.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/sections/ScrollCardSection.tsx b/src/components/sections/ScrollCardSection.tsx
index a7510650..5b8a9390 100644
--- a/src/components/sections/ScrollCardSection.tsx
+++ b/src/components/sections/ScrollCardSection.tsx
@@ -197,7 +197,7 @@ export function ScrollCardSection({ content }: ScrollCardSectionProps) {
                                 </div>
 
                                 <div className={cn(
-                                    "relative z-10 min-h-72 overflow-hidden rounded-2xl md:min-h-full",
+                                    "relative z-10 aspect-video w-full self-center overflow-hidden rounded-2xl",
                                     showImageBorder && "border border-white/10",
                                     isImageLeft && "md:order-1",
                                 )}>
@@ -207,7 +207,7 @@ export function ScrollCardSection({ content }: ScrollCardSectionProps) {
                                             alt={image.alt ?? item.title}
                                             fill
                                             sizes="(min-width: 768px) 50vw, 100vw"
-                                            className="object-cover"
+                                            className="object-contain object-center"
                                         />
                                     )}
                                 </div>

From eb25726a872320131f4c80e86325641ab312a1c1 Mon Sep 17 00:00:00 2001
From: Marius Ahsmus <marius.ahsmus@gmail.com>
Date: Sat, 2 May 2026 07:41:02 +0200
Subject: [PATCH 08/11] feat: improve swipecard section styling

---
 src/components/cards/EditionUseCaseCard.tsx  | 30 +++++------
 src/components/sections/SwipeCardSection.tsx | 54 +++++++++++---------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/components/cards/EditionUseCaseCard.tsx b/src/components/cards/EditionUseCaseCard.tsx
index 13d27d39..b18a4579 100644
--- a/src/components/cards/EditionUseCaseCard.tsx
+++ b/src/components/cards/EditionUseCaseCard.tsx
@@ -30,20 +30,17 @@ export function EditionUseCaseCard({
     return (
         <div
             className={cn(
-                "glass-card-shell group relative h-full rounded-[1.6rem] shadow-[0_14px_42px_rgba(0,0,0,0.3)] transition-all duration-500 ease-out before:pointer-events-none before:absolute before:inset-1px before:rounded-[calc(1.6rem-1px)] before:border before:border-white/6 before:content-['']",
-                isFocused
-                    ? "scale-100 opacity-100 z-10"
-                    : "scale-90 opacity-40 blur-[2px]",
-                className,
+                "glass-card-shell group relative flex h-full min-h-0 flex-col rounded-3xl transition-all duration-500 ease-out before:pointer-events-none before:absolute before:inset-1px before:rounded-[calc(1.6rem-1px)] before:border before:border-white/6 before:content-['']",
+                className
             )}
         >
             <div aria-hidden="true" className="glass-card-topline"/>
             <div
-                className="relative z-10 flex h-full flex-col items-stretch justify-start overflow-hidden rounded-[1.6rem]">
-                {imageUrl ? (
-                    <div className={"p-2"}>
+                className="relative flex h-full flex-col items-stretch justify-start overflow-hidden rounded-[1.6rem]">
+                <div className={"p-2"}>
+                    {imageUrl ? (
                         <div
-                            className="relative overflow-hidden aspect-video w-full rounded-[1.2rem] border border-white/8 bg-primary/40">
+                            className="relative overflow-hidden aspect-video w-full rounded-2xl border border-white/8 bg-primary/40">
                             <Image
                                 src={imageUrl}
                                 alt={title}
@@ -52,13 +49,14 @@ export function EditionUseCaseCard({
                                 className="object-cover"
                             />
                         </div>
-                    </div>
-                ) : (
-                    <div className="relative h-48 w-full bg-white/5"/>
-                )}
+                    ) : (
+                        <div className="relative w-full aspect-video bg-white/5 rounded-2xl"/>
+                    )}
+                </div>
+
 
-                <div className="flex flex-1 flex-col gap-2 p-4">
-                    <h3 className="text-xl font-semibold text-white">
+                <div className="flex min-h-0 flex-1 flex-col gap-2 p-4">
+                    <h3 className="line-clamp-2 text-xl font-semibold text-white">
                         {title}
                     </h3>
                     <p className="mb-2 text-sm text-white/70 leading-relaxed">
@@ -66,7 +64,7 @@ export function EditionUseCaseCard({
                     </p>
 
                     {link?.url && link?.label && (
-                        <LinkButton href={link.url}>
+                        <LinkButton href={link.url} className="mt-auto pt-2">
                             {link.label}
                         </LinkButton>
                     )}
diff --git a/src/components/sections/SwipeCardSection.tsx b/src/components/sections/SwipeCardSection.tsx
index 73752834..5a924146 100644
--- a/src/components/sections/SwipeCardSection.tsx
+++ b/src/components/sections/SwipeCardSection.tsx
@@ -99,26 +99,21 @@ export function SwipeCardSection({ content }: SwipeCardSectionProps) {
                     </p>
                 </motion.div>
 
-                <motion.div className="relative w-full" variants={carouselVariants}>
-                    <div className="relative flex items-center justify-center gap-4 px-2 md:gap-8 md:px-16">
-                        <Button
-                            onClick={handlePrevious}
-                            variant="filled"
-                            className="absolute left-0 z-20 shrink-0 size-12! rounded-full! p-0!"
-                            aria-label="Previous card"
-                        >
-                            <IconChevronLeft className="size-6 mr-0.5" />
-                        </Button>
+                <motion.div className="relative w-full overflow-hidden" variants={carouselVariants}>
+                    <div aria-hidden="true" className="pointer-events-none absolute -inset-y-6 left-0 z-30 w-0 bg-linear-to-r from-primary via-primary/80 to-transparent lg:w-40" />
+                    <div aria-hidden="true" className="pointer-events-none absolute -inset-y-6 right-0 z-30 w-0 bg-linear-to-l from-primary via-primary/80 to-transparent lg:w-40" />
+
+                    <div className="relative flex items-center justify-center gap-4 px-2 md:gap-8">
 
                         <motion.div
-                            className="relative flex w-full items-center justify-center px-0 md:px-2 touch-pan-y"
+                            className="relative flex w-full items-center justify-center px-0 touch-pan-y"
                             drag="x"
                             dragConstraints={{ left: 0, right: 0 }}
                             dragElastic={0.08}
                             onDragEnd={handleDragEnd}
                         >
                             <div className="relative flex w-full items-stretch justify-center">
-                                <div className="w-full max-w-full md:max-w-md opacity-0 pointer-events-none">
+                                <div className="h-full w-[64vw] max-w-4xl opacity-0 pointer-events-none">
                                     <EditionUseCaseCard
                                         title={cards[focusedIndex]?.title ?? ""}
                                         description={cards[focusedIndex]?.description ?? ""}
@@ -136,13 +131,13 @@ export function SwipeCardSection({ content }: SwipeCardSectionProps) {
                                         <div
                                             key={card.id || index}
                                             className={cn(
-                                                "absolute top-0 w-full transition-all duration-500 ease-out",
-                                                "max-w-full md:max-w-md",
+                                                "absolute inset-y-0 h-full w-full transition-all duration-500 ease-out",
+                                                "left-1/2 w-[64vw] max-w-4xl",
                                                 !isVisibleMobile && "lg:opacity-100 lg:pointer-events-auto opacity-0 pointer-events-none",
                                                 !isVisibleDesktop && "lg:opacity-0 lg:pointer-events-none",
                                             )}
                                             style={{
-                                                transform: `translateX(${offset * 110}%)`,
+                                                transform: `translateX(calc(-50% + ${offset * 104}%))`,
                                             }}
                                         >
                                             <EditionUseCaseCard
@@ -157,17 +152,28 @@ export function SwipeCardSection({ content }: SwipeCardSectionProps) {
                                 })}
                             </div>
                         </motion.div>
-
-                        <Button
-                            onClick={handleNext}
-                            variant="filled"
-                            className="absolute right-0 z-20 shrink-0 size-12! rounded-full! p-0!"
-                            aria-label="Next card"
-                        >
-                            <IconChevronRight className="size-6 ml-0.5" />
-                        </Button>
                     </div>
                 </motion.div>
+
+                <motion.div className="z-30 flex items-center justify-center gap-4" variants={staggerItem}>
+                    <Button
+                        onClick={handlePrevious}
+                        variant="filled"
+                        className="shrink-0 size-12! rounded-full! p-0!"
+                        aria-label="Previous card"
+                    >
+                        <IconChevronLeft className="size-6 mr-0.5" />
+                    </Button>
+
+                    <Button
+                        onClick={handleNext}
+                        variant="filled"
+                        className="shrink-0 size-12! rounded-full! p-0!"
+                        aria-label="Next card"
+                    >
+                        <IconChevronRight className="size-6 ml-0.5" />
+                    </Button>
+                </motion.div>
             </motion.div>
         </Section>
     )

From e61ccb83de7ed5907db057bab4e82c05bfefde75 Mon Sep 17 00:00:00 2001
From: Marius Ahmsus <marius.ahsmus@gmail.com>
Date: Sat, 2 May 2026 13:45:41 +0200
Subject: [PATCH 09/11] feat: imrpove swipecard height

---
 src/components/cards/EditionUseCaseCard.tsx  |  8 ++++---
 src/components/sections/SwipeCardSection.tsx | 23 ++++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/components/cards/EditionUseCaseCard.tsx b/src/components/cards/EditionUseCaseCard.tsx
index b18a4579..b75858f2 100644
--- a/src/components/cards/EditionUseCaseCard.tsx
+++ b/src/components/cards/EditionUseCaseCard.tsx
@@ -64,9 +64,11 @@ export function EditionUseCaseCard({
                     </p>
 
                     {link?.url && link?.label && (
-                        <LinkButton href={link.url} className="mt-auto pt-2">
-                            {link.label}
-                        </LinkButton>
+                        <div className="mt-auto pt-2">
+                            <LinkButton href={link.url} className="my-2">
+                                {link.label}
+                            </LinkButton>
+                        </div>
                     )}
                 </div>
             </div>
diff --git a/src/components/sections/SwipeCardSection.tsx b/src/components/sections/SwipeCardSection.tsx
index 5a924146..81c0db6e 100644
--- a/src/components/sections/SwipeCardSection.tsx
+++ b/src/components/sections/SwipeCardSection.tsx
@@ -113,14 +113,19 @@ export function SwipeCardSection({ content }: SwipeCardSectionProps) {
                             onDragEnd={handleDragEnd}
                         >
                             <div className="relative flex w-full items-stretch justify-center">
-                                <div className="h-full w-[64vw] max-w-4xl opacity-0 pointer-events-none">
-                                    <EditionUseCaseCard
-                                        title={cards[focusedIndex]?.title ?? ""}
-                                        description={cards[focusedIndex]?.description ?? ""}
-                                        image={cards[focusedIndex]?.image}
-                                        link={cards[focusedIndex]?.link}
-                                        isFocused
-                                    />
+                                <div className="invisible pointer-events-none grid w-[60%]">
+                                    {cards.map((card, index) => (
+                                        <div key={card.id || index} className="col-start-1 row-start-1">
+                                            <EditionUseCaseCard
+                                                title={card.title}
+                                                description={card.description}
+                                                image={card.image}
+                                                link={card.link}
+                                                isFocused
+                                                className="h-auto"
+                                            />
+                                        </div>
+                                    ))}
                                 </div>
                                 {cards.map((card, index) => {
                                     const offset = index - focusedIndex
@@ -132,7 +137,7 @@ export function SwipeCardSection({ content }: SwipeCardSectionProps) {
                                             key={card.id || index}
                                             className={cn(
                                                 "absolute inset-y-0 h-full w-full transition-all duration-500 ease-out",
-                                                "left-1/2 w-[64vw] max-w-4xl",
+                                                "left-1/2 w-[60%]",
                                                 !isVisibleMobile && "lg:opacity-100 lg:pointer-events-auto opacity-0 pointer-events-none",
                                                 !isVisibleDesktop && "lg:opacity-0 lg:pointer-events-none",
                                             )}

From 528e2c8de5c7cc0eff3fd2a93d5de457f7743b30 Mon Sep 17 00:00:00 2001
From: Marius Ahmsus <marius.ahsmus@gmail.com>
Date: Sat, 2 May 2026 13:47:02 +0200
Subject: [PATCH 10/11] fix: coloring

---
 src/components/cards/EditionUseCaseCard.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/cards/EditionUseCaseCard.tsx b/src/components/cards/EditionUseCaseCard.tsx
index b75858f2..f9412258 100644
--- a/src/components/cards/EditionUseCaseCard.tsx
+++ b/src/components/cards/EditionUseCaseCard.tsx
@@ -36,11 +36,11 @@ export function EditionUseCaseCard({
         >
             <div aria-hidden="true" className="glass-card-topline"/>
             <div
-                className="relative flex h-full flex-col items-stretch justify-start overflow-hidden rounded-[1.6rem]">
+                className="relative flex h-full flex-col items-stretch justify-start overflow-hidden rounded-2xl">
                 <div className={"p-2"}>
                     {imageUrl ? (
                         <div
-                            className="relative overflow-hidden aspect-video w-full rounded-2xl border border-white/8 bg-primary/40">
+                            className="relative overflow-hidden aspect-video w-full rounded-2xl border border-white/10 bg-primary/50">
                             <Image
                                 src={imageUrl}
                                 alt={title}
@@ -59,7 +59,7 @@ export function EditionUseCaseCard({
                     <h3 className="line-clamp-2 text-xl font-semibold text-white">
                         {title}
                     </h3>
-                    <p className="mb-2 text-sm text-white/70 leading-relaxed">
+                    <p className="mb-2 text-sm text-white/75 leading-relaxed">
                         {description}
                     </p>
 

From d7320987998f16282fac23295852d042f8475674 Mon Sep 17 00:00:00 2001
From: Marius Ahsmus <marius.ahsmus@gmail.com>
Date: Tue, 5 May 2026 21:20:08 +0200
Subject: [PATCH 11/11] feat: remove unnecessary migrations

---
 src/blocks/SwipeCardBlock.ts                  |   4 +-
 src/components/sections/SwipeCardSection.tsx  |  25 +-
 .../20260427_010_remove_edition_hero_block.ts | 987 ++++++++++++++++++
 src/migrations/20260428_011_card_row_block.ts | 224 ----
 .../20260428_012_offset_cards_block.ts        | 342 ------
 ...0428_013_install_and_swipe_cards_blocks.ts | 299 ------
 src/migrations/20260501_014_bento_block.ts    |  38 -
 src/migrations/20260501_015_roadmap_block.ts  | 153 ---
 .../20260501_016_inline_section_fields.ts     | 214 ----
 .../20260501_017_scroll_card_block.ts         |  62 --
 src/migrations/index.ts                       |  42 -
 src/payload-types.ts                          |   4 +-
 12 files changed, 1007 insertions(+), 1387 deletions(-)
 delete mode 100644 src/migrations/20260428_011_card_row_block.ts
 delete mode 100644 src/migrations/20260428_012_offset_cards_block.ts
 delete mode 100644 src/migrations/20260428_013_install_and_swipe_cards_blocks.ts
 delete mode 100644 src/migrations/20260501_014_bento_block.ts
 delete mode 100644 src/migrations/20260501_015_roadmap_block.ts
 delete mode 100644 src/migrations/20260501_016_inline_section_fields.ts
 delete mode 100644 src/migrations/20260501_017_scroll_card_block.ts

diff --git a/src/blocks/SwipeCardBlock.ts b/src/blocks/SwipeCardBlock.ts
index 7f6e55a6..9d4fdb88 100644
--- a/src/blocks/SwipeCardBlock.ts
+++ b/src/blocks/SwipeCardBlock.ts
@@ -10,13 +10,13 @@ export const SwipeCardBlock: Block = {
     {
       name: "heading",
       type: "text",
-      required: true,
+      required: false,
       localized: true,
     },
     {
       name: "subheading",
       type: "textarea",
-      required: true,
+      required: false,
       localized: true,
     },
     {
diff --git a/src/components/sections/SwipeCardSection.tsx b/src/components/sections/SwipeCardSection.tsx
index 81c0db6e..7abb2eb1 100644
--- a/src/components/sections/SwipeCardSection.tsx
+++ b/src/components/sections/SwipeCardSection.tsx
@@ -18,9 +18,10 @@ export function SwipeCardSection({ content }: SwipeCardSectionProps) {
     const [focusedIndex, setFocusedIndex] = useState(0)
     const { trigger } = useWebHaptics()
 
-    if (!content?.heading || !content?.subheading || !content?.cards?.length) return null
+    if (!content?.cards?.length) return null
 
     const cards = content.cards
+    const hasHeader = Boolean(content.heading || content.subheading)
 
     const handlePrevious = () => {
         trigger("light")
@@ -90,14 +91,20 @@ export function SwipeCardSection({ content }: SwipeCardSectionProps) {
                 whileInView="show"
                 viewport={{ once: true, amount: 0.2 }}
             >
-                <motion.div className="flex flex-col items-center gap-4 text-center" variants={staggerItem}>
-                    <h2 className="text-4xl font-semibold text-white">
-                        {content.heading}
-                    </h2>
-                    <p className="relative z-10 max-w-[90vw] lg:w-1/2 text-center font-medium text-white/75 text-xl">
-                        {content.subheading}
-                    </p>
-                </motion.div>
+                {hasHeader && (
+                    <motion.div className="flex flex-col items-center gap-4 text-center" variants={staggerItem}>
+                        {content.heading && (
+                            <h2 className="text-4xl font-semibold text-white">
+                                {content.heading}
+                            </h2>
+                        )}
+                        {content.subheading && (
+                            <p className="relative z-10 max-w-[90vw] lg:w-1/2 text-center font-medium text-white/75 text-xl">
+                                {content.subheading}
+                            </p>
+                        )}
+                    </motion.div>
+                )}
 
                 <motion.div className="relative w-full overflow-hidden" variants={carouselVariants}>
                     <div aria-hidden="true" className="pointer-events-none absolute -inset-y-6 left-0 z-30 w-0 bg-linear-to-r from-primary via-primary/80 to-transparent lg:w-40" />
diff --git a/src/migrations/20260427_010_remove_edition_hero_block.ts b/src/migrations/20260427_010_remove_edition_hero_block.ts
index 246830a9..e8ba47ce 100644
--- a/src/migrations/20260427_010_remove_edition_hero_block.ts
+++ b/src/migrations/20260427_010_remove_edition_hero_block.ts
@@ -79,9 +79,996 @@ export async function up({ db }: MigrateUpArgs): Promise<void> {
     DROP TABLE IF EXISTS "pages_blocks_edition_hero" CASCADE;
     DROP TYPE IF EXISTS "public"."enum_pages_blocks_edition_hero_buttons_variant";
   `)
+
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_card_row" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_card_row_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar,
+      "link_label" varchar,
+      "link_url" varchar,
+      "image_id" integer
+    );
+
+    ALTER TABLE "pages_blocks_card_row"
+      ADD CONSTRAINT "pages_blocks_card_row_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_card_row_cards"
+      ADD CONSTRAINT "pages_blocks_card_row_cards_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_card_row_cards"
+      ADD CONSTRAINT "pages_blocks_card_row_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_card_row"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_order_idx" ON "pages_blocks_card_row" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_parent_id_idx" ON "pages_blocks_card_row" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_path_idx" ON "pages_blocks_card_row" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_locale_idx" ON "pages_blocks_card_row" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_order_idx" ON "pages_blocks_card_row_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_parent_id_idx" ON "pages_blocks_card_row_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_locale_idx" ON "pages_blocks_card_row_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_image_idx" ON "pages_blocks_card_row_cards" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_card_row" (
+      "_order", "_parent_id", "_path", "_locale", "id", "block_name"
+    )
+    SELECT "_order", "_parent_id", "_path", "_locale", "id", "block_name"
+    FROM "pages_blocks_deployment"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_card_row_cards" (
+      "_order", "_parent_id", "_locale", "id", "title", "description", "link_label", "link_url"
+    )
+    SELECT 0, "id", "_locale", "id" || '-cloud', COALESCE("cloud_title", ''), "cloud_description", "cloud_link_label", "cloud_link_url"
+    FROM "pages_blocks_deployment"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_card_row_cards" (
+      "_order", "_parent_id", "_locale", "id", "title", "description", "link_label", "link_url"
+    )
+    SELECT 1, "id", "_locale", "id" || '-selfhost', COALESCE("selfhost_title", ''), "selfhost_description", "selfhost_link_label", "selfhost_link_url"
+    FROM "pages_blocks_deployment"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_card_row_cards" (
+      "_order", "_parent_id", "_locale", "id", "title", "description", "link_label", "link_url"
+    )
+    SELECT 2, "id", "_locale", "id" || '-dynamic', COALESCE("dynamic_title", ''), "dynamic_description", "dynamic_link_label", "dynamic_link_url"
+    FROM "pages_blocks_deployment"
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_deployment" CASCADE;
+  `)
+
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_offset_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "show_section_header" boolean DEFAULT false,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_offset_cards_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "label" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "bullet_points" jsonb,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_offset_cards"
+      ADD CONSTRAINT "pages_blocks_offset_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_offset_cards_cards"
+      ADD CONSTRAINT "pages_blocks_offset_cards_cards_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_offset_cards_cards"
+      ADD CONSTRAINT "pages_blocks_offset_cards_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_offset_cards"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_order_idx" ON "pages_blocks_offset_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_parent_id_idx" ON "pages_blocks_offset_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_path_idx" ON "pages_blocks_offset_cards" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_locale_idx" ON "pages_blocks_offset_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_order_idx" ON "pages_blocks_offset_cards_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_parent_id_idx" ON "pages_blocks_offset_cards_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_locale_idx" ON "pages_blocks_offset_cards_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_image_idx" ON "pages_blocks_offset_cards_cards" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_offset_cards" (
+      "_order", "_parent_id", "_path", "_locale", "id", "show_section_header", "block_name"
+    )
+    SELECT "_order", "_parent_id", "_path", "_locale", "id", true, "block_name"
+    FROM "pages_blocks_usecase"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_offset_cards_cards" (
+      "_order", "_parent_id", "_locale", "id", "label", "title", "description", "image_id", "link_label", "link_url"
+    )
+    SELECT "_order", "_parent_id", "_locale", "id", "label", "title", "description", "image_id", "link_label", "link_url"
+    FROM "pages_blocks_usecase_use_cases"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_offset_cards" (
+      "_order", "_parent_id", "_path", "_locale", "id", "show_section_header", "block_name"
+    )
+    SELECT "_order", "_parent_id", "_path", "_locale", "id", false, "block_name"
+    FROM "pages_blocks_edition_features"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_offset_cards_cards" (
+      "_order", "_parent_id", "_locale", "id", "label", "title", "description", "image_id", "link_label", "link_url"
+    )
+    SELECT "_order", "_parent_id", "_locale", "id", "label", "title", "description", "image_id", "link_label", "link_url"
+    FROM "pages_blocks_edition_features_features"
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_usecase_use_cases" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_usecase" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_features_features" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_features" CASCADE;
+  `)
+
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_install" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "heading" varchar NOT NULL,
+      "subheading" varchar NOT NULL,
+      "label" varchar,
+      "code" varchar NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_swipe_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "heading" varchar,
+      "subheading" varchar,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_swipe_cards_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_install"
+      ADD CONSTRAINT "pages_blocks_install_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_swipe_cards"
+      ADD CONSTRAINT "pages_blocks_swipe_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_swipe_cards_cards"
+      ADD CONSTRAINT "pages_blocks_swipe_cards_cards_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_swipe_cards_cards"
+      ADD CONSTRAINT "pages_blocks_swipe_cards_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_swipe_cards"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_install_order_idx" ON "pages_blocks_install" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_install_parent_id_idx" ON "pages_blocks_install" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_install_path_idx" ON "pages_blocks_install" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_install_locale_idx" ON "pages_blocks_install" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_order_idx" ON "pages_blocks_swipe_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_parent_id_idx" ON "pages_blocks_swipe_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_path_idx" ON "pages_blocks_swipe_cards" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_locale_idx" ON "pages_blocks_swipe_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_order_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_parent_id_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_locale_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_image_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_install" (
+      "_order", "_parent_id", "_path", "_locale", "id", "heading", "subheading", "label", "code", "block_name"
+    )
+    SELECT "_order", "_parent_id", "_path", "_locale", "id", "heading", "subheading", "label", "code", "block_name"
+    FROM "pages_blocks_edition_install"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_swipe_cards" (
+      "_order", "_parent_id", "_path", "_locale", "id", "heading", "subheading", "block_name"
+    )
+    SELECT "_order", "_parent_id", "_path", "_locale", "id", "heading", "subheading", "block_name"
+    FROM "pages_blocks_edition_use_cases"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_swipe_cards_cards" (
+      "_order", "_parent_id", "_locale", "id", "title", "description", "image_id", "link_label", "link_url"
+    )
+    SELECT "_order", "_parent_id", "_locale", "id", "title", "description", "image_id", "link_label", "link_url"
+    FROM "pages_blocks_edition_use_cases_use_cases"
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_edition_install" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_use_cases_use_cases" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_edition_use_cases" CASCADE;
+  `)
+
+  await db.execute(sql`
+    DO $$ BEGIN
+      CREATE TYPE "public"."enum_pages_blocks_bento_variant" AS ENUM('feature', 'runtime');
+    EXCEPTION
+      WHEN duplicate_object THEN null;
+    END $$;
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_bento" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "variant" "enum_pages_blocks_bento_variant" DEFAULT 'feature' NOT NULL,
+      "block_name" varchar
+    );
+
+    ALTER TABLE "pages_blocks_bento"
+      ADD CONSTRAINT "pages_blocks_bento_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_order_idx" ON "pages_blocks_bento" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_parent_id_idx" ON "pages_blocks_bento" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_path_idx" ON "pages_blocks_bento" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_locale_idx" ON "pages_blocks_bento" USING btree ("_locale");
+  `)
+
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_roadmap" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_roadmap_items" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "time" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL
+    );
+
+    ALTER TABLE "pages_blocks_roadmap"
+      ADD CONSTRAINT "pages_blocks_roadmap_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_roadmap_items"
+      ADD CONSTRAINT "pages_blocks_roadmap_items_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_roadmap"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_order_idx" ON "pages_blocks_roadmap" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_parent_id_idx" ON "pages_blocks_roadmap" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_path_idx" ON "pages_blocks_roadmap" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_locale_idx" ON "pages_blocks_roadmap" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_items_order_idx" ON "pages_blocks_roadmap_items" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_items_parent_id_idx" ON "pages_blocks_roadmap_items" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_items_locale_idx" ON "pages_blocks_roadmap_items" USING btree ("_locale");
+
+    INSERT INTO "pages_blocks_roadmap" (
+      "_order",
+      "_parent_id",
+      "_path",
+      "_locale",
+      "id"
+    )
+    SELECT
+      COALESCE((
+        SELECT MAX("_order") + 1
+        FROM (
+          SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_hero"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_brand"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_faq"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_cta"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_jobs"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_blog"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_actions"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_markdown"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_contact"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_bento"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_offset_cards"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_install"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_swipe_cards"
+          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_card_row"
+        ) layout_orders
+        WHERE layout_orders."_parent_id" = pages."id"
+          AND layout_orders."_locale" = locale_values."_locale"
+      ), 0),
+      pages."id",
+      'layout',
+      locale_values."_locale",
+      'roadmap-' || pages."id" || '-' || locale_values."_locale"::text
+    FROM "pages" pages
+    CROSS JOIN (
+      SELECT DISTINCT "_locale" FROM "roadmap_items_locales"
+    ) locale_values
+    WHERE pages."slug" = 'main'
+      AND EXISTS (
+        SELECT 1 FROM "roadmap_items_locales"
+        WHERE "roadmap_items_locales"."_locale" = locale_values."_locale"
+      )
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_roadmap_items" (
+      "_order",
+      "_parent_id",
+      "_locale",
+      "id",
+      "time",
+      "title",
+      "description"
+    )
+    SELECT
+      ROW_NUMBER() OVER (PARTITION BY roadmap_locale."_locale" ORDER BY roadmap."created_at" DESC, roadmap."id" DESC) - 1,
+      'roadmap-' || pages."id" || '-' || roadmap_locale."_locale"::text,
+      roadmap_locale."_locale",
+      'roadmap-item-' || roadmap."id" || '-' || roadmap_locale."_locale"::text,
+      roadmap_locale."time",
+      roadmap_locale."title",
+      roadmap_locale."description"
+    FROM "roadmap_items" roadmap
+    INNER JOIN "roadmap_items_locales" roadmap_locale ON roadmap_locale."_parent_id" = roadmap."id"
+    INNER JOIN "pages" pages ON pages."slug" = 'main'
+    ON CONFLICT ("id") DO NOTHING;
+
+    ALTER TABLE "payload_locked_documents_rels" DROP CONSTRAINT IF EXISTS "payload_locked_documents_rels_roadmap_items_fk";
+    DROP INDEX IF EXISTS "payload_locked_documents_rels_roadmap_items_id_idx";
+    ALTER TABLE "payload_locked_documents_rels" DROP COLUMN IF EXISTS "roadmap_items_id";
+
+    DROP TABLE IF EXISTS "roadmap_items_locales" CASCADE;
+    DROP TABLE IF EXISTS "roadmap_items" CASCADE;
+  `)
+
+  await db.execute(sql`
+    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
+    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_description" varchar;
+    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
+    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_bento" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND (
+        (block."variant" = 'feature' AND section_source."section_type" = 'AppFeatureSection')
+        OR (block."variant" = 'runtime' AND section_source."section_type" = 'RuntimeFeatureSection')
+      );
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_roadmap" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND section_source."section_type" = 'RoadmapSection';
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_faq" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND section_source."section_type" = 'FaqSection';
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_offset_cards" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND COALESCE(block."show_section_header", false) = true
+      AND section_source."section_type" = 'UseCaseSection';
+
+    WITH section_source AS (
+      SELECT
+        sections."section_type",
+        sections."link_button_url",
+        sections_locales."_locale",
+        sections_locales."heading",
+        sections_locales."subheading",
+        sections_locales."link_button_label"
+      FROM "sections"
+      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
+    )
+    UPDATE "pages_blocks_card_row" block
+    SET
+      "section_heading" = section_source."heading",
+      "section_description" = section_source."subheading",
+      "section_link_button_label" = section_source."link_button_label",
+      "section_link_button_url" = section_source."link_button_url"
+    FROM section_source
+    WHERE block."_locale" = section_source."_locale"
+      AND section_source."section_type" IN ('CardRowSection', 'DeploymentSection');
+
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "show_section_header";
+
+    ALTER TABLE "payload_locked_documents_rels" DROP CONSTRAINT IF EXISTS "payload_locked_documents_rels_sections_fk";
+    DROP INDEX IF EXISTS "payload_locked_documents_rels_sections_id_idx";
+    ALTER TABLE "payload_locked_documents_rels" DROP COLUMN IF EXISTS "sections_id";
+
+    DROP TABLE IF EXISTS "sections_locales" CASCADE;
+    DROP TABLE IF EXISTS "sections" CASCADE;
+    DROP TYPE IF EXISTS "public"."enum_sections_section_type";
+  `)
+
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_scroll_cards" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_scroll_cards_items" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "show_image_border" boolean DEFAULT true,
+      "section_layout" varchar DEFAULT 'imageRight' NOT NULL,
+      "gradient" varchar DEFAULT 'blue',
+      "gradient_direction" varchar DEFAULT 'topLeft',
+      "bullet_points" jsonb,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_scroll_cards"
+      ADD CONSTRAINT "pages_blocks_scroll_cards_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_scroll_cards_items"
+      ADD CONSTRAINT "pages_blocks_scroll_cards_items_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_scroll_cards_items"
+      ADD CONSTRAINT "pages_blocks_scroll_cards_items_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_scroll_cards"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_order_idx" ON "pages_blocks_scroll_cards" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_parent_id_idx" ON "pages_blocks_scroll_cards" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_path_idx" ON "pages_blocks_scroll_cards" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_locale_idx" ON "pages_blocks_scroll_cards" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_order_idx" ON "pages_blocks_scroll_cards_items" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_parent_id_idx" ON "pages_blocks_scroll_cards_items" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_locale_idx" ON "pages_blocks_scroll_cards_items" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_image_idx" ON "pages_blocks_scroll_cards_items" USING btree ("image_id");
+  `)
 }
 
 export async function down({ db }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+    DROP TABLE IF EXISTS "pages_blocks_scroll_cards_items" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_scroll_cards" CASCADE;
+  `)
+
+  await db.execute(sql`
+    DO $$ BEGIN
+      CREATE TYPE "public"."enum_sections_section_type" AS ENUM('AppFeatureSection', 'FaqSection', 'RoadmapSection', 'RuntimeFeatureSection', 'UseCaseSection', 'DeploymentSection', 'CardRowSection');
+    EXCEPTION
+      WHEN duplicate_object THEN null;
+    END $$;
+
+    CREATE TABLE IF NOT EXISTS "sections" (
+      "id" serial PRIMARY KEY NOT NULL,
+      "section_type" "enum_sections_section_type" NOT NULL,
+      "link_button_url" varchar,
+      "updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+      "created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS "sections_locales" (
+      "heading" varchar NOT NULL,
+      "subheading" varchar,
+      "link_button_label" varchar,
+      "id" serial PRIMARY KEY NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "_parent_id" integer NOT NULL
+    );
+
+    ALTER TABLE "sections_locales"
+      ADD CONSTRAINT "sections_locales_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."sections"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "sections_updated_at_idx" ON "sections" USING btree ("updated_at");
+    CREATE INDEX IF NOT EXISTS "sections_created_at_idx" ON "sections" USING btree ("created_at");
+    CREATE UNIQUE INDEX IF NOT EXISTS "sections_locales_locale_parent_id_unique" ON "sections_locales" USING btree ("_locale","_parent_id");
+
+    ALTER TABLE "payload_locked_documents_rels" ADD COLUMN IF NOT EXISTS "sections_id" integer;
+    ALTER TABLE "payload_locked_documents_rels"
+      ADD CONSTRAINT "payload_locked_documents_rels_sections_fk"
+      FOREIGN KEY ("sections_id") REFERENCES "public"."sections"("id")
+      ON DELETE cascade ON UPDATE no action;
+    CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_sections_id_idx" ON "payload_locked_documents_rels" USING btree ("sections_id");
+
+    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "show_section_header" boolean DEFAULT false;
+    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_link_button_url";
+    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_link_button_url";
+    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_link_button_url";
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_link_button_url";
+    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_heading";
+    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_description";
+    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_link_button_label";
+    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_link_button_url";
+  `)
+
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "roadmap_items" (
+      "id" serial PRIMARY KEY NOT NULL,
+      "updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+      "created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS "roadmap_items_locales" (
+      "time" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "id" serial PRIMARY KEY NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "_parent_id" integer NOT NULL
+    );
+
+    ALTER TABLE "roadmap_items_locales"
+      ADD CONSTRAINT "roadmap_items_locales_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."roadmap_items"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "roadmap_items_updated_at_idx" ON "roadmap_items" USING btree ("updated_at");
+    CREATE INDEX IF NOT EXISTS "roadmap_items_created_at_idx" ON "roadmap_items" USING btree ("created_at");
+    CREATE UNIQUE INDEX IF NOT EXISTS "roadmap_items_locales_locale_parent_id_unique" ON "roadmap_items_locales" USING btree ("_locale","_parent_id");
+
+    ALTER TABLE "payload_locked_documents_rels" ADD COLUMN IF NOT EXISTS "roadmap_items_id" integer;
+    ALTER TABLE "payload_locked_documents_rels"
+      ADD CONSTRAINT "payload_locked_documents_rels_roadmap_items_fk"
+      FOREIGN KEY ("roadmap_items_id") REFERENCES "public"."roadmap_items"("id")
+      ON DELETE cascade ON UPDATE no action;
+    CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_roadmap_items_id_idx" ON "payload_locked_documents_rels" USING btree ("roadmap_items_id");
+
+    DROP TABLE IF EXISTS "pages_blocks_roadmap_items" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_roadmap" CASCADE;
+  `)
+
+  await db.execute(sql`
+    DROP TABLE IF EXISTS "pages_blocks_bento" CASCADE;
+    DROP TYPE IF EXISTS "public"."enum_pages_blocks_bento_variant";
+  `)
+
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_install" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "heading" varchar NOT NULL,
+      "subheading" varchar NOT NULL,
+      "label" varchar,
+      "code" varchar NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_use_cases" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "heading" varchar NOT NULL,
+      "subheading" varchar NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_edition_install"
+      ADD CONSTRAINT "pages_blocks_edition_install_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_use_cases"
+      ADD CONSTRAINT "pages_blocks_edition_use_cases_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_use_cases_use_cases"
+      ADD CONSTRAINT "pages_blocks_edition_use_cases_use_cases_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_use_cases_use_cases"
+      ADD CONSTRAINT "pages_blocks_edition_use_cases_use_cases_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_edition_use_cases"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_order_idx" ON "pages_blocks_edition_install" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_parent_id_idx" ON "pages_blocks_edition_install" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_path_idx" ON "pages_blocks_edition_install" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_locale_idx" ON "pages_blocks_edition_install" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_order_idx" ON "pages_blocks_edition_use_cases" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_parent_id_idx" ON "pages_blocks_edition_use_cases" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_path_idx" ON "pages_blocks_edition_use_cases" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_locale_idx" ON "pages_blocks_edition_use_cases" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_order_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_parent_id_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_locale_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_image_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_edition_install" (
+      "_order", "_parent_id", "_path", "_locale", "id", "heading", "subheading", "label", "code", "block_name"
+    )
+    SELECT "_order", "_parent_id", "_path", "_locale", "id", "heading", "subheading", "label", "code", "block_name"
+    FROM "pages_blocks_install"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_edition_use_cases" (
+      "_order", "_parent_id", "_path", "_locale", "id", "heading", "subheading", "block_name"
+    )
+    SELECT "_order", "_parent_id", "_path", "_locale", "id", COALESCE("heading", ''), COALESCE("subheading", ''), "block_name"
+    FROM "pages_blocks_swipe_cards"
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_edition_use_cases_use_cases" (
+      "_order", "_parent_id", "_locale", "id", "title", "description", "image_id", "link_label", "link_url"
+    )
+    SELECT "_order", "_parent_id", "_locale", "id", "title", "description", "image_id", "link_label", "link_url"
+    FROM "pages_blocks_swipe_cards_cards"
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_swipe_cards_cards" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_swipe_cards" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_install" CASCADE;
+  `)
+
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_usecase" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_usecase_use_cases" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "label" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_features" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "block_name" varchar
+    );
+
+    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_features_features" (
+      "_order" integer NOT NULL,
+      "_parent_id" varchar NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "label" varchar NOT NULL,
+      "title" varchar NOT NULL,
+      "description" varchar NOT NULL,
+      "image_id" integer,
+      "link_label" varchar,
+      "link_url" varchar
+    );
+
+    ALTER TABLE "pages_blocks_usecase"
+      ADD CONSTRAINT "pages_blocks_usecase_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_usecase_use_cases"
+      ADD CONSTRAINT "pages_blocks_usecase_use_cases_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_usecase_use_cases"
+      ADD CONSTRAINT "pages_blocks_usecase_use_cases_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_usecase"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_features"
+      ADD CONSTRAINT "pages_blocks_edition_features_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_features_features"
+      ADD CONSTRAINT "pages_blocks_edition_features_features_image_id_media_id_fk"
+      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
+      ON DELETE set null ON UPDATE no action;
+
+    ALTER TABLE "pages_blocks_edition_features_features"
+      ADD CONSTRAINT "pages_blocks_edition_features_features_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_edition_features"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_order_idx" ON "pages_blocks_usecase" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_parent_id_idx" ON "pages_blocks_usecase" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_path_idx" ON "pages_blocks_usecase" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_locale_idx" ON "pages_blocks_usecase" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_order_idx" ON "pages_blocks_usecase_use_cases" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_parent_id_idx" ON "pages_blocks_usecase_use_cases" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_locale_idx" ON "pages_blocks_usecase_use_cases" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_image_idx" ON "pages_blocks_usecase_use_cases" USING btree ("image_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_order_idx" ON "pages_blocks_edition_features" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_parent_id_idx" ON "pages_blocks_edition_features" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_path_idx" ON "pages_blocks_edition_features" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_locale_idx" ON "pages_blocks_edition_features" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_order_idx" ON "pages_blocks_edition_features_features" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_parent_id_idx" ON "pages_blocks_edition_features_features" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_locale_idx" ON "pages_blocks_edition_features_features" USING btree ("_locale");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_image_idx" ON "pages_blocks_edition_features_features" USING btree ("image_id");
+
+    INSERT INTO "pages_blocks_usecase" (
+      "_order", "_parent_id", "_path", "_locale", "id", "block_name"
+    )
+    SELECT "_order", "_parent_id", "_path", "_locale", "id", "block_name"
+    FROM "pages_blocks_offset_cards"
+    WHERE "show_section_header" = true
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_usecase_use_cases" (
+      "_order", "_parent_id", "_locale", "id", "label", "title", "description", "image_id", "link_label", "link_url"
+    )
+    SELECT card."_order", card."_parent_id", card."_locale", card."id", card."label", card."title", card."description", card."image_id", card."link_label", card."link_url"
+    FROM "pages_blocks_offset_cards_cards" card
+    INNER JOIN "pages_blocks_offset_cards" block ON block."id" = card."_parent_id"
+    WHERE block."show_section_header" = true
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_edition_features" (
+      "_order", "_parent_id", "_path", "_locale", "id", "block_name"
+    )
+    SELECT "_order", "_parent_id", "_path", "_locale", "id", "block_name"
+    FROM "pages_blocks_offset_cards"
+    WHERE COALESCE("show_section_header", false) = false
+    ON CONFLICT ("id") DO NOTHING;
+
+    INSERT INTO "pages_blocks_edition_features_features" (
+      "_order", "_parent_id", "_locale", "id", "label", "title", "description", "image_id", "link_label", "link_url"
+    )
+    SELECT card."_order", card."_parent_id", card."_locale", card."id", card."label", card."title", card."description", card."image_id", card."link_label", card."link_url"
+    FROM "pages_blocks_offset_cards_cards" card
+    INNER JOIN "pages_blocks_offset_cards" block ON block."id" = card."_parent_id"
+    WHERE COALESCE(block."show_section_header", false) = false
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_offset_cards_cards" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_offset_cards" CASCADE;
+  `)
+
+  await db.execute(sql`
+    CREATE TABLE IF NOT EXISTS "pages_blocks_deployment" (
+      "_order" integer NOT NULL,
+      "_parent_id" integer NOT NULL,
+      "_path" text NOT NULL,
+      "_locale" "_locales" NOT NULL,
+      "id" varchar PRIMARY KEY NOT NULL,
+      "cloud_title" varchar,
+      "cloud_description" varchar,
+      "cloud_link_label" varchar,
+      "cloud_link_url" varchar,
+      "selfhost_title" varchar,
+      "selfhost_description" varchar,
+      "selfhost_link_label" varchar,
+      "selfhost_link_url" varchar,
+      "dynamic_title" varchar,
+      "dynamic_description" varchar,
+      "dynamic_link_label" varchar,
+      "dynamic_link_url" varchar,
+      "block_name" varchar
+    );
+
+    ALTER TABLE "pages_blocks_deployment"
+      ADD CONSTRAINT "pages_blocks_deployment_parent_id_fk"
+      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
+      ON DELETE cascade ON UPDATE no action;
+
+    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_order_idx" ON "pages_blocks_deployment" USING btree ("_order");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_parent_id_idx" ON "pages_blocks_deployment" USING btree ("_parent_id");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_path_idx" ON "pages_blocks_deployment" USING btree ("_path");
+    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_locale_idx" ON "pages_blocks_deployment" USING btree ("_locale");
+
+    INSERT INTO "pages_blocks_deployment" (
+      "_order", "_parent_id", "_path", "_locale", "id",
+      "cloud_title", "cloud_description", "cloud_link_label", "cloud_link_url",
+      "selfhost_title", "selfhost_description", "selfhost_link_label", "selfhost_link_url",
+      "dynamic_title", "dynamic_description", "dynamic_link_label", "dynamic_link_url",
+      "block_name"
+    )
+    SELECT
+      card_row."_order", card_row."_parent_id", card_row."_path", card_row."_locale", card_row."id",
+      cloud."title", cloud."description", cloud."link_label", cloud."link_url",
+      selfhost."title", selfhost."description", selfhost."link_label", selfhost."link_url",
+      dynamic."title", dynamic."description", dynamic."link_label", dynamic."link_url",
+      card_row."block_name"
+    FROM "pages_blocks_card_row" card_row
+    LEFT JOIN "pages_blocks_card_row_cards" cloud
+      ON cloud."_parent_id" = card_row."id" AND cloud."_order" = 0
+    LEFT JOIN "pages_blocks_card_row_cards" selfhost
+      ON selfhost."_parent_id" = card_row."id" AND selfhost."_order" = 1
+    LEFT JOIN "pages_blocks_card_row_cards" dynamic
+      ON dynamic."_parent_id" = card_row."id" AND dynamic."_order" = 2
+    ON CONFLICT ("id") DO NOTHING;
+
+    DROP TABLE IF EXISTS "pages_blocks_card_row_cards" CASCADE;
+    DROP TABLE IF EXISTS "pages_blocks_card_row" CASCADE;
+  `)
+
   await db.execute(sql`
     ALTER TABLE "pages_blocks_hero" DROP COLUMN IF EXISTS "grainient_colors_background_color";
     ALTER TABLE "pages_blocks_hero" DROP COLUMN IF EXISTS "grainient_colors_color3";
diff --git a/src/migrations/20260428_011_card_row_block.ts b/src/migrations/20260428_011_card_row_block.ts
deleted file mode 100644
index dbf3b296..00000000
--- a/src/migrations/20260428_011_card_row_block.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
-
-export async function up({ db }: MigrateUpArgs): Promise<void> {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS "pages_blocks_card_row" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_card_row_cards" (
-      "_order" integer NOT NULL,
-      "_parent_id" varchar NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "title" varchar NOT NULL,
-      "description" varchar,
-      "link_label" varchar,
-      "link_url" varchar,
-      "image_id" integer
-    );
-
-    ALTER TABLE "pages_blocks_card_row"
-      ADD CONSTRAINT "pages_blocks_card_row_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_card_row_cards"
-      ADD CONSTRAINT "pages_blocks_card_row_cards_image_id_media_id_fk"
-      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
-      ON DELETE set null ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_card_row_cards"
-      ADD CONSTRAINT "pages_blocks_card_row_cards_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_card_row"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_order_idx" ON "pages_blocks_card_row" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_parent_id_idx" ON "pages_blocks_card_row" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_path_idx" ON "pages_blocks_card_row" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_locale_idx" ON "pages_blocks_card_row" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_order_idx" ON "pages_blocks_card_row_cards" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_parent_id_idx" ON "pages_blocks_card_row_cards" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_locale_idx" ON "pages_blocks_card_row_cards" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_card_row_cards_image_idx" ON "pages_blocks_card_row_cards" USING btree ("image_id");
-
-    INSERT INTO "pages_blocks_card_row" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "block_name"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "block_name"
-    FROM "pages_blocks_deployment"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_card_row_cards" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "title",
-      "description",
-      "link_label",
-      "link_url"
-    )
-    SELECT
-      0,
-      "id",
-      "_locale",
-      "id" || '-cloud',
-      COALESCE("cloud_title", ''),
-      "cloud_description",
-      "cloud_link_label",
-      "cloud_link_url"
-    FROM "pages_blocks_deployment"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_card_row_cards" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "title",
-      "description",
-      "link_label",
-      "link_url"
-    )
-    SELECT
-      1,
-      "id",
-      "_locale",
-      "id" || '-selfhost',
-      COALESCE("selfhost_title", ''),
-      "selfhost_description",
-      "selfhost_link_label",
-      "selfhost_link_url"
-    FROM "pages_blocks_deployment"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_card_row_cards" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "title",
-      "description",
-      "link_label",
-      "link_url"
-    )
-    SELECT
-      2,
-      "id",
-      "_locale",
-      "id" || '-dynamic',
-      COALESCE("dynamic_title", ''),
-      "dynamic_description",
-      "dynamic_link_label",
-      "dynamic_link_url"
-    FROM "pages_blocks_deployment"
-    ON CONFLICT ("id") DO NOTHING;
-
-    DROP TABLE IF EXISTS "pages_blocks_deployment" CASCADE;
-
-  `)
-}
-
-export async function down({ db }: MigrateDownArgs): Promise<void> {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS "pages_blocks_deployment" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "cloud_title" varchar,
-      "cloud_description" varchar,
-      "cloud_link_label" varchar,
-      "cloud_link_url" varchar,
-      "selfhost_title" varchar,
-      "selfhost_description" varchar,
-      "selfhost_link_label" varchar,
-      "selfhost_link_url" varchar,
-      "dynamic_title" varchar,
-      "dynamic_description" varchar,
-      "dynamic_link_label" varchar,
-      "dynamic_link_url" varchar,
-      "block_name" varchar
-    );
-
-    ALTER TABLE "pages_blocks_deployment"
-      ADD CONSTRAINT "pages_blocks_deployment_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_order_idx" ON "pages_blocks_deployment" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_parent_id_idx" ON "pages_blocks_deployment" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_path_idx" ON "pages_blocks_deployment" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_deployment_locale_idx" ON "pages_blocks_deployment" USING btree ("_locale");
-
-    INSERT INTO "pages_blocks_deployment" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "cloud_title",
-      "cloud_description",
-      "cloud_link_label",
-      "cloud_link_url",
-      "selfhost_title",
-      "selfhost_description",
-      "selfhost_link_label",
-      "selfhost_link_url",
-      "dynamic_title",
-      "dynamic_description",
-      "dynamic_link_label",
-      "dynamic_link_url",
-      "block_name"
-    )
-    SELECT
-      card_row."_order",
-      card_row."_parent_id",
-      card_row."_path",
-      card_row."_locale",
-      card_row."id",
-      cloud."title",
-      cloud."description",
-      cloud."link_label",
-      cloud."link_url",
-      selfhost."title",
-      selfhost."description",
-      selfhost."link_label",
-      selfhost."link_url",
-      dynamic."title",
-      dynamic."description",
-      dynamic."link_label",
-      dynamic."link_url",
-      card_row."block_name"
-    FROM "pages_blocks_card_row" card_row
-    LEFT JOIN "pages_blocks_card_row_cards" cloud
-      ON cloud."_parent_id" = card_row."id" AND cloud."_order" = 0
-    LEFT JOIN "pages_blocks_card_row_cards" selfhost
-      ON selfhost."_parent_id" = card_row."id" AND selfhost."_order" = 1
-    LEFT JOIN "pages_blocks_card_row_cards" dynamic
-      ON dynamic."_parent_id" = card_row."id" AND dynamic."_order" = 2
-    ON CONFLICT ("id") DO NOTHING;
-
-    DROP TABLE IF EXISTS "pages_blocks_card_row_cards" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_card_row" CASCADE;
-
-  `)
-}
diff --git a/src/migrations/20260428_012_offset_cards_block.ts b/src/migrations/20260428_012_offset_cards_block.ts
deleted file mode 100644
index 3177423e..00000000
--- a/src/migrations/20260428_012_offset_cards_block.ts
+++ /dev/null
@@ -1,342 +0,0 @@
-import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
-
-export async function up({ db }: MigrateUpArgs): Promise<void> {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS "pages_blocks_offset_cards" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "show_section_header" boolean DEFAULT false,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_offset_cards_cards" (
-      "_order" integer NOT NULL,
-      "_parent_id" varchar NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "label" varchar NOT NULL,
-      "title" varchar NOT NULL,
-      "description" varchar NOT NULL,
-      "image_id" integer,
-      "bullet_points" jsonb,
-      "link_label" varchar,
-      "link_url" varchar
-    );
-
-    ALTER TABLE "pages_blocks_offset_cards"
-      ADD CONSTRAINT "pages_blocks_offset_cards_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_offset_cards_cards"
-      ADD CONSTRAINT "pages_blocks_offset_cards_cards_image_id_media_id_fk"
-      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
-      ON DELETE set null ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_offset_cards_cards"
-      ADD CONSTRAINT "pages_blocks_offset_cards_cards_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_offset_cards"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_order_idx" ON "pages_blocks_offset_cards" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_parent_id_idx" ON "pages_blocks_offset_cards" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_path_idx" ON "pages_blocks_offset_cards" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_locale_idx" ON "pages_blocks_offset_cards" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_order_idx" ON "pages_blocks_offset_cards_cards" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_parent_id_idx" ON "pages_blocks_offset_cards_cards" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_locale_idx" ON "pages_blocks_offset_cards_cards" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_offset_cards_cards_image_idx" ON "pages_blocks_offset_cards_cards" USING btree ("image_id");
-
-    INSERT INTO "pages_blocks_offset_cards" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "show_section_header",
-      "block_name"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      true,
-      "block_name"
-    FROM "pages_blocks_usecase"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_offset_cards_cards" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "label",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "label",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    FROM "pages_blocks_usecase_use_cases"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_offset_cards" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "show_section_header",
-      "block_name"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      false,
-      "block_name"
-    FROM "pages_blocks_edition_features"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_offset_cards_cards" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "label",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "label",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    FROM "pages_blocks_edition_features_features"
-    ON CONFLICT ("id") DO NOTHING;
-
-    DROP TABLE IF EXISTS "pages_blocks_usecase_use_cases" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_usecase" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_edition_features_features" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_edition_features" CASCADE;
-  `)
-}
-
-export async function down({ db }: MigrateDownArgs): Promise<void> {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS "pages_blocks_usecase" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_usecase_use_cases" (
-      "_order" integer NOT NULL,
-      "_parent_id" varchar NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "label" varchar NOT NULL,
-      "title" varchar NOT NULL,
-      "description" varchar NOT NULL,
-      "image_id" integer,
-      "link_label" varchar,
-      "link_url" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_features" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_features_features" (
-      "_order" integer NOT NULL,
-      "_parent_id" varchar NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "label" varchar NOT NULL,
-      "title" varchar NOT NULL,
-      "description" varchar NOT NULL,
-      "image_id" integer,
-      "link_label" varchar,
-      "link_url" varchar
-    );
-
-    ALTER TABLE "pages_blocks_usecase"
-      ADD CONSTRAINT "pages_blocks_usecase_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_usecase_use_cases"
-      ADD CONSTRAINT "pages_blocks_usecase_use_cases_image_id_media_id_fk"
-      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
-      ON DELETE set null ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_usecase_use_cases"
-      ADD CONSTRAINT "pages_blocks_usecase_use_cases_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_usecase"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_edition_features"
-      ADD CONSTRAINT "pages_blocks_edition_features_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_edition_features_features"
-      ADD CONSTRAINT "pages_blocks_edition_features_features_image_id_media_id_fk"
-      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
-      ON DELETE set null ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_edition_features_features"
-      ADD CONSTRAINT "pages_blocks_edition_features_features_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_edition_features"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_order_idx" ON "pages_blocks_usecase" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_parent_id_idx" ON "pages_blocks_usecase" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_path_idx" ON "pages_blocks_usecase" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_locale_idx" ON "pages_blocks_usecase" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_order_idx" ON "pages_blocks_usecase_use_cases" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_parent_id_idx" ON "pages_blocks_usecase_use_cases" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_locale_idx" ON "pages_blocks_usecase_use_cases" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_usecase_use_cases_image_idx" ON "pages_blocks_usecase_use_cases" USING btree ("image_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_order_idx" ON "pages_blocks_edition_features" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_parent_id_idx" ON "pages_blocks_edition_features" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_path_idx" ON "pages_blocks_edition_features" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_locale_idx" ON "pages_blocks_edition_features" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_order_idx" ON "pages_blocks_edition_features_features" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_parent_id_idx" ON "pages_blocks_edition_features_features" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_locale_idx" ON "pages_blocks_edition_features_features" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_features_features_image_idx" ON "pages_blocks_edition_features_features" USING btree ("image_id");
-
-    INSERT INTO "pages_blocks_usecase" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "block_name"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "block_name"
-    FROM "pages_blocks_offset_cards"
-    WHERE "show_section_header" = true
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_usecase_use_cases" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "label",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    )
-    SELECT
-      card."_order",
-      card."_parent_id",
-      card."_locale",
-      card."id",
-      card."label",
-      card."title",
-      card."description",
-      card."image_id",
-      card."link_label",
-      card."link_url"
-    FROM "pages_blocks_offset_cards_cards" card
-    INNER JOIN "pages_blocks_offset_cards" block ON block."id" = card."_parent_id"
-    WHERE block."show_section_header" = true
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_edition_features" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "block_name"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "block_name"
-    FROM "pages_blocks_offset_cards"
-    WHERE COALESCE("show_section_header", false) = false
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_edition_features_features" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "label",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    )
-    SELECT
-      card."_order",
-      card."_parent_id",
-      card."_locale",
-      card."id",
-      card."label",
-      card."title",
-      card."description",
-      card."image_id",
-      card."link_label",
-      card."link_url"
-    FROM "pages_blocks_offset_cards_cards" card
-    INNER JOIN "pages_blocks_offset_cards" block ON block."id" = card."_parent_id"
-    WHERE COALESCE(block."show_section_header", false) = false
-    ON CONFLICT ("id") DO NOTHING;
-
-    DROP TABLE IF EXISTS "pages_blocks_offset_cards_cards" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_offset_cards" CASCADE;
-  `)
-}
diff --git a/src/migrations/20260428_013_install_and_swipe_cards_blocks.ts b/src/migrations/20260428_013_install_and_swipe_cards_blocks.ts
deleted file mode 100644
index 9f749beb..00000000
--- a/src/migrations/20260428_013_install_and_swipe_cards_blocks.ts
+++ /dev/null
@@ -1,299 +0,0 @@
-import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
-
-export async function up({ db }: MigrateUpArgs): Promise<void> {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS "pages_blocks_install" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "heading" varchar NOT NULL,
-      "subheading" varchar NOT NULL,
-      "label" varchar,
-      "code" varchar NOT NULL,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_swipe_cards" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "heading" varchar NOT NULL,
-      "subheading" varchar NOT NULL,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_swipe_cards_cards" (
-      "_order" integer NOT NULL,
-      "_parent_id" varchar NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "title" varchar NOT NULL,
-      "description" varchar NOT NULL,
-      "image_id" integer,
-      "link_label" varchar,
-      "link_url" varchar
-    );
-
-    ALTER TABLE "pages_blocks_install"
-      ADD CONSTRAINT "pages_blocks_install_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_swipe_cards"
-      ADD CONSTRAINT "pages_blocks_swipe_cards_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_swipe_cards_cards"
-      ADD CONSTRAINT "pages_blocks_swipe_cards_cards_image_id_media_id_fk"
-      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
-      ON DELETE set null ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_swipe_cards_cards"
-      ADD CONSTRAINT "pages_blocks_swipe_cards_cards_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_swipe_cards"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "pages_blocks_install_order_idx" ON "pages_blocks_install" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_install_parent_id_idx" ON "pages_blocks_install" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_install_path_idx" ON "pages_blocks_install" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_install_locale_idx" ON "pages_blocks_install" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_order_idx" ON "pages_blocks_swipe_cards" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_parent_id_idx" ON "pages_blocks_swipe_cards" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_path_idx" ON "pages_blocks_swipe_cards" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_locale_idx" ON "pages_blocks_swipe_cards" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_order_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_parent_id_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_locale_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_swipe_cards_cards_image_idx" ON "pages_blocks_swipe_cards_cards" USING btree ("image_id");
-
-    INSERT INTO "pages_blocks_install" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "heading",
-      "subheading",
-      "label",
-      "code",
-      "block_name"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "heading",
-      "subheading",
-      "label",
-      "code",
-      "block_name"
-    FROM "pages_blocks_edition_install"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_swipe_cards" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "heading",
-      "subheading",
-      "block_name"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "heading",
-      "subheading",
-      "block_name"
-    FROM "pages_blocks_edition_use_cases"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_swipe_cards_cards" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    FROM "pages_blocks_edition_use_cases_use_cases"
-    ON CONFLICT ("id") DO NOTHING;
-
-    DROP TABLE IF EXISTS "pages_blocks_edition_install" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_edition_use_cases_use_cases" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_edition_use_cases" CASCADE;
-  `)
-}
-
-export async function down({ db }: MigrateDownArgs): Promise<void> {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_install" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "heading" varchar NOT NULL,
-      "subheading" varchar NOT NULL,
-      "label" varchar,
-      "code" varchar NOT NULL,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_use_cases" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "heading" varchar NOT NULL,
-      "subheading" varchar NOT NULL,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases" (
-      "_order" integer NOT NULL,
-      "_parent_id" varchar NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "title" varchar NOT NULL,
-      "description" varchar NOT NULL,
-      "image_id" integer,
-      "link_label" varchar,
-      "link_url" varchar
-    );
-
-    ALTER TABLE "pages_blocks_edition_install"
-      ADD CONSTRAINT "pages_blocks_edition_install_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_edition_use_cases"
-      ADD CONSTRAINT "pages_blocks_edition_use_cases_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_edition_use_cases_use_cases"
-      ADD CONSTRAINT "pages_blocks_edition_use_cases_use_cases_image_id_media_id_fk"
-      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
-      ON DELETE set null ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_edition_use_cases_use_cases"
-      ADD CONSTRAINT "pages_blocks_edition_use_cases_use_cases_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_edition_use_cases"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_order_idx" ON "pages_blocks_edition_install" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_parent_id_idx" ON "pages_blocks_edition_install" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_path_idx" ON "pages_blocks_edition_install" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_install_locale_idx" ON "pages_blocks_edition_install" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_order_idx" ON "pages_blocks_edition_use_cases" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_parent_id_idx" ON "pages_blocks_edition_use_cases" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_path_idx" ON "pages_blocks_edition_use_cases" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_locale_idx" ON "pages_blocks_edition_use_cases" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_order_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_parent_id_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_locale_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_edition_use_cases_use_cases_image_idx" ON "pages_blocks_edition_use_cases_use_cases" USING btree ("image_id");
-
-    INSERT INTO "pages_blocks_edition_install" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "heading",
-      "subheading",
-      "label",
-      "code",
-      "block_name"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "heading",
-      "subheading",
-      "label",
-      "code",
-      "block_name"
-    FROM "pages_blocks_install"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_edition_use_cases" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "heading",
-      "subheading",
-      "block_name"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id",
-      "heading",
-      "subheading",
-      "block_name"
-    FROM "pages_blocks_swipe_cards"
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_edition_use_cases_use_cases" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    )
-    SELECT
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "title",
-      "description",
-      "image_id",
-      "link_label",
-      "link_url"
-    FROM "pages_blocks_swipe_cards_cards"
-    ON CONFLICT ("id") DO NOTHING;
-
-    DROP TABLE IF EXISTS "pages_blocks_swipe_cards_cards" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_swipe_cards" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_install" CASCADE;
-  `)
-}
diff --git a/src/migrations/20260501_014_bento_block.ts b/src/migrations/20260501_014_bento_block.ts
deleted file mode 100644
index 537f9231..00000000
--- a/src/migrations/20260501_014_bento_block.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
-
-export async function up({ db }: MigrateUpArgs): Promise<void> {
-  await db.execute(sql`
-    DO $$ BEGIN
-      CREATE TYPE "public"."enum_pages_blocks_bento_variant" AS ENUM('feature', 'runtime');
-    EXCEPTION
-      WHEN duplicate_object THEN null;
-    END $$;
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_bento" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "variant" "enum_pages_blocks_bento_variant" DEFAULT 'feature' NOT NULL,
-      "block_name" varchar
-    );
-
-    ALTER TABLE "pages_blocks_bento"
-      ADD CONSTRAINT "pages_blocks_bento_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_order_idx" ON "pages_blocks_bento" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_parent_id_idx" ON "pages_blocks_bento" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_path_idx" ON "pages_blocks_bento" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_bento_locale_idx" ON "pages_blocks_bento" USING btree ("_locale");
-  `)
-}
-
-export async function down({ db }: MigrateDownArgs): Promise<void> {
-  await db.execute(sql`
-    DROP TABLE IF EXISTS "pages_blocks_bento" CASCADE;
-    DROP TYPE IF EXISTS "public"."enum_pages_blocks_bento_variant";
-  `)
-}
diff --git a/src/migrations/20260501_015_roadmap_block.ts b/src/migrations/20260501_015_roadmap_block.ts
deleted file mode 100644
index 97bec99e..00000000
--- a/src/migrations/20260501_015_roadmap_block.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
-
-export async function up({ db }: MigrateUpArgs): Promise<void> {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS "pages_blocks_roadmap" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_roadmap_items" (
-      "_order" integer NOT NULL,
-      "_parent_id" varchar NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "time" varchar NOT NULL,
-      "title" varchar NOT NULL,
-      "description" varchar NOT NULL
-    );
-
-    ALTER TABLE "pages_blocks_roadmap"
-      ADD CONSTRAINT "pages_blocks_roadmap_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_roadmap_items"
-      ADD CONSTRAINT "pages_blocks_roadmap_items_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_roadmap"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_order_idx" ON "pages_blocks_roadmap" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_parent_id_idx" ON "pages_blocks_roadmap" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_path_idx" ON "pages_blocks_roadmap" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_locale_idx" ON "pages_blocks_roadmap" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_items_order_idx" ON "pages_blocks_roadmap_items" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_items_parent_id_idx" ON "pages_blocks_roadmap_items" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_roadmap_items_locale_idx" ON "pages_blocks_roadmap_items" USING btree ("_locale");
-
-    INSERT INTO "pages_blocks_roadmap" (
-      "_order",
-      "_parent_id",
-      "_path",
-      "_locale",
-      "id"
-    )
-    SELECT
-      COALESCE((
-        SELECT MAX("_order") + 1
-        FROM (
-          SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_hero"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_brand"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_faq"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_cta"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_jobs"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_blog"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_actions"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_markdown"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_contact"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_bento"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_offset_cards"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_install"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_swipe_cards"
-          UNION ALL SELECT "_order", "_parent_id", "_locale" FROM "pages_blocks_card_row"
-        ) layout_orders
-        WHERE layout_orders."_parent_id" = pages."id"
-          AND layout_orders."_locale" = locale_values."_locale"
-      ), 0),
-      pages."id",
-      'layout',
-      locale_values."_locale",
-      'roadmap-' || pages."id" || '-' || locale_values."_locale"::text
-    FROM "pages" pages
-    CROSS JOIN (
-      SELECT DISTINCT "_locale" FROM "roadmap_items_locales"
-    ) locale_values
-    WHERE pages."slug" = 'main'
-      AND EXISTS (
-        SELECT 1 FROM "roadmap_items_locales"
-        WHERE "roadmap_items_locales"."_locale" = locale_values."_locale"
-      )
-    ON CONFLICT ("id") DO NOTHING;
-
-    INSERT INTO "pages_blocks_roadmap_items" (
-      "_order",
-      "_parent_id",
-      "_locale",
-      "id",
-      "time",
-      "title",
-      "description"
-    )
-    SELECT
-      ROW_NUMBER() OVER (PARTITION BY roadmap_locale."_locale" ORDER BY roadmap."created_at" DESC, roadmap."id" DESC) - 1,
-      'roadmap-' || pages."id" || '-' || roadmap_locale."_locale"::text,
-      roadmap_locale."_locale",
-      'roadmap-item-' || roadmap."id" || '-' || roadmap_locale."_locale"::text,
-      roadmap_locale."time",
-      roadmap_locale."title",
-      roadmap_locale."description"
-    FROM "roadmap_items" roadmap
-    INNER JOIN "roadmap_items_locales" roadmap_locale ON roadmap_locale."_parent_id" = roadmap."id"
-    INNER JOIN "pages" pages ON pages."slug" = 'main'
-    ON CONFLICT ("id") DO NOTHING;
-
-    ALTER TABLE "payload_locked_documents_rels" DROP CONSTRAINT IF EXISTS "payload_locked_documents_rels_roadmap_items_fk";
-    DROP INDEX IF EXISTS "payload_locked_documents_rels_roadmap_items_id_idx";
-    ALTER TABLE "payload_locked_documents_rels" DROP COLUMN IF EXISTS "roadmap_items_id";
-
-    DROP TABLE IF EXISTS "roadmap_items_locales" CASCADE;
-    DROP TABLE IF EXISTS "roadmap_items" CASCADE;
-  `)
-}
-
-export async function down({ db }: MigrateDownArgs): Promise<void> {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS "roadmap_items" (
-      "id" serial PRIMARY KEY NOT NULL,
-      "updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
-      "created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
-    );
-
-    CREATE TABLE IF NOT EXISTS "roadmap_items_locales" (
-      "time" varchar NOT NULL,
-      "title" varchar NOT NULL,
-      "description" varchar NOT NULL,
-      "id" serial PRIMARY KEY NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "_parent_id" integer NOT NULL
-    );
-
-    ALTER TABLE "roadmap_items_locales"
-      ADD CONSTRAINT "roadmap_items_locales_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."roadmap_items"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "roadmap_items_updated_at_idx" ON "roadmap_items" USING btree ("updated_at");
-    CREATE INDEX IF NOT EXISTS "roadmap_items_created_at_idx" ON "roadmap_items" USING btree ("created_at");
-    CREATE UNIQUE INDEX IF NOT EXISTS "roadmap_items_locales_locale_parent_id_unique" ON "roadmap_items_locales" USING btree ("_locale","_parent_id");
-
-    ALTER TABLE "payload_locked_documents_rels" ADD COLUMN IF NOT EXISTS "roadmap_items_id" integer;
-    ALTER TABLE "payload_locked_documents_rels"
-      ADD CONSTRAINT "payload_locked_documents_rels_roadmap_items_fk"
-      FOREIGN KEY ("roadmap_items_id") REFERENCES "public"."roadmap_items"("id")
-      ON DELETE cascade ON UPDATE no action;
-    CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_roadmap_items_id_idx" ON "payload_locked_documents_rels" USING btree ("roadmap_items_id");
-
-    DROP TABLE IF EXISTS "pages_blocks_roadmap_items" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_roadmap" CASCADE;
-  `)
-}
diff --git a/src/migrations/20260501_016_inline_section_fields.ts b/src/migrations/20260501_016_inline_section_fields.ts
deleted file mode 100644
index d2309471..00000000
--- a/src/migrations/20260501_016_inline_section_fields.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
-
-export async function up({ db }: MigrateUpArgs): Promise<void> {
-  await db.execute(sql`
-    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
-    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_description" varchar;
-    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
-    ALTER TABLE "pages_blocks_bento" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
-
-    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
-    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_description" varchar;
-    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
-    ALTER TABLE "pages_blocks_roadmap" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
-
-    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
-    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_description" varchar;
-    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
-    ALTER TABLE "pages_blocks_faq" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
-
-    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
-    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_description" varchar;
-    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
-    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
-
-    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_heading" varchar;
-    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_description" varchar;
-    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_link_button_label" varchar;
-    ALTER TABLE "pages_blocks_card_row" ADD COLUMN IF NOT EXISTS "section_link_button_url" varchar;
-
-    WITH section_source AS (
-      SELECT
-        sections."section_type",
-        sections."link_button_url",
-        sections_locales."_locale",
-        sections_locales."heading",
-        sections_locales."subheading",
-        sections_locales."link_button_label"
-      FROM "sections"
-      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
-    )
-    UPDATE "pages_blocks_bento" block
-    SET
-      "section_heading" = section_source."heading",
-      "section_description" = section_source."subheading",
-      "section_link_button_label" = section_source."link_button_label",
-      "section_link_button_url" = section_source."link_button_url"
-    FROM section_source
-    WHERE block."_locale" = section_source."_locale"
-      AND (
-        (block."variant" = 'feature' AND section_source."section_type" = 'AppFeatureSection')
-        OR (block."variant" = 'runtime' AND section_source."section_type" = 'RuntimeFeatureSection')
-      );
-
-    WITH section_source AS (
-      SELECT
-        sections."section_type",
-        sections."link_button_url",
-        sections_locales."_locale",
-        sections_locales."heading",
-        sections_locales."subheading",
-        sections_locales."link_button_label"
-      FROM "sections"
-      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
-    )
-    UPDATE "pages_blocks_roadmap" block
-    SET
-      "section_heading" = section_source."heading",
-      "section_description" = section_source."subheading",
-      "section_link_button_label" = section_source."link_button_label",
-      "section_link_button_url" = section_source."link_button_url"
-    FROM section_source
-    WHERE block."_locale" = section_source."_locale"
-      AND section_source."section_type" = 'RoadmapSection';
-
-    WITH section_source AS (
-      SELECT
-        sections."section_type",
-        sections."link_button_url",
-        sections_locales."_locale",
-        sections_locales."heading",
-        sections_locales."subheading",
-        sections_locales."link_button_label"
-      FROM "sections"
-      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
-    )
-    UPDATE "pages_blocks_faq" block
-    SET
-      "section_heading" = section_source."heading",
-      "section_description" = section_source."subheading",
-      "section_link_button_label" = section_source."link_button_label",
-      "section_link_button_url" = section_source."link_button_url"
-    FROM section_source
-    WHERE block."_locale" = section_source."_locale"
-      AND section_source."section_type" = 'FaqSection';
-
-    WITH section_source AS (
-      SELECT
-        sections."section_type",
-        sections."link_button_url",
-        sections_locales."_locale",
-        sections_locales."heading",
-        sections_locales."subheading",
-        sections_locales."link_button_label"
-      FROM "sections"
-      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
-    )
-    UPDATE "pages_blocks_offset_cards" block
-    SET
-      "section_heading" = section_source."heading",
-      "section_description" = section_source."subheading",
-      "section_link_button_label" = section_source."link_button_label",
-      "section_link_button_url" = section_source."link_button_url"
-    FROM section_source
-    WHERE block."_locale" = section_source."_locale"
-      AND COALESCE(block."show_section_header", false) = true
-      AND section_source."section_type" = 'UseCaseSection';
-
-    WITH section_source AS (
-      SELECT
-        sections."section_type",
-        sections."link_button_url",
-        sections_locales."_locale",
-        sections_locales."heading",
-        sections_locales."subheading",
-        sections_locales."link_button_label"
-      FROM "sections"
-      INNER JOIN "sections_locales" ON "sections_locales"."_parent_id" = sections."id"
-    )
-    UPDATE "pages_blocks_card_row" block
-    SET
-      "section_heading" = section_source."heading",
-      "section_description" = section_source."subheading",
-      "section_link_button_label" = section_source."link_button_label",
-      "section_link_button_url" = section_source."link_button_url"
-    FROM section_source
-    WHERE block."_locale" = section_source."_locale"
-      AND section_source."section_type" IN ('CardRowSection', 'DeploymentSection');
-
-    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "show_section_header";
-
-    ALTER TABLE "payload_locked_documents_rels" DROP CONSTRAINT IF EXISTS "payload_locked_documents_rels_sections_fk";
-    DROP INDEX IF EXISTS "payload_locked_documents_rels_sections_id_idx";
-    ALTER TABLE "payload_locked_documents_rels" DROP COLUMN IF EXISTS "sections_id";
-
-    DROP TABLE IF EXISTS "sections_locales" CASCADE;
-    DROP TABLE IF EXISTS "sections" CASCADE;
-    DROP TYPE IF EXISTS "public"."enum_sections_section_type";
-  `)
-}
-
-export async function down({ db }: MigrateDownArgs): Promise<void> {
-  await db.execute(sql`
-    DO $$ BEGIN
-      CREATE TYPE "public"."enum_sections_section_type" AS ENUM('AppFeatureSection', 'FaqSection', 'RoadmapSection', 'RuntimeFeatureSection', 'UseCaseSection', 'DeploymentSection', 'CardRowSection');
-    EXCEPTION
-      WHEN duplicate_object THEN null;
-    END $$;
-
-    CREATE TABLE IF NOT EXISTS "sections" (
-      "id" serial PRIMARY KEY NOT NULL,
-      "section_type" "enum_sections_section_type" NOT NULL,
-      "link_button_url" varchar,
-      "updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
-      "created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
-    );
-
-    CREATE TABLE IF NOT EXISTS "sections_locales" (
-      "heading" varchar NOT NULL,
-      "subheading" varchar,
-      "link_button_label" varchar,
-      "id" serial PRIMARY KEY NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "_parent_id" integer NOT NULL
-    );
-
-    ALTER TABLE "sections_locales"
-      ADD CONSTRAINT "sections_locales_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."sections"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "sections_updated_at_idx" ON "sections" USING btree ("updated_at");
-    CREATE INDEX IF NOT EXISTS "sections_created_at_idx" ON "sections" USING btree ("created_at");
-    CREATE UNIQUE INDEX IF NOT EXISTS "sections_locales_locale_parent_id_unique" ON "sections_locales" USING btree ("_locale","_parent_id");
-
-    ALTER TABLE "payload_locked_documents_rels" ADD COLUMN IF NOT EXISTS "sections_id" integer;
-    ALTER TABLE "payload_locked_documents_rels"
-      ADD CONSTRAINT "payload_locked_documents_rels_sections_fk"
-      FOREIGN KEY ("sections_id") REFERENCES "public"."sections"("id")
-      ON DELETE cascade ON UPDATE no action;
-    CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_sections_id_idx" ON "payload_locked_documents_rels" USING btree ("sections_id");
-
-    ALTER TABLE "pages_blocks_offset_cards" ADD COLUMN IF NOT EXISTS "show_section_header" boolean DEFAULT false;
-    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_heading";
-    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_description";
-    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_link_button_label";
-    ALTER TABLE "pages_blocks_bento" DROP COLUMN IF EXISTS "section_link_button_url";
-    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_heading";
-    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_description";
-    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_link_button_label";
-    ALTER TABLE "pages_blocks_roadmap" DROP COLUMN IF EXISTS "section_link_button_url";
-    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_heading";
-    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_description";
-    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_link_button_label";
-    ALTER TABLE "pages_blocks_faq" DROP COLUMN IF EXISTS "section_link_button_url";
-    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_heading";
-    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_description";
-    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_link_button_label";
-    ALTER TABLE "pages_blocks_offset_cards" DROP COLUMN IF EXISTS "section_link_button_url";
-    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_heading";
-    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_description";
-    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_link_button_label";
-    ALTER TABLE "pages_blocks_card_row" DROP COLUMN IF EXISTS "section_link_button_url";
-  `)
-}
diff --git a/src/migrations/20260501_017_scroll_card_block.ts b/src/migrations/20260501_017_scroll_card_block.ts
deleted file mode 100644
index 9fe95dbe..00000000
--- a/src/migrations/20260501_017_scroll_card_block.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { MigrateDownArgs, MigrateUpArgs, sql } from '@payloadcms/db-postgres'
-
-export async function up({ db }: MigrateUpArgs): Promise<void> {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS "pages_blocks_scroll_cards" (
-      "_order" integer NOT NULL,
-      "_parent_id" integer NOT NULL,
-      "_path" text NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "block_name" varchar
-    );
-
-    CREATE TABLE IF NOT EXISTS "pages_blocks_scroll_cards_items" (
-      "_order" integer NOT NULL,
-      "_parent_id" varchar NOT NULL,
-      "_locale" "_locales" NOT NULL,
-      "id" varchar PRIMARY KEY NOT NULL,
-      "title" varchar NOT NULL,
-      "description" varchar NOT NULL,
-      "show_image_border" boolean DEFAULT true,
-      "section_layout" varchar DEFAULT 'imageRight' NOT NULL,
-      "gradient" varchar DEFAULT 'blue',
-      "gradient_direction" varchar DEFAULT 'topLeft',
-      "bullet_points" jsonb,
-      "image_id" integer,
-      "link_label" varchar,
-      "link_url" varchar
-    );
-
-    ALTER TABLE "pages_blocks_scroll_cards"
-      ADD CONSTRAINT "pages_blocks_scroll_cards_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_scroll_cards_items"
-      ADD CONSTRAINT "pages_blocks_scroll_cards_items_image_id_media_id_fk"
-      FOREIGN KEY ("image_id") REFERENCES "public"."media"("id")
-      ON DELETE set null ON UPDATE no action;
-
-    ALTER TABLE "pages_blocks_scroll_cards_items"
-      ADD CONSTRAINT "pages_blocks_scroll_cards_items_parent_id_fk"
-      FOREIGN KEY ("_parent_id") REFERENCES "public"."pages_blocks_scroll_cards"("id")
-      ON DELETE cascade ON UPDATE no action;
-
-    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_order_idx" ON "pages_blocks_scroll_cards" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_parent_id_idx" ON "pages_blocks_scroll_cards" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_path_idx" ON "pages_blocks_scroll_cards" USING btree ("_path");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_locale_idx" ON "pages_blocks_scroll_cards" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_order_idx" ON "pages_blocks_scroll_cards_items" USING btree ("_order");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_parent_id_idx" ON "pages_blocks_scroll_cards_items" USING btree ("_parent_id");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_locale_idx" ON "pages_blocks_scroll_cards_items" USING btree ("_locale");
-    CREATE INDEX IF NOT EXISTS "pages_blocks_scroll_cards_items_image_idx" ON "pages_blocks_scroll_cards_items" USING btree ("image_id");
-  `)
-}
-
-export async function down({ db }: MigrateDownArgs): Promise<void> {
-  await db.execute(sql`
-    DROP TABLE IF EXISTS "pages_blocks_scroll_cards_items" CASCADE;
-    DROP TABLE IF EXISTS "pages_blocks_scroll_cards" CASCADE;
-  `)
-}
diff --git a/src/migrations/index.ts b/src/migrations/index.ts
index 955c7331..f1f21361 100644
--- a/src/migrations/index.ts
+++ b/src/migrations/index.ts
@@ -10,13 +10,6 @@ import * as migration_20260415_025537_007_subscription_workflow_executions from
 import * as migration_20260425_134031_009_actions from './20260425_134031_009_actions';
 import * as migration_20260424_151900_008_footer_contact_legal_fields from './20260424_151900_008_footer_contact_legal_fields';
 import * as migration_20260427_010_remove_edition_hero_block from './20260427_010_remove_edition_hero_block';
-import * as migration_20260428_011_card_row_block from './20260428_011_card_row_block';
-import * as migration_20260428_012_offset_cards_block from './20260428_012_offset_cards_block';
-import * as migration_20260428_013_install_and_swipe_cards_blocks from './20260428_013_install_and_swipe_cards_blocks';
-import * as migration_20260501_014_bento_block from './20260501_014_bento_block';
-import * as migration_20260501_015_roadmap_block from './20260501_015_roadmap_block';
-import * as migration_20260501_016_inline_section_fields from './20260501_016_inline_section_fields';
-import * as migration_20260501_017_scroll_card_block from './20260501_017_scroll_card_block';
 
 export const migrations = [
   {
@@ -79,39 +72,4 @@ export const migrations = [
     down: migration_20260427_010_remove_edition_hero_block.down,
     name: '20260427_010_remove_edition_hero_block'
   },
-  {
-    up: migration_20260428_011_card_row_block.up,
-    down: migration_20260428_011_card_row_block.down,
-    name: '20260428_011_card_row_block'
-  },
-  {
-    up: migration_20260428_012_offset_cards_block.up,
-    down: migration_20260428_012_offset_cards_block.down,
-    name: '20260428_012_offset_cards_block'
-  },
-  {
-    up: migration_20260428_013_install_and_swipe_cards_blocks.up,
-    down: migration_20260428_013_install_and_swipe_cards_blocks.down,
-    name: '20260428_013_install_and_swipe_cards_blocks'
-  },
-  {
-    up: migration_20260501_014_bento_block.up,
-    down: migration_20260501_014_bento_block.down,
-    name: '20260501_014_bento_block'
-  },
-  {
-    up: migration_20260501_015_roadmap_block.up,
-    down: migration_20260501_015_roadmap_block.down,
-    name: '20260501_015_roadmap_block'
-  },
-  {
-    up: migration_20260501_016_inline_section_fields.up,
-    down: migration_20260501_016_inline_section_fields.down,
-    name: '20260501_016_inline_section_fields'
-  },
-  {
-    up: migration_20260501_017_scroll_card_block.up,
-    down: migration_20260501_017_scroll_card_block.down,
-    name: '20260501_017_scroll_card_block'
-  },
 ];
diff --git a/src/payload-types.ts b/src/payload-types.ts
index 3d6590f9..a7719e71 100644
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -407,8 +407,8 @@ export interface Page {
             blockType: 'install';
           }
         | {
-            heading: string;
-            subheading: string;
+            heading?: string | null;
+            subheading?: string | null;
             cards: {
               title: string;
               description: string;