diff --git a/nuxt/components/industry-page/Applications.vue b/nuxt/components/industry-page/Applications.vue
new file mode 100644
index 0000000000..f0fecdf350
--- /dev/null
+++ b/nuxt/components/industry-page/Applications.vue
@@ -0,0 +1,68 @@
+<script setup lang="ts">
+// The zigzag "Applications for X Manufacturing" band from automotive.vue.
+type Item = {
+    title: string
+    description: string
+    linkText: string
+    linkHref: string
+    image: string
+    imageAlt: string
+    variant: 'indigo' | 'red' | 'mixed'
+}
+
+defineProps<{ heading: string, description: string, items: Item[] }>()
+
+const VARIANTS: Record<string, { gradient: string, border: string, mobileGradient: string, mobileBorder: string }> = {
+    indigo: { gradient: 'from-indigo-400 via-indigo-300 to-indigo-100', border: 'border-indigo-300', mobileGradient: 'from-indigo-100 to-indigo-50', mobileBorder: 'border-indigo-200' },
+    red: { gradient: 'from-red-200 via-red-100 to-red-50', border: 'border-red-100', mobileGradient: 'from-red-50 to-white', mobileBorder: 'border-red-100' },
+    mixed: { gradient: 'from-red-200 to-indigo-100', border: 'border-indigo-100', mobileGradient: 'from-red-50 to-indigo-50', mobileBorder: 'border-indigo-100' },
+}
+</script>
+
+<template>
+  <section class="w-full relative pb-20 pt-14 px-6 overflow-hidden">
+    <div class="absolute inset-x-0 top-0 h-[400px] md:h-[561px] solution-section-bg-flipped" aria-hidden="true" />
+    <div class="relative z-10">
+      <div class="max-w-screen-lg mx-auto max-md:text-center mb-28 md:mt-10">
+        <h2 class="text-indigo-600 text-4xl md:text-5xl">{{ heading }}</h2>
+        <p class="text-gray-600 text-lgmd:text-2xl">{{ description }}</p>
+      </div>
+
+      <div class="md:max-w-screen-lg mx-auto">
+        <div
+            v-for="(item, index) in items"
+            :key="item.title"
+            class="max-md:text-center md:flex md:flex-row gap-8 items-center m-auto mb-14 md:mb-20"
+            :class="{ 'md:flex-row-reverse': index % 2 === 1 }"
+        >
+          <!-- Image (desktop): full-size screenshot offset over a colored panel -->
+          <div class="max-md:hidden md:w-[45%]">
+            <div class="relative aspect-[430/289]">
+              <div
+                  class="absolute -top-5 w-full h-full rounded-lg bg-gradient-to-tl"
+                  :class="[VARIANTS[item.variant].gradient, index % 2 === 0 ? '-left-5' : '-right-5']"
+              />
+              <div class="absolute inset-0 rounded-lg border-2 overflow-hidden ff-image-cover" :class="VARIANTS[item.variant].border">
+                <img :src="item.image" :alt="item.imageAlt" loading="lazy">
+              </div>
+            </div>
+          </div>
+          <!-- Text -->
+          <div class="md:w-[55%] flex flex-col gap-3">
+            <h3 class="text-gray-700 text-3xl font-medium m-0">{{ item.title }}</h3>
+            <div class="md:hidden rounded-xl w-full bg-gradient-to-tl max-w-[500px] mx-auto my-4 p-4" :class="VARIANTS[item.variant].mobileGradient">
+              <div class="ff-image-rounded w-full border overflow-hidden" :class="VARIANTS[item.variant].mobileBorder">
+                <img :src="item.image" :alt="item.imageAlt" loading="lazy">
+              </div>
+            </div>
+            <p class="text-gray-500 m-0">{{ item.description }}</p>
+            <a :href="item.linkHref" class="flex items-center gap-1.5 text-blue-600 hover:underline max-md:justify-center">
+              {{ item.linkText }}
+              <UIcon name="i-heroicons-arrow-long-right" class="w-6 h-6 shrink-0" />
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/nuxt/components/industry-page/Compliance.vue b/nuxt/components/industry-page/Compliance.vue
new file mode 100644
index 0000000000..9c0dbd5968
--- /dev/null
+++ b/nuxt/components/industry-page/Compliance.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+// The compliance grid from automotive.vue. "The Data Your Audit Asks For, In One Place"
+// is fixed copy shared by every page built on this template, not page-specific data.
+interface ComplianceItem { title: string, text: string, linkText: string, linkHref: string, icon?: string }
+
+defineProps<{ industryName: string, description: string, items: ComplianceItem[] }>()
+</script>
+
+<template>
+  <section class="w-full py-16 md:py-24 px-6 bg-radial-[ellipse_60%_70%_at_center_bottom] from-blue-200/30 to-blue-200/0">
+    <div class="max-w-screen-lg mx-auto">
+      <div class="mb-12">
+        <h2 class="text-gray-700 mb-2">{{ industryName }} <span class="text-indigo-600">Compliance &amp; Standards</span></h2>
+        <p class="text-xl font-medium mt-0 mb-4">The Data Your Audit Asks For, In One Place</p>
+        <p class="text-gray-600">{{ description }}</p>
+      </div>
+      <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-5">
+        <a
+            v-for="item in items"
+            :key="item.title"
+            :href="item.linkHref"
+            class="group hover:no-underline flex flex-col gap-3 rounded-xl border border-gray-200 p-5 bg-white hover:border-indigo-300 hover:shadow-sm transition-all"
+        >
+          <div class="w-6 h-6 text-indigo-600">
+            <UIcon v-if="item.icon" :name="item.icon" class="size-6" />
+            <IconsCertificateIcon v-else />
+          </div>
+          <h3 class="m-0 text-lg font-medium text-gray-800 group-hover:text-indigo-600 transition-colors">{{ item.title }}</h3>
+          <p class="m-0 text-gray-600 text-sm flex-grow">{{ item.text }}</p>
+          <span class="mt-2 text-blue-600 text-sm flex items-center gap-1.5 group-hover:underline">
+            {{ item.linkText }}
+            <UIcon name="i-heroicons-arrow-long-right" class="w-6 h-6 shrink-0" />
+          </span>
+        </a>
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/nuxt/components/industry-page/Cta.vue b/nuxt/components/industry-page/Cta.vue
new file mode 100644
index 0000000000..7368c77a9e
--- /dev/null
+++ b/nuxt/components/industry-page/Cta.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+// The closing CTA band from automotive.vue. Distinct from industry-page/Roi's fixed link
+// and from the industriesLegacy Cta band: this one is the "get started" gradient card,
+// always ending in a single Book-a-demo button.
+defineProps<{ heading: string, description: string }>()
+</script>
+
+<template>
+  <div class="w-full px-6 pb-20">
+    <div class="max-w-screen-lg mx-auto">
+      <div class="rounded-xl px-9 py-12 flex flex-col items-center gap-8 text-center ff-get-started-bg">
+        <p class="text-white text-5xl font-medium m-0">{{ heading }}</p>
+        <p class="text-indigo-50 font-light text-xl max-w-2xl m-0">{{ description }}</p>
+        <CtaBookDemo variant="highlight" position="final-cta" />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/nuxt/components/industry-page/Hero.vue b/nuxt/components/industry-page/Hero.vue
new file mode 100644
index 0000000000..1692ab4f86
--- /dev/null
+++ b/nuxt/components/industry-page/Hero.vue
@@ -0,0 +1,67 @@
+<script setup lang="ts">
+// The hero band from pages/industries/automotive.vue: eyebrow badge, accent heading,
+// buttons, a customer-quote card, and an optional SocialProof line. The metrics grid and
+// customer-story bridge live in industry-page/Metrics.vue, rendered right after this.
+defineProps<{
+    hero: {
+        eyebrow: string
+        eyebrowIcon: string
+        heading: string
+        description: string
+        quote: {
+            text: string
+            author: string
+            role: string
+            company: string
+            image: string
+            imageAlt: string
+        }
+    }
+    socialProof?: string
+}>()
+</script>
+
+<template>
+  <section class="w-full relative">
+    <div class="px-6 pt-16 md:pt-20">
+      <div class="max-w-screen-lg mx-auto grid md:grid-cols-2 gap-12 items-stretch">
+        <div class="max-md:text-center md:flex md:flex-col md:justify-center">
+          <div class="mb-4 max-md:flex max-md:justify-center">
+            <span class="inline-flex items-center gap-2 rounded-lg border border-gray-200 bg-gray-50 px-3 py-1.5 industry-eyebrow-icon text-gray-800">
+              <span class="w-5 h-5 inline-flex items-center shrink-0"><NavIcon :name="hero.eyebrowIcon" /></span>
+              <span class="font-medium">{{ hero.eyebrow }}</span>
+            </span>
+          </div>
+          <!-- eslint-disable-next-line vue/no-v-html -->
+          <h1 class="text-4xl md:text-5xl font-medium m-0" v-html="hero.heading" />
+          <p class="mt-6 text-gray-700">{{ hero.description }}</p>
+          <div class="mt-8 flex gap-4 items-center max-md:justify-center flex-wrap">
+            <CtaBookDemo variant="highlight" position="hero" />
+            <CtaPricing variant="ghost" position="hero" icon="i-lucide-arrow-right" />
+          </div>
+        </div>
+        <div class="w-full md:flex md:items-center">
+          <div class="relative w-full md:pt-6 max-md:mt-10">
+            <div class="relative rounded-lg border border-indigo-200 p-6 pt-28 bg-indigo-50/50">
+              <div class="absolute -top-14 left-1/2 -translate-x-1/2 md:left-8 md:translate-x-0 w-36 h-36 rounded-full bg-red-200 border-4 border-white shadow-lg overflow-hidden ff-image-cover">
+                <img :src="hero.quote.image" :alt="hero.quote.imageAlt" loading="eager">
+              </div>
+              <p class="italic text-gray-600 font-medium m-0">&ldquo;{{ hero.quote.text }}&rdquo;</p>
+              <p class="text-gray-500 text-right mt-4 mb-0">{{ hero.quote.author }}, {{ hero.quote.role }}, <span class="font-semibold text-gray-600">{{ hero.quote.company }}</span></p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="max-w-screen-lg mx-auto mt-16 text-center">
+        <div class="mx-auto text-center -mt-0.5 -mb-10">
+          <!-- No `socialProof`: falls back to SocialProof's own generic default line,
+               same as any other page that doesn't pass `eyebrow`. `?? undefined`
+               matters here — an absent optional @nuxt/content field comes through as
+               `null`, and SocialProof's own `withDefaults` only substitutes for
+               `undefined`, not `null`. -->
+          <SocialProof :eyebrow="socialProof ?? undefined" eyebrow-bg="indigo" />
+        </div>
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/nuxt/components/industry-page/Metrics.vue b/nuxt/components/industry-page/Metrics.vue
new file mode 100644
index 0000000000..5e4a7d8c59
--- /dev/null
+++ b/nuxt/components/industry-page/Metrics.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+// The metrics grid from pages/industries/automotive.vue, plus an optional customer-story
+// bridge (heading + description above the grid, link below it, right-aligned). Split out
+// of industry-page/Hero.vue so the hero band and this one can change independently.
+defineProps<{
+    metrics: Array<{ number: string, text: string }>
+    metricsBridge?: { heading: string, description: string, linkText: string, linkHref: string }
+}>()
+</script>
+
+<template>
+  <div class="w-full px-6">
+    <!-- The radial fade only applies when there's a bridge above the metrics — the same
+         soft-red look .bg-radial-red gives automotive's own metrics band elsewhere, just
+         lighter (from-red-100/15, vs. that class's fixed 0.3 alpha) and built as a plain
+         Tailwind arbitrary gradient so the alpha's easy to tune per page if needed. -->
+    <div
+        class="max-w-md sm:max-w-screen-lg mx-auto mt-16 pb-10"
+        :class="{ 'bg-radial-[ellipse_50%_70%_at_center_bottom] from-red-50/50 to-red-100/0': metricsBridge }"
+    >
+      <div v-if="metricsBridge" class="max-md:text-center mb-8">
+        <h2 class="text-gray-700 mb-4 mt-20" v-html="metricsBridge.heading" />
+        <p class="text-gray-600">{{ metricsBridge.description }}</p>
+      </div>
+      <div class="grid sm:grid-cols-3 gap-12 my-4 max-sm:w-full m-auto">
+        <div v-for="metric in metrics" :key="metric.number" class="w-full h-full rounded-lg bg-red-50/70 pb-3 px-6 pt-6">
+          <h3 class="text-5xl font-semibold text-red-400">{{ metric.number }}</h3>
+          <p class="mt-0 font-normal leading-6">{{ metric.text }}</p>
+        </div>
+      </div>
+      <div v-if="metricsBridge" class="text-right mt-8">
+        <a :href="metricsBridge.linkHref" class="inline-flex items-center gap-1.5 text-blue-600 hover:underline">
+          {{ metricsBridge.linkText }}
+          <UIcon name="i-heroicons-arrow-long-right" class="w-4 h-4 shrink-0" />
+        </a>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/nuxt/components/industry-page/Roi.vue b/nuxt/components/industry-page/Roi.vue
new file mode 100644
index 0000000000..30a96f120a
--- /dev/null
+++ b/nuxt/components/industry-page/Roi.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+// "The problem, and what it costs" band from automotive.vue. The calculator itself and
+// the "open the full calculator" link are identical on every page, so they stay fixed
+// here rather than becoming per-page data.
+defineProps<{ heading: string, description: string }>()
+</script>
+
+<template>
+  <section class="w-full py-16 px-6">
+    <div class="max-w-screen-lg mx-auto">
+      <div class="max-md:mx-auto max-md:text-center">
+        <h2 class="text-gray-700 mb-4" v-html="heading" />
+        <p class="text-gray-600 m-0">{{ description }}</p>
+      </div>
+      <div class="mt-10">
+        <RoiCalculator compact />
+      </div>
+      <p class="text-center text-sm text-gray-500 mt-8">Want to tune every assumption and see the research behind it? <a href="/resources/roi-calculator/" class="text-indigo-600 font-semibold hover:underline">Open the full ROI calculator</a>.</p>
+    </div>
+  </section>
+</template>
diff --git a/nuxt/components/industry-page/Template.vue b/nuxt/components/industry-page/Template.vue
new file mode 100644
index 0000000000..8b2c6f0657
--- /dev/null
+++ b/nuxt/components/industry-page/Template.vue
@@ -0,0 +1,83 @@
+<script setup lang="ts">
+// The shared page body for every industry page built on the automotive.vue template.
+// A thin pages/industries/<slug>.vue queries its own `industries` collection entry and
+// renders it through this one component, so the band markup lives in exactly one place.
+const props = defineProps<{
+    page: {
+        slug: string
+        industryName: string
+        seoMeta: { title: string, description: string }
+        hero: {
+            eyebrow: string
+            eyebrowIcon: string
+            heading: string
+            description: string
+            quote: { text: string, author: string, role: string, company: string, image: string, imageAlt: string }
+        }
+        socialProof?: string
+        metrics: Array<{ number: string, text: string }>
+        metricsBridge?: { heading: string, description: string, linkText: string, linkHref: string }
+        roi: { heading: string, description: string }
+        applications: {
+            heading: string
+            description: string
+            items: Array<{ title: string, description: string, linkText: string, linkHref: string, image: string, imageAlt: string, variant: 'indigo' | 'red' | 'mixed' }>
+        }
+        compliance: {
+            description: string
+            items: Array<{ title: string, text: string, linkText: string, linkHref: string, icon?: string }>
+        }
+        faqs: Array<{ question: string, answer: string }>
+        closingCta: { heading: string, description: string }
+    }
+}>()
+
+useSeoMeta({
+    title: props.page.seoMeta.title,
+    description: props.page.seoMeta.description,
+    ogUrl: `https://flowfuse.com/industries/${props.page.slug}/`,
+    twitterSite: '@FlowFuseinc',
+})
+
+useSchemaOrg([
+    defineWebPage({ '@type': 'FAQPage' }),
+    ...props.page.faqs.map(item => defineQuestion(item)),
+])
+</script>
+
+<template>
+  <div class="w-full">
+    <IndustryPageHero :hero="page.hero" :social-proof="page.socialProof" />
+
+    <IndustryPageMetrics :metrics="page.metrics" :metrics-bridge="page.metricsBridge" />
+
+    <IndustryPageRoi :heading="page.roi.heading" :description="page.roi.description" />
+
+    <IndustryPageApplications
+        :heading="page.applications.heading"
+        :description="page.applications.description"
+        :items="page.applications.items"
+    />
+
+    <EnterpriseSecurity />
+
+    <IndustryPageCompliance
+        :industry-name="page.industryName"
+        :description="page.compliance.description"
+        :items="page.compliance.items"
+    />
+
+    <!-- Dynamic, not page data: every use-case whose own `industries[]` field names this
+         slug shows up here. Shared with the industriesLegacy [slug].vue's own band. -->
+    <IndustryPageUseCases :slug="page.slug" :display-name="page.industryName" />
+
+    <div class="w-full px-6 pt-20 pb-10">
+      <div class="max-w-screen-lg mx-auto">
+        <h2 class="mb-1 text-center md:text-left">Frequently Asked <span class="text-indigo-600">Questions</span></h2>
+        <BlogFaq :faq="page.faqs" />
+      </div>
+    </div>
+
+    <IndustryPageCta :heading="page.closingCta.heading" :description="page.closingCta.description" />
+  </div>
+</template>
diff --git a/nuxt/components/industry/MatchingUseCases.vue b/nuxt/components/industry-page/UseCases.vue
similarity index 83%
rename from nuxt/components/industry/MatchingUseCases.vue
rename to nuxt/components/industry-page/UseCases.vue
index 91aac62197..663d1bf37b 100644
--- a/nuxt/components/industry/MatchingUseCases.vue
+++ b/nuxt/components/industry-page/UseCases.vue
@@ -1,6 +1,10 @@
 <script setup lang="ts">
 // components/industry-use-cases.njk: every use-case whose `industries[]` names this
 // industry. The mapping's source of truth is the Use Cases Asana project (Industry field).
+//
+// Lives here, not under components/industry/, because both templates use it: the
+// industriesLegacy [slug].vue AND this one (industry-page/Template.vue). industry/ is
+// due for deletion once the seven legacy pages go; this component has to survive that.
 const props = defineProps<{ slug: string, displayName: string }>()
 
 const { data: all } = await useAsyncData('industry-use-cases', () =>
diff --git a/nuxt/components/use-case/Card.vue b/nuxt/components/use-case/Card.vue
index 49fb002c08..9fbec66308 100644
--- a/nuxt/components/use-case/Card.vue
+++ b/nuxt/components/use-case/Card.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 // The cross-link card shared by the /use-cases/ listing, components/use-case-links.njk,
-// and components/industry-use-cases.njk (now IndustryMatchingUseCases.vue) — one look
+// and components/industry-use-cases.njk (now IndustryPageUseCases.vue) — one look
 // across all three call sites.
 withDefaults(defineProps<{
     to: string
diff --git a/nuxt/content.config.ts b/nuxt/content.config.ts
index bc8e7128fa..14a1f4db73 100644
--- a/nuxt/content.config.ts
+++ b/nuxt/content.config.ts
@@ -524,6 +524,108 @@ export default defineContentConfig({
                 }).optional(),
             })
         }),
+        // The template lifted from automotive.vue. Every industry page built on it (starting
+        // with automotive itself, then industrial-machinery) is a data entry here plus a thin
+        // pages/industries/<slug>.vue wrapper — same split as the industriesLegacy collection
+        // below, just a different, richer set of bands (quote card, metrics, ROI calculator,
+        // zigzag applications, compliance grid) than the seven legacy pages have.
+        industries: defineCollection({
+            type: 'data',
+            source: 'industries/*.yml',
+            schema: z.object({
+                slug: z.string(),
+                // The short industry name used by the compliance heading ("X Compliance &
+                // Standards") and the use-cases heading ("Use cases in X"). Distinct from
+                // hero.eyebrow, which carries the fuller "X Manufacturing" framing — on
+                // automotive.vue these were "Automotive" and "Automotive Manufacturing"
+                // respectively, never the same string.
+                industryName: z.string(),
+                // The /industries/ listing card's thumbnail — distinct from hero.quote.image,
+                // which is the customer headshot inside the page's own hero band.
+                listingImage: z.string(),
+                listingImageAlt: z.string().optional(),
+                seoMeta: z.object({
+                    title: z.string(),
+                    description: z.string(),
+                }),
+                hero: z.object({
+                    eyebrow: z.string(),
+                    // A NavIcon registry key (nuxt/utils/navIcons.ts).
+                    eyebrowIcon: z.string(),
+                    // Carries inline <span class="text-red-600"> markup, rendered with
+                    // v-html — static content in this repo, not anything a visitor can set.
+                    heading: z.string(),
+                    description: z.string(),
+                    quote: z.object({
+                        text: z.string(),
+                        author: z.string(),
+                        role: z.string(),
+                        company: z.string(),
+                        image: z.string(),
+                        imageAlt: z.string(),
+                    }),
+                }),
+                // The "N+ manufacturers in M countries..." SocialProof line. Not every page
+                // has an aggregate stat like this yet.
+                socialProof: z.string().optional(),
+                metrics: z.array(z.object({
+                    number: z.string(),
+                    text: z.string(),
+                })),
+                // A customer-story bridge: heading + description above the metrics grid,
+                // link below it (right-aligned) — not above the grid the way the doc had it,
+                // so the hero's layout stays fixed whether or not a page sets this.
+                metricsBridge: z.object({
+                    // Carries inline <span class="text-indigo-600"> markup, rendered with
+                    // v-html for the same reason hero.heading is.
+                    heading: z.string(),
+                    description: z.string(),
+                    linkText: z.string(),
+                    linkHref: z.string(),
+                }).optional(),
+                roi: z.object({
+                    heading: z.string(),
+                    description: z.string(),
+                }),
+                applications: z.object({
+                    heading: z.string(),
+                    description: z.string(),
+                    items: z.array(z.object({
+                        title: z.string(),
+                        description: z.string(),
+                        linkText: z.string(),
+                        linkHref: z.string(),
+                        image: z.string(),
+                        imageAlt: z.string(),
+                        variant: z.enum(['indigo', 'red', 'mixed']),
+                    })),
+                }),
+                compliance: z.object({
+                    // The "The Data Your Audit Asks For, In One Place" subtitle is fixed
+                    // copy shared by every page, not declared here.
+                    description: z.string(),
+                    items: z.array(z.object({
+                        title: z.string(),
+                        text: z.string(),
+                        linkText: z.string(),
+                        linkHref: z.string(),
+                        // A UIcon name. Falls back to <IconsCertificateIcon> when absent.
+                        icon: z.string().optional(),
+                    })),
+                }),
+                // No useCases field: the "Use cases in X" band is dynamic, the same
+                // industriesLegacy-template query against the useCases collection's own
+                // `industries[]` field — not page data that has to be kept in sync by hand.
+                faqs: z.array(z.object({
+                    question: z.string(),
+                    answer: z.string(),
+                })),
+                closingCta: z.object({
+                    heading: z.string(),
+                    description: z.string(),
+                }),
+            })
+        }),
         // The seven industry pages were pure 11ty frontmatter read by layouts/industry.njk,
         // the same shape as the operational use-cases. /industries/automotive/ is not here:
         // it had a bespoke markup body and stays a hand-written Vue page, which is why the
diff --git a/nuxt/content/industries/automotive.yml b/nuxt/content/industries/automotive.yml
new file mode 100644
index 0000000000..f9a3575a93
--- /dev/null
+++ b/nuxt/content/industries/automotive.yml
@@ -0,0 +1,102 @@
+# Lifted verbatim from pages/industries/automotive.vue's inline data, now that automotive
+# is the first entry in the template it defined. No copy changes.
+slug: automotive
+industryName: "Automotive"
+listingImage: "/images/industries/automotive.jpg"
+listingImageAlt: "Aerial view of an automotive manufacturing plant floor"
+seoMeta:
+  title: "Automotive Manufacturing Applications"
+  description: "Connect PLCs, SCADA, MES, and plant IT systems in one place. FlowFuse helps teams monitor, automate, and standardize production workflows across plants in real time."
+hero:
+  eyebrow: "Automotive Manufacturing"
+  eyebrowIcon: "car"
+  heading: "<span class='text-red-600'>Scale automotive operations</span> without rewiring your stack"
+  description: "Connect PLCs, SCADA, MES, and plant IT systems in one place. FlowFuse helps teams monitor, automate, and standardize production workflows across plants in real time."
+  quote:
+    text: "At PennEngineering, I built out the FlowFuse deployment from scratch: machine monitoring, machine dashboards, ERP integration. What FlowFuse gave us was revision control and a platform the whole team could own. That made the deployment self-sustaining."
+    author: "Lidiya Shutaya"
+    role: "Sr. Operational Technology System Architect"
+    company: "PennEngineering (formerly)"
+    image: "/images/industries/automotive/headshot-lidiya-shutaya-metaltec-and-pen.png"
+    imageAlt: "Lidiya Shutaya"
+socialProof: "30+ automotive manufacturers in 20 countries have run their operations on FlowFuse"
+metrics:
+  - number: "300+"
+    text: "Automotive applications built"
+  - number: "120+"
+    text: "Plants or production lines running FlowFuse"
+  - number: "40+"
+    text: "Industrial protocols and systems supported out of the box"
+roi:
+  heading: "Every Disconnected System Has a Price Tag"
+  description: "PLCs, robots, SCADA, MES, historians, and cloud systems already hold the data your teams need; they just don't talk to each other. Closing that gap manually costs engineering hours spent searching and rebuilding, and production hours when something breaks with no quick solution. See what that's costing you below."
+applications:
+  heading: "Applications for Automotive Manufacturing"
+  description: "See how FlowFuse supports automotive manufacturers with solutions for connectivity, production visibility, downtime reduction, and operational improvement."
+  items:
+    - title: "Connect Your Existing Manufacturing Systems"
+      description: "No rip and replace; instead, connect PLCs, robots, SCADA, historians, MES, ERP systems, databases, and cloud services using open industrial protocols. Bring data from across your factory into one platform to build custom low-code applications."
+      linkText: "See how FlowFuse connects your existing systems"
+      linkHref: "/use-cases/data-integration/"
+      image: "/images/industries/automotive/1-connect-systems.png"
+      imageAlt: "Screenshot of a FlowFuse application connecting manufacturing systems"
+      variant: "indigo"
+    - title: "Monitor Production in Real Time"
+      description: "Build production dashboards with low-code and AI assistance to monitor machine status, production counts, cycle time, OEE, alarms, and line performance using live data from your manufacturing systems."
+      linkText: "See what production monitoring looks like with FlowFuse"
+      linkHref: "/use-cases/production-monitoring/"
+      image: "/images/industries/automotive/2-monitor-production.png"
+      imageAlt: "Screenshot of a real-time production monitoring dashboard"
+      variant: "red"
+    - title: "Reduce Downtime with Live Visibility"
+      description: "Automatically detect stoppages, capture downtime events, analyze root causes, and understand where production time is being lost with applications built on live machine data."
+      linkText: "Read how to build a downtime logger"
+      linkHref: "/blog/2026/07/build-downtime-logger/"
+      image: "/images/industries/automotive/3-reduce-downtime.png"
+      imageAlt: "Screenshot of a live downtime tracking dashboard"
+      variant: "mixed"
+    - title: "Improve Quality with Complete Traceability"
+      description: "Trace every VIN and manufactured part through its complete production history, including torque values, weld parameters, barcode scans, batch records, and vision inspection results to accelerate investigations and improve quality."
+      linkText: "Read how to build a defect and quality monitoring dashboard"
+      linkHref: "/blog/2026/07/defect-and-quality-monitoring/"
+      image: "/images/industries/automotive/4-quality-traceability.png"
+      imageAlt: "Screenshot of a quality traceability application"
+      variant: "indigo"
+compliance:
+  description: "Automotive carries traceability requirements most industries don't. FlowFuse helps ensure the data an auditor asks for exists and is queryable when they ask for it."
+  items:
+    - title: "IATF 16949"
+      text: "Asks for ongoing process audits. FlowFuse captures layered process audit findings and corrective actions so evidence stays current between visits."
+      linkText: "Learn more about how FlowFuse supports layered process audits"
+      linkHref: "/blog/2026/08/layered-process-audit/"
+    - title: "VDA 6.3"
+      icon: "i-heroicons-clipboard-document-check"
+      text: "Asks for objective evidence that production matches documentation. FlowFuse connects machines, PLCs, and quality systems so that evidence is easy to retrieve."
+      linkText: "Learn more about how FlowFuse supports VDA 6.3 process audits"
+      linkHref: "/blog/2026/08/vda-6.3/"
+    - title: "Control Plans"
+      icon: "i-heroicons-document-chart-bar"
+      text: "Asks what to measure, how often, and how to react. FlowFuse links that plan to live measurement data instead of a manual cross-check."
+      linkText: "Learn more about how FlowFuse connects control plans to production data"
+      linkHref: "/blog/2026/08/control-plans/"
+    - title: "Recall defense"
+      icon: "i-heroicons-shield-check"
+      text: "FlowFuse traces a VIN back through every recorded step, fast."
+      linkText: "Learn more about how FlowFuse enables automotive traceability"
+      linkHref: "/blog/2026/08/automotive-traceability/"
+faqs:
+  - question: "How do I trace a VIN through body shop, paint, and assembly?"
+    answer: "FlowFuse allows you to collect data from each station, associate it with the relevant VIN as it's captured, and route it to the systems where that data is stored and used. This connects weld records, paint parameters, torque results, inspection outcomes, and other production data across the vehicle's journey, making it easier to build a complete production history."
+  - question: "Can FlowFuse get OEE from a line with mixed Siemens and Allen-Bradley PLCs?"
+    answer: "Yes. FlowFuse reads tag data from both S7 and EtherNet/IP-connected PLCs in the same flow, normalizes it, and calculates OEE metrics regardless of which controller brand runs which station."
+  - question: "What does IATF 16949 require for production data retention?"
+    answer: "IATF 16949 requires traceable records of process parameters, torque, weld, and inspection data, retained at a level of detail that supports root-cause investigation and audit. FlowFuse allows you to capture this data at the source, connect and process it, and route it to the systems where it can be stored and queried for quality, traceability, and audit needs."
+  - question: "How long does FlowFuse deployment take on one line versus twenty plants?"
+    answer: "Deployment time depends on the complexity of the application, the plant environment, and the systems being connected. Once a flow is built and validated, it can be reused and deployed across additional lines or plants rather than rebuilt from scratch each time, helping reduce the integration effort involved in scaling."
+  - question: "Can FlowFuse run air-gapped in a plant with no cloud connectivity?"
+    answer: "Yes. FlowFuse supports self-hosted, on-premises, and air-gapped deployments for manufacturing with strict network isolation requirements."
+  - question: "How is this FlowFuse different from adding a module to our existing MES?"
+    answer: "MES modules are built for standard workflows. FlowFuse handles the plant-specific gaps (custom quality gates, one-off traceability rules, non-standard handovers) that MES modules typically can't cover without a vendor change request."
+closingCta:
+  heading: "Bring your production challenge"
+  description: "Every automotive manufacturer has different operational challenges. FlowFuse lets you build the automotive manufacturing applications your teams need using the systems already running your plant."
diff --git a/nuxt/content/industries/industrial-machinery.yml b/nuxt/content/industries/industrial-machinery.yml
new file mode 100644
index 0000000000..79dc072c83
--- /dev/null
+++ b/nuxt/content/industries/industrial-machinery.yml
@@ -0,0 +1,108 @@
+# Content from the Industrial Machinery doc, the first section (through "<Insert closing
+# card used on the Automotive page>") — not the markdown-style repeat further down the
+# doc, which was an earlier iteration and is not used here.
+slug: industrial-machinery
+industryName: "Industrial Machinery"
+# Placeholder: no industrial-machinery-specific listing photo yet, reusing automotive's.
+listingImage: "/images/industries/automotive.jpg"
+listingImageAlt: "Aerial view of an automotive manufacturing plant floor"
+seoMeta:
+  title: "Industrial Machinery Monitoring Software"
+  description: "Connect CNC machines, PLCs, and legacy equipment you operate or build with FlowFuse. Monitor machines, trigger maintenance alerts, and error-proof production — no vendor gateway required."
+hero:
+  eyebrow: "Industrial Machinery Manufacturing"
+  eyebrowIcon: "cog-6-tooth"
+  heading: "<span class='text-red-600'>Connect new and aging machines</span> to a single platform"
+  description: "FlowFuse helps machinery, tooling, and precision component manufacturers monitor, automate, and standardize production across sites in real time."
+  quote:
+    text: "Without FlowFuse, I would be able to support maybe one production unit, but that's it. FlowFuse gives us the chance to deliver what the business asks us for while maintaining our small team size. It's not just about connecting machines, it's about creating the foundation that makes everything else possible."
+    author: "Felix Reck"
+    role: "IT Application Manager"
+    company: "Walter Tools (formerly)"
+    image: "/images/customer-headshots/felix-reck-walter-tools.png"
+    imageAlt: "Felix Reck"
+metricsBridge:
+  heading: "How Walter Tools scaled <span class='text-red-600'>machine connectivity</span>"
+  description: "Walter Tools uses FlowFuse to standardize machine connectivity across its production network. Its seven-person IT team manages more than 130 Node-RED instances across multiple locations, connecting machine data with manufacturing and business systems."
+  linkText: "See how Walter Tools scaled its industrial IoT operations"
+  linkHref: "/customer-stories/scaling-industrial-iot-operations-while-maintaining-competitive-edge/"
+metrics:
+  - number: "130+"
+    text: "Node-RED instances managed at Walter Tools"
+  - number: "7"
+    text: "People on Walter Tools' IT team"
+  - number: "5"
+    text: "Fragmented systems unified at Walter Tools"
+roi:
+  heading: "<span class='text-indigo-600'>Put a cost</span> on disconnected machine data"
+  description: "Machining centers, grinders, robots, SCADA, MES, and ERP already hold the data your teams need — they just don't talk to each other. When a machine stops, someone finds out only after checking a screen or calling another site, and every one of those handoffs costs engineering hours and idle spindle time. See what it's costing you below:"
+applications:
+  heading: "Applications for industrial machinery manufacturing"
+  description: "Operate CNC machines, presses, or conveyors in your own facilities? Build machinery for customers? See how FlowFuse supports machinery, tooling, and precision component manufacturers with connectivity, CNC machine monitoring, maintenance, and error-proofing — for equipment you run and equipment you sell."
+  items:
+    - title: "Connect Legacy Machines to Current Systems"
+      description: "No rip and replace. Connect CNC machining centers, grinders, EDM, presses, robots, PLCs, SCADA, historians, MES, and ERP using open industrial protocols — MTConnect, OPC UA, FOCAS, Modbus, EtherNet/IP, and Siemens S7. Normalize the tags so a mixed fleet reports the same numbers the same way and reuse one connectivity pattern at every plant instead of rebuilding per site."
+      linkText: "Explore manufacturing data integration"
+      linkHref: "/use-cases/data-integration/"
+      image: "/images/industries/automotive/1-connect-systems.png"
+      imageAlt: "Screenshot of a FlowFuse application connecting manufacturing systems"
+      variant: "indigo"
+    - title: "Bring Your Own AI to the Shop Floor"
+      description: "Use FlowFuse Expert, or connect the AI tool your company already approved — ChatGPT, Copilot, Claude, or another MCP-compatible client — directly to that same data, since FlowFuse can act as an MCP server. No policy exception needed to stand up an AI pilot on machine data."
+      linkText: "Read how to connect an industrial AI agent to FlowFuse"
+      linkHref: "/blog/2026/09/industrial-ai-agent/"
+      image: "/images/industries/industrial-machinery/bring-your-ai.png"
+      imageAlt: "Screenshot of an AI chat interface showing supported AI tool logos and a prompt to build an MCP server exposing CNC machine data"
+      variant: "red"
+    - title: "Act on Stops and Maintenance Signals Before They Cost You"
+      description: "Spindle load, vibration, temperature, and cycle counts already predict wear. Combine operating hours, condition signals, and maintenance rules to flag equipment that needs attention, and trigger alerts on what the machine is doing rather than a fixed interval. Record downtime duration and operator-entered reasons so teams can investigate recurring losses."
+      linkText: "Build a machine downtime tracking application"
+      linkHref: "/blog/2026/07/build-downtime-logger/"
+      image: "/images/industries/industrial-machinery/act-on-stops.png"
+      imageAlt: "Screenshot of a motor anomaly detection dashboard showing real-time vibration monitoring and a live camera view of the machine"
+      variant: "mixed"
+    - title: "Error-Proof Work Through Frequent Changeovers"
+      description: "Build poka-yoke workflows that check the scanned part, active job, and required process steps against approved instructions. Show operators what to do next, flag mismatches, and route exceptions before an incorrect setup or missed check moves downstream."
+      linkText: "Connect process requirements to measurement data"
+      linkHref: "/blog/2026/08/control-plans/"
+      image: "/images/industries/industrial-machinery/error-proof-work.png"
+      imageAlt: "Screenshot of a guided work instruction app showing a step-by-step fixture alignment checklist with a reference photo"
+      variant: "indigo"
+compliance:
+  description: "Supplying regulated customers means your own process gets audited too. FlowFuse helps you keep the data an auditor asks for queryable in one place. These are workflows FlowFuse supports, not a guarantee of regulatory compliance — certification and audit outcomes depend on your own program."
+  items:
+    - title: "ISO 9001"
+      text: "Asks you to find the cause of a nonconformity and prove the fix held. FlowFuse links corrective actions to the production data that triggered them, so the evidence is already there."
+      linkText: "Learn more about how FlowFuse supports CAPA workflows"
+      linkHref: "/blog/2026/09/capa-corrective-preventive-action/"
+    - title: "Run at Rate"
+      icon: "i-heroicons-chart-bar"
+      text: "Customers qualifying your tooling want a demonstrated rate, not a claimed one. FlowFuse records the run as it happens and reports the rate from machine data."
+      linkText: "Learn more about running a Run at Rate study"
+      linkHref: "/blog/2026/08/run-at-rate/"
+    - title: "IEC 62443 & NIS2"
+      icon: "i-heroicons-shield-check"
+      text: "Connecting machines widens the attack surface unless the connection layer is governed. FlowFuse adds role-based access, audit logging, and controlled deployment to OT integrations."
+      linkText: "Learn more about NIS2 and IEC 62443 for manufacturers"
+      linkHref: "/blog/2026/05/nis2-iec-62443-manufacturers/"
+    - title: "Gauge calibration"
+      icon: "i-heroicons-wrench-screwdriver"
+      text: "An out-of-calibration gauge invalidates every reading it took. FlowFuse tracks calibration status and due dates next to the measurements themselves."
+      linkText: "Learn more about building a calibration management dashboard"
+      linkHref: "/blog/2026/07/calibration-management-dashboard/"
+faqs:
+  - question: "Can FlowFuse read data from a mixed fleet of CNC machines?"
+    answer: "Yes. FlowFuse connects to machine tools over MTConnect, OPC UA, FOCAS, Modbus TCP and RTU, EtherNet/IP, and Siemens S7, and normalizes the tags in the flow. A Fanuc control and a Siemens control can feed the same utilization dashboard without a per-vendor gateway product."
+  - question: "Can older machines with no network interface be included?"
+    answer: "Yes. Machines that predate the plant network can be brought in over RS232 or RS485, or by wiring run, stop, and cycle-complete signals into an edge device running the FlowFuse Device Agent. That is often the fastest way to get honest utilization numbers from legacy equipment."
+  - question: "Can machine builders use FlowFuse in the equipment they sell?"
+    answer: "Yes. For OEMs, FlowFuse can support applications that become part of the equipment and service offering sold to customers. Build operator dashboards, diagnostics, and maintenance notifications on suitable edge hardware, then manage deployments centrally. With customer-authorized connectivity, service teams can receive machine context remotely. Discuss your intended distribution, hosting, and support model with FlowFuse to establish the appropriate commercial arrangement."
+  - question: "We are a small IT team supporting many machines. Does onboarding FlowFuse add headcount?"
+    answer: "No, it's the opposite problem FlowFuse is usually brought in to solve. Walter Tools' seven-person IT team scaled from a single production unit to more than 130 instances, because flows are built once, version controlled, and deployed to every site rather than rebuilt per machine."
+  - question: "Does FlowFuse predict machine failures?"
+    answer: "Not on its own. FlowFuse supports condition monitoring and rule-based maintenance alerts using available sensor data, operating hours, and equipment limits. True predictive maintenance requires additional models, suitable historical data, and validation for the equipment involved. Begin with signals your team can act on, and treat an observed threshold violation as a trigger for review, not a prediction of failure."
+  - question: "Can applications keep running without an internet connection?"
+    answer: "Yes, with limits. Applications deployed through the Device Agent can continue running locally if the connection to the FlowFuse management platform is lost. They still depend on the services used by each flow, so design buffering, reconnection, and cloud-dependent steps accordingly. Receiving new deployments requires a connection to the management platform; self-hosted options support isolated environments."
+closingCta:
+  heading: "Bring your production challenge"
+  description: "Every machinery and tooling manufacturer runs a different mix of machines, jobs, and customers. FlowFuse lets you build the applications your teams need using the systems already running your plant."
diff --git a/nuxt/content/use-cases/production-monitoring.yml b/nuxt/content/use-cases/production-monitoring.yml
index 2ae81d33da..f506bcd482 100644
--- a/nuxt/content/use-cases/production-monitoring.yml
+++ b/nuxt/content/use-cases/production-monitoring.yml
@@ -7,7 +7,7 @@ seoMeta:
   title: "Production Monitoring | Use Cases | FlowFuse"
   description: "Real-time visibility into what your production lines are actually doing. Build the monitoring app your operation needs with FlowFuse and Node-RED: connect any protocol, deploy at the edge or in the cloud, and roll out across sites."
 problem: "Your operation is running. You just can't see it clearly enough, until something breaks."
-industries: ["automotive", "food-beverage", "life-sciences", "aviation-aerospace", "aerospace-components", "renewables", "semiconductors", "electronics-appliances"]
+industries: ["automotive", "food-beverage", "life-sciences", "aviation-aerospace", "aerospace-components", "renewables", "semiconductors", "electronics-appliances", "industrial-machinery"]
 values: ["production-performance"]
 
 aiBuildLayer:
diff --git a/nuxt/content/use-cases/shop-floor-communication.yml b/nuxt/content/use-cases/shop-floor-communication.yml
index fe2c5308e8..936581bd6d 100644
--- a/nuxt/content/use-cases/shop-floor-communication.yml
+++ b/nuxt/content/use-cases/shop-floor-communication.yml
@@ -7,7 +7,7 @@ seoMeta:
   title: "Shop Floor Communication | Use Cases | FlowFuse"
   description: "Andon, alerts and escalations that reach the right people in seconds: from machine events to team channels, displays and phones. Built on Node-RED, managed with FlowFuse."
 problem: "The line stopped four minutes ago. The person who can fix it will find out when someone walks over."
-industries: ["automotive", "food-beverage", "aviation-aerospace", "electronics-appliances"]
+industries: ["automotive", "food-beverage", "aviation-aerospace", "electronics-appliances", "industrial-machinery"]
 values: ["labor-operational-efficiency"]
 architecture: "edge-connectivity"
 
diff --git a/nuxt/nuxt.config.ts b/nuxt/nuxt.config.ts
index 23156374c3..ce01e4b19b 100644
--- a/nuxt/nuxt.config.ts
+++ b/nuxt/nuxt.config.ts
@@ -520,6 +520,7 @@ export default defineNuxtConfig({
                     // or the route is missing from nuxt/dist and every link to it breaks.
                     '/ai',
                     '/industries/automotive',
+                    '/industries/industrial-machinery',
                     ...collectSlugRoutes(join(__dirname, 'content/industries-legacy'), '/industries'),
                     ...collectProductRoutes(join(__dirname, 'content/products')),
                     '/webinars/',
diff --git a/nuxt/pages/industries/[slug].vue b/nuxt/pages/industries/[slug].vue
index 894afb9e1a..5386c51d63 100644
--- a/nuxt/pages/industries/[slug].vue
+++ b/nuxt/pages/industries/[slug].vue
@@ -61,7 +61,7 @@ useSeoMeta({
 
     <IndustryUseCaseTiles :use-cases="page.useCases" />
 
-    <IndustryMatchingUseCases :slug="slug" :display-name="displayName" />
+    <IndustryPageUseCases :slug="slug" :display-name="displayName" />
 
     <div class="w-full py-12 px-6">
       <div class="max-w-screen-lg mx-auto">
diff --git a/nuxt/pages/industries/automotive.vue b/nuxt/pages/industries/automotive.vue
index b0114f9d1b..ed226d660f 100644
--- a/nuxt/pages/industries/automotive.vue
+++ b/nuxt/pages/industries/automotive.vue
@@ -1,359 +1,19 @@
 <script setup lang="ts">
-// Ported from src/industries/automotive.njk (11ty). The move to Nuxt is what lets this
-// page embed <RoiCalculator compact /> — a Vue component, so it cannot render inside
-// 11ty's Nunjucks output. src/industries/automotive.njk survives as a `permalink: false`
-// stub: it emits no HTML (nothing may shadow this route in nuxt/public/) but stays in the
-// `industry` collection so the card grid on /industries/, still 11ty, keeps its entry.
+// The first page built on the shared industry-page template (components/industry-page/).
+// Content lives in content/industries/automotive.yml; this file is only resolution.
 //
-// The "Not Every Production Challenge Requires a New Platform" section it replaced lives
-// on in the PROBLEM + ROI section below — reframed to hand off to the calculator. That
-// copy is deliberately page-local and not pushed down into RoiCalculator.vue, which is
-// shared with /pricing/ and /resources/roi-calculator/.
-useSeoMeta({
-    title: 'Automotive Manufacturing Applications',
-    description: 'Connect PLCs, SCADA, MES, and plant IT systems in one place. FlowFuse helps teams monitor, automate, and standardize production workflows across plants in real time.',
-    ogUrl: 'https://flowfuse.com/industries/automotive/',
-    twitterSite: '@FlowFuseinc',
-})
-
-const metrics = [
-    { number: '300+', text: 'Automotive applications built' },
-    { number: '120+', text: 'Plants or production lines running FlowFuse' },
-    { number: '40+', text: 'Industrial protocols and systems supported out of the box' },
-]
-
-const applications = [
-    {
-        title: 'Connect Your Existing Manufacturing Systems',
-        description: 'No rip and replace; instead, connect PLCs, robots, SCADA, historians, MES, ERP systems, databases, and cloud services using open industrial protocols. Bring data from across your factory into one platform to build custom low-code applications.',
-        linkText: 'See how FlowFuse connects your existing systems',
-        linkHref: '/use-cases/data-integration/',
-        image: '/images/industries/automotive/1-connect-systems.png',
-        imageAlt: 'Screenshot of a FlowFuse application connecting manufacturing systems',
-        variant: 'indigo',
-    },
-    {
-        title: 'Monitor Production in Real Time',
-        description: 'Build production dashboards with low-code and AI assistance to monitor machine status, production counts, cycle time, OEE, alarms, and line performance using live data from your manufacturing systems.',
-        linkText: 'See what production monitoring looks like with FlowFuse',
-        linkHref: '/use-cases/production-monitoring/',
-        image: '/images/industries/automotive/2-monitor-production.png',
-        imageAlt: 'Screenshot of a real-time production monitoring dashboard',
-        variant: 'red',
-    },
-    {
-        title: 'Reduce Downtime with Live Visibility',
-        description: 'Automatically detect stoppages, capture downtime events, analyze root causes, and understand where production time is being lost with applications built on live machine data.',
-        linkText: 'Read how to build a downtime logger',
-        linkHref: '/blog/2026/07/build-downtime-logger/',
-        image: '/images/industries/automotive/3-reduce-downtime.png',
-        imageAlt: 'Screenshot of a live downtime tracking dashboard',
-        variant: 'mixed',
-    },
-    {
-        title: 'Improve Quality with Complete Traceability',
-        description: 'Trace every VIN and manufactured part through its complete production history, including torque values, weld parameters, barcode scans, batch records, and vision inspection results to accelerate investigations and improve quality.',
-        linkText: 'Read how to build a defect and quality monitoring dashboard',
-        linkHref: '/blog/2026/07/defect-and-quality-monitoring/',
-        image: '/images/industries/automotive/4-quality-traceability.png',
-        imageAlt: 'Screenshot of a quality traceability application',
-        variant: 'indigo',
-    },
-]
-
-const VARIANTS: Record<string, { gradient: string, border: string, mobileGradient: string, mobileBorder: string }> = {
-    indigo: { gradient: 'from-indigo-400 via-indigo-300 to-indigo-100', border: 'border-indigo-300', mobileGradient: 'from-indigo-100 to-indigo-50', mobileBorder: 'border-indigo-200' },
-    red: { gradient: 'from-red-200 via-red-100 to-red-50', border: 'border-red-100', mobileGradient: 'from-red-50 to-white', mobileBorder: 'border-red-100' },
-    mixed: { gradient: 'from-red-200 to-indigo-100', border: 'border-indigo-100', mobileGradient: 'from-red-50 to-indigo-50', mobileBorder: 'border-indigo-100' },
+// Still its own static route rather than pages/industries/[slug].vue: Nuxt matches a
+// static filename ahead of a dynamic segment, so this and every future page built on this
+// template stay one file per industry rather than a second dynamic-route collection.
+const { data: page } = await useAsyncData('industry-page-automotive', () =>
+    queryCollection('industries').where('slug', '=', 'automotive').first()
+)
+
+if (!page.value) {
+    throw createError({ statusCode: 404, statusMessage: 'Industry not found' })
 }
-
-// Three of these are verbatim Heroicons outline glyphs, named for <UIcon>. IATF 16949's
-// is a FlowFuse-drawn mark with no Iconify equivalent, so that card falls through to
-// <IconsCertificateIcon> (the same inline SVG the 11ty page included) - hence the
-// missing `icon` key rather than an unused placeholder.
-interface ComplianceItem { title: string, text: string, linkText: string, linkHref: string, icon?: string }
-
-const compliance: ComplianceItem[] = [
-    {
-        title: 'IATF 16949',
-        text: 'Asks for ongoing process audits. FlowFuse captures layered process audit findings and corrective actions so evidence stays current between visits.',
-        linkText: 'Learn more about how FlowFuse supports layered process audits',
-        linkHref: '/blog/2026/08/layered-process-audit/',
-    },
-    {
-        title: 'VDA 6.3',
-        icon: 'i-heroicons-clipboard-document-check',
-        text: 'Asks for objective evidence that production matches documentation. FlowFuse connects machines, PLCs, and quality systems so that evidence is easy to retrieve.',
-        linkText: 'Learn more about how FlowFuse supports VDA 6.3 process audits',
-        linkHref: '/blog/2026/08/vda-6.3/',
-    },
-    {
-        title: 'Control Plans',
-        icon: 'i-heroicons-document-chart-bar',
-        text: 'Asks what to measure, how often, and how to react. FlowFuse links that plan to live measurement data instead of a manual cross-check.',
-        linkText: 'Learn more about how FlowFuse connects control plans to production data',
-        linkHref: '/blog/2026/08/control-plans/',
-    },
-    {
-        title: 'Recall defense',
-        icon: 'i-heroicons-shield-check',
-        text: 'FlowFuse traces a VIN back through every recorded step, fast.',
-        linkText: 'Learn more about how FlowFuse enables automotive traceability',
-        linkHref: '/blog/2026/08/automotive-traceability/',
-    },
-]
-
-// The 11ty original derived this grid from every use-case page whose `industries[]`
-// front matter contains "automotive" (src/_includes/components/industry-use-cases.njk).
-// Those pages are .njk and invisible to @nuxt/content, so the two that carry the tag are
-// listed here instead. Keep in sync with the `industries` front matter in src/use-cases/.
-const useCases = [
-    {
-        title: 'Production Monitoring',
-        problem: "Your operation is running. You just can't see it clearly enough, until something breaks.",
-        href: '/use-cases/production-monitoring/',
-    },
-    {
-        title: 'Shop Floor Communication',
-        problem: 'The line stopped four minutes ago. The person who can fix it will find out when someone walks over.',
-        href: '/use-cases/shop-floor-communication/',
-    },
-]
-
-const faqs = [
-    {
-        question: 'How do I trace a VIN through body shop, paint, and assembly?',
-        answer: "FlowFuse allows you to collect data from each station, associate it with the relevant VIN as it's captured, and route it to the systems where that data is stored and used. This connects weld records, paint parameters, torque results, inspection outcomes, and other production data across the vehicle's journey, making it easier to build a complete production history.",
-    },
-    {
-        question: 'Can FlowFuse get OEE from a line with mixed Siemens and Allen-Bradley PLCs?',
-        answer: 'Yes. FlowFuse reads tag data from both S7 and EtherNet/IP-connected PLCs in the same flow, normalizes it, and calculates OEE metrics regardless of which controller brand runs which station.',
-    },
-    {
-        question: 'What does IATF 16949 require for production data retention?',
-        answer: 'IATF 16949 requires traceable records of process parameters, torque, weld, and inspection data, retained at a level of detail that supports root-cause investigation and audit. FlowFuse allows you to capture this data at the source, connect and process it, and route it to the systems where it can be stored and queried for quality, traceability, and audit needs.',
-    },
-    {
-        question: 'How long does FlowFuse deployment take on one line versus twenty plants?',
-        answer: 'Deployment time depends on the complexity of the application, the plant environment, and the systems being connected. Once a flow is built and validated, it can be reused and deployed across additional lines or plants rather than rebuilt from scratch each time, helping reduce the integration effort involved in scaling.',
-    },
-    {
-        question: 'Can FlowFuse run air-gapped in a plant with no cloud connectivity?',
-        answer: 'Yes. FlowFuse supports self-hosted, on-premises, and air-gapped deployments for manufacturing with strict network isolation requirements.',
-    },
-    {
-        question: 'How is this FlowFuse different from adding a module to our existing MES?',
-        answer: "MES modules are built for standard workflows. FlowFuse handles the plant-specific gaps (custom quality gates, one-off traceability rules, non-standard handovers) that MES modules typically can't cover without a vendor change request.",
-    },
-]
-
-useSchemaOrg([
-    defineWebPage({ '@type': 'FAQPage' }),
-    ...faqs.map(item => defineQuestion(item)),
-])
 </script>
 
 <template>
-  <div class="w-full">
-
-    <!-- ============================================================
-         HERO
-    ============================================================ -->
-    <section class="w-full relative">
-      <div class="px-6 pt-16 md:pt-20">
-        <div class="max-w-screen-lg mx-auto grid md:grid-cols-2 gap-12 items-stretch">
-          <div class="max-md:text-center md:flex md:flex-col md:justify-center">
-            <div class="mb-4 max-md:flex max-md:justify-center">
-              <span class="inline-flex items-center gap-2 rounded-lg border border-gray-200 bg-gray-50 px-3 py-1.5 industry-eyebrow-icon text-gray-800">
-                <span class="w-5 h-5 inline-flex items-center shrink-0"><IconsCarIcon /></span>
-                <span class="font-medium">Automotive Manufacturing</span>
-              </span>
-            </div>
-            <h1 class="text-4xl md:text-5xl font-medium m-0">
-              <span class="text-red-600">Scale automotive operations</span> without rewiring your stack
-            </h1>
-            <p class="mt-6 text-gray-700">Connect PLCs, SCADA, MES, and plant IT systems in one place. FlowFuse helps teams monitor, automate, and standardize production workflows across plants in real time.</p>
-            <div class="mt-8 flex gap-4 items-center max-md:justify-center flex-wrap">
-              <CtaBookDemo variant="highlight" position="hero" />
-              <CtaPricing variant="ghost" position="hero" icon="i-lucide-arrow-right" />
-            </div>
-          </div>
-          <div class="w-full md:flex md:items-center">
-            <div class="relative w-full md:pt-6 max-md:mt-10">
-              <div class="relative rounded-lg border border-indigo-200 p-6 pt-28 bg-indigo-50/50">
-                <div class="absolute -top-14 left-1/2 -translate-x-1/2 md:left-8 md:translate-x-0 w-36 h-36 rounded-full bg-red-200 border-4 border-white shadow-lg overflow-hidden ff-image-cover">
-                  <img src="/images/industries/automotive/headshot-lidiya-shutaya-metaltec-and-pen.png" alt="Lidiya Shutaya" loading="eager">
-                </div>
-                <p class="italic text-gray-600 font-medium m-0">&ldquo;At PennEngineering, I built out the FlowFuse deployment from scratch: machine monitoring, machine dashboards, ERP integration. What FlowFuse gave us was revision control and a platform the whole team could own. That made the deployment self-sustaining.&rdquo;</p>
-                <p class="text-gray-500 text-right mt-4 mb-0">Lidiya Shutaya, Sr. Operational Technology System Architect, <span class="font-semibold text-gray-600">PennEngineering (formerly)</span></p>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="max-w-screen-lg mx-auto mt-16 text-center">
-          <div class="mx-auto text-center -mt-0.5 -mb-10">
-            <SocialProof eyebrow="30+ automotive manufacturers in 20 countries have run their operations on FlowFuse" />
-          </div>
-        </div>
-        <div class="max-w-md sm:max-w-screen-lg mx-auto mt-16 pb-10 bg-radial-red">
-          <div class="grid sm:grid-cols-3 gap-12 my-4 max-sm:w-full m-auto">
-            <div v-for="metric in metrics" :key="metric.number" class="w-full h-full rounded-lg bg-red-50/70 pb-3 px-6 pt-6">
-              <h3 class="text-5xl font-semibold text-red-400">{{ metric.number }}</h3>
-              <p class="mt-0 font-normal leading-6">{{ metric.text }}</p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </section>
-
-    <!-- ============================================================
-         THE PROBLEM, AND WHAT IT COSTS  (+ ROI CALCULATOR)
-    ============================================================ -->
-    <section class="w-full py-16 px-6 bg-white">
-      <div class="max-w-screen-lg mx-auto">
-        <div class="max-w-3xl max-md:mx-auto max-md:text-center">
-          <h2 class="text-gray-700 mb-4">Every Disconnected System Has a Price Tag</h2>
-          <p class="text-gray-600 m-0">PLCs, robots, SCADA, MES, historians, and cloud systems already hold the data your teams need; they just don't talk to each other. Closing that gap manually costs engineering hours spent searching and rebuilding, and production hours when something breaks with no quick solution. See what that's costing you below.</p>
-        </div>
-        <div class="mt-10">
-          <RoiCalculator compact />
-        </div>
-        <p class="text-center text-sm text-gray-500 mt-8">Want to tune every assumption and see the research behind it? <a href="/resources/roi-calculator/" class="text-indigo-600 font-semibold hover:underline">Open the full ROI calculator</a>.</p>
-      </div>
-    </section>
-
-    <!-- ============================================================
-         APPLICATIONS FOR AUTOMOTIVE MANUFACTURING
-    ============================================================ -->
-    <section class="w-full relative py-20 px-6 overflow-hidden">
-      <div class="absolute inset-x-0 top-0 h-[400px] md:h-[561px] solution-section-bg-flipped" aria-hidden="true" />
-      <div class="relative z-10">
-        <div class="max-w-screen-lg mx-auto max-md:text-center mb-28 md:mt-10">
-          <h2 class="text-indigo-600 text-4xl md:text-5xl">Applications for Automotive Manufacturing</h2>
-          <p class="text-gray-600 text-lgmd:text-2xl">See how FlowFuse supports automotive manufacturers with solutions for connectivity, production visibility, downtime reduction, and operational improvement.</p>
-        </div>
-
-        <div class="md:max-w-screen-lg mx-auto">
-          <div
-              v-for="(item, index) in applications"
-              :key="item.title"
-              class="max-md:text-center md:flex md:flex-row gap-8 items-center m-auto mb-14 md:mb-20"
-              :class="{ 'md:flex-row-reverse': index % 2 === 1 }"
-          >
-            <!-- Image (desktop): full-size screenshot offset over a colored panel -->
-            <div class="max-md:hidden md:w-[45%]">
-              <div class="relative aspect-[430/289]">
-                <div
-                    class="absolute -top-5 w-full h-full rounded-lg bg-gradient-to-tl"
-                    :class="[VARIANTS[item.variant].gradient, index % 2 === 0 ? '-left-5' : '-right-5']"
-                />
-                <div class="absolute inset-0 rounded-lg border-2 overflow-hidden ff-image-cover" :class="VARIANTS[item.variant].border">
-                  <img :src="item.image" :alt="item.imageAlt" loading="lazy">
-                </div>
-              </div>
-            </div>
-            <!-- Text -->
-            <div class="md:w-[55%] flex flex-col gap-3">
-              <h3 class="text-gray-700 text-3xl font-medium m-0">{{ item.title }}</h3>
-              <div class="md:hidden rounded-xl w-full bg-gradient-to-tl max-w-[500px] mx-auto my-4 p-4" :class="VARIANTS[item.variant].mobileGradient">
-                <div class="ff-image-rounded w-full border overflow-hidden" :class="VARIANTS[item.variant].mobileBorder">
-                  <img :src="item.image" :alt="item.imageAlt" loading="lazy">
-                </div>
-              </div>
-              <p class="text-gray-500 m-0">{{ item.description }}</p>
-              <a :href="item.linkHref" class="flex items-center gap-1.5 text-blue-600 hover:underline max-md:justify-center">
-                {{ item.linkText }}
-                <UIcon name="i-heroicons-arrow-long-right" class="w-6 h-6 shrink-0" />
-              </a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </section>
-
-    <!-- ============================================================
-         BUILT FOR ENTERPRISE MANUFACTURING
-    ============================================================ -->
-    <EnterpriseSecurity />
-
-    <!-- ============================================================
-         AUTOMOTIVE COMPLIANCE & STANDARDS
-    ============================================================ -->
-    <section class="w-full py-16 md:py-24 px-6 bg-radial-[ellipse_60%_70%_at_center_bottom] from-blue-200/30 to-blue-200/0">
-      <div class="max-w-screen-lg mx-auto">
-        <div class="max-w-2xl mb-12">
-          <h2 class="text-gray-700 mb-2">Automotive <span class="text-indigo-600">Compliance &amp; Standards</span></h2>
-          <p class="text-xl font-medium mt-0 mb-4">The Data Your Audit Asks For, In One Place</p>
-          <p class="text-gray-600">Automotive carries traceability requirements most industries don't. FlowFuse helps ensure the data an auditor asks for exists and is queryable when they ask for it.</p>
-        </div>
-        <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-5">
-          <a
-              v-for="item in compliance"
-              :key="item.title"
-              :href="item.linkHref"
-              class="group hover:no-underline flex flex-col gap-3 rounded-xl border border-gray-200 p-5 bg-white hover:border-indigo-300 hover:shadow-sm transition-all"
-          >
-            <div class="w-6 h-6 text-indigo-600">
-              <UIcon v-if="item.icon" :name="item.icon" class="size-6" />
-              <IconsCertificateIcon v-else />
-            </div>
-            <h3 class="m-0 text-lg font-medium text-gray-800 group-hover:text-indigo-600 transition-colors">{{ item.title }}</h3>
-            <p class="m-0 text-gray-600 text-sm flex-grow">{{ item.text }}</p>
-            <span class="mt-2 text-blue-600 text-sm flex items-center gap-1.5 group-hover:underline">
-              {{ item.linkText }}
-              <UIcon name="i-heroicons-arrow-long-right" class="w-6 h-6 shrink-0" />
-            </span>
-          </a>
-        </div>
-      </div>
-    </section>
-
-    <!-- ============================================================
-         USE CASES FOR THIS INDUSTRY
-    ============================================================ -->
-    <div class="w-full py-16 sm:py-24 px-6 bg-gray-50 border-y border-gray-100">
-      <div class="max-w-screen-lg mx-auto">
-        <h2 class="max-md:text-center">Use cases in <span class="text-indigo-600">Automotive</span></h2>
-        <p class="mt-4 max-w-3xl text-gray-600">Operational workflow patterns teams in this industry build and own with FlowFuse.</p>
-        <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6 mt-10">
-          <a
-              v-for="useCase in useCases"
-              :key="useCase.href"
-              :href="useCase.href"
-              class="group hover:no-underline flex flex-col gap-3 rounded-xl border border-gray-200 p-6 bg-white hover:border-indigo-300 hover:shadow-sm transition-all"
-          >
-            <h3 class="m-0 text-gray-800 group-hover:text-indigo-600 transition-colors">{{ useCase.title }}</h3>
-            <p class="m-0 text-gray-600 text-sm flex-grow">{{ useCase.problem }}</p>
-            <span class="mt-2 text-blue-600 text-sm flex items-center gap-1.5 group-hover:underline">
-              View use case
-              <UIcon name="i-heroicons-arrow-long-right" class="w-6 h-6 shrink-0" />
-            </span>
-          </a>
-        </div>
-      </div>
-    </div>
-
-    <!-- ============================================================
-         FAQ
-    ============================================================ -->
-    <div class="w-full px-6 pt-20 pb-10">
-      <div class="max-w-screen-lg mx-auto">
-        <h2 class="mb-1 text-center md:text-left">Frequently Asked <span class="text-indigo-600">Questions</span></h2>
-        <BlogFaq :faq="faqs" />
-      </div>
-    </div>
-
-    <!-- ============================================================
-         CTA
-    ============================================================ -->
-    <div class="w-full px-6 pb-20">
-      <div class="max-w-screen-lg mx-auto">
-        <div class="rounded-xl px-9 py-12 flex flex-col items-center gap-8 text-center ff-get-started-bg">
-          <p class="text-white text-5xl font-medium m-0">Bring your production challenge</p>
-          <p class="text-indigo-50 font-light text-xl max-w-2xl m-0">Every automotive manufacturer has different operational challenges. FlowFuse lets you build the automotive manufacturing applications your teams need using the systems already running your plant.</p>
-          <CtaBookDemo variant="highlight" position="final-cta" />
-        </div>
-      </div>
-    </div>
-  </div>
+  <IndustryPageTemplate v-if="page" :page="page" />
 </template>
diff --git a/nuxt/pages/industries/index.vue b/nuxt/pages/industries/index.vue
index 8877b7daee..898c58f58f 100644
--- a/nuxt/pages/industries/index.vue
+++ b/nuxt/pages/industries/index.vue
@@ -3,24 +3,17 @@
 // classes from src/css/style.css.
 //
 // What the port changes on purpose:
-//  - collections["industry"] becomes the `industries` data collection plus the one
-//    hand-written page. src/industries/industries.json tagged every file in that
-//    directory, so automotive.njk was on the listing too even though it used its own
-//    layout; AUTOMOTIVE below keeps it there.
+//  - collections["industry"] becomes two data collections merged into one card grid:
+//    industriesLegacy (the seven restored pages, transitional) and industries (the
+//    automotive-page template, starting with automotive itself and industrial-machinery).
+//    Once industriesLegacy is retired this page only needs the second query.
 //  - The CTA macros become <CtaContactUs> and <CtaSignUp>.
-const { data: industries } = await useAsyncData('industries-listing', () =>
+const { data: legacyIndustries } = await useAsyncData('industries-legacy-listing', () =>
     queryCollection('industriesLegacy').select('slug', 'seoMeta', 'hero').all()
 )
-
-// /industries/automotive/ is a hand-written page, not a collection entry, so its card
-// copy is declared here. It reads from the same fields the collection cards use.
-const AUTOMOTIVE = {
-    slug: 'automotive',
-    title: 'Automotive Manufacturing Applications | FlowFuse',
-    description: 'Connect PLCs, SCADA, MES, and plant IT systems in one place. FlowFuse helps teams monitor, automate, and standardize production workflows across plants in real time.',
-    image: '/images/industries/automotive.jpg',
-    imageAlt: 'Aerial view of an automotive manufacturing plant floor',
-}
+const { data: templateIndustries } = await useAsyncData('industries-listing', () =>
+    queryCollection('industries').select('slug', 'seoMeta', 'listingImage', 'listingImageAlt').all()
+)
 
 // The .njk stripped the brand suffix off meta.title for the card heading.
 function cardTitle(title: string) {
@@ -28,15 +21,22 @@ function cardTitle(title: string) {
 }
 
 const cards = computed(() => {
-    const fromCollection = (industries.value || []).map(industry => ({
+    const fromLegacy = (legacyIndustries.value || []).map(industry => ({
         slug: industry.slug,
         title: industry.seoMeta.title,
         description: industry.seoMeta.description,
         image: industry.hero?.image,
         imageAlt: industry.hero?.imageAlt,
     }))
+    const fromTemplate = (templateIndustries.value || []).map(industry => ({
+        slug: industry.slug,
+        title: industry.seoMeta.title,
+        description: industry.seoMeta.description,
+        image: industry.listingImage,
+        imageAlt: industry.listingImageAlt,
+    }))
     // `| sort(false, true, "data.meta.title")`: case-insensitive, ascending.
-    return [...fromCollection, AUTOMOTIVE]
+    return [...fromLegacy, ...fromTemplate]
         .sort((a, b) => a.title.toLowerCase().localeCompare(b.title.toLowerCase(), 'en'))
 })
 
diff --git a/nuxt/pages/industries/industrial-machinery.vue b/nuxt/pages/industries/industrial-machinery.vue
new file mode 100644
index 0000000000..97ab22d046
--- /dev/null
+++ b/nuxt/pages/industries/industrial-machinery.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+// Second page built on the shared industry-page template (components/industry-page/),
+// same shape as automotive.vue. Content lives in content/industries/industrial-machinery.yml.
+const { data: page } = await useAsyncData('industry-page-industrial-machinery', () =>
+    queryCollection('industries').where('slug', '=', 'industrial-machinery').first()
+)
+
+if (!page.value) {
+    throw createError({ statusCode: 404, statusMessage: 'Industry not found' })
+}
+</script>
+
+<template>
+  <IndustryPageTemplate v-if="page" :page="page" />
+</template>
diff --git a/nuxt/public/images/customer-headshots/felix-reck-walter-tools.png b/nuxt/public/images/customer-headshots/felix-reck-walter-tools.png
new file mode 100644
index 0000000000..204f153652
Binary files /dev/null and b/nuxt/public/images/customer-headshots/felix-reck-walter-tools.png differ
diff --git a/nuxt/public/images/industries/industrial-machinery/act-on-stops.png b/nuxt/public/images/industries/industrial-machinery/act-on-stops.png
new file mode 100644
index 0000000000..98c0adc410
Binary files /dev/null and b/nuxt/public/images/industries/industrial-machinery/act-on-stops.png differ
diff --git a/nuxt/public/images/industries/industrial-machinery/bring-your-ai.png b/nuxt/public/images/industries/industrial-machinery/bring-your-ai.png
new file mode 100644
index 0000000000..91e4fc7bab
Binary files /dev/null and b/nuxt/public/images/industries/industrial-machinery/bring-your-ai.png differ
diff --git a/nuxt/public/images/industries/industrial-machinery/error-proof-work.png b/nuxt/public/images/industries/industrial-machinery/error-proof-work.png
new file mode 100644
index 0000000000..cf03dd574e
Binary files /dev/null and b/nuxt/public/images/industries/industrial-machinery/error-proof-work.png differ
diff --git a/src/_data/chrome.json b/src/_data/chrome.json
index 42c0b044ca..ef7ce36ed0 100644
--- a/src/_data/chrome.json
+++ b/src/_data/chrome.json
@@ -134,13 +134,18 @@
                     {
                         "title": "By Industry",
                         "titleGrid": "xl:col-start-2 xl:row-start-1",
-                        "listClasses": "row-span-[2] xl:col-start-2 xl:row-start-2",
+                        "listClasses": "row-span-[3] xl:col-start-2 xl:row-start-2",
                         "links": [
                             {
                                 "label": "Automotive",
                                 "href": "/industries/automotive/",
                                 "icon": "car"
                             },
+                            {
+                                "label": "Industrial Machinery",
+                                "href": "/industries/industrial-machinery/",
+                                "icon": "cog-6-tooth"
+                            },
                             {
                                 "label": "See all industries",
                                 "href": "/industries/",
@@ -481,6 +486,10 @@
                                 "label": "Automotive",
                                 "href": "/industries/automotive/"
                             },
+                            {
+                                "label": "Industrial Machinery",
+                                "href": "/industries/industrial-machinery/"
+                            },
                             {
                                 "label": "See all industries",
                                 "href": "/industries/"