diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
index ad8f9d2..318050e 100644
--- a/src/pages/HomePage/sections/Hero.tsx
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -1,29 +1,19 @@
-// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
-// file as the canonical source for the "hero" section.
+// Created by add_section_from_catalog (HeroBillboard).
 
 import React from 'react';
 import HeroBillboard from '@/components/sections/hero/HeroBillboard';
-import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
 
 export default function HeroSection(): React.JSX.Element {
   return (
-    <div id="hero" data-section="hero">
-        <SectionErrorBoundary name="hero">
-              <HeroBillboard
-        tag="PREMIUM HOME & GARDEN SERVICES"
+    <div data-webild-section="hero" id="hero">
+      <HeroBillboard
         title="NA Maintenance"
-        description="Quality you can see — results that last. Proudly servicing the Brisbane area."
-        primaryButton={{
-            text: "Get a Quote",
-            href: "#contact",
-          }}
-        secondaryButton={{
-            text: "Our Services",
-            href: "#services",
-          }}
         imageSrc="https://storage.googleapis.com/webild/users/user_3CW6pk8xM4aynzUXG3oyWQAp0l3/uploaded-1782117653888-694shgr4.png?_wi=1"
+        description="Quality you can see — results that last. Proudly servicing the Brisbane area."
+        secondaryButton={{"href":"#services","text":"Our Services"}}
+        tag="PREMIUM HOME & GARDEN SERVICES"
+        primaryButton={{"text":"Get a Quote","href":"#contact"}}
       />
-        </SectionErrorBoundary>
-      </div>
+    </div>
   );
 }
diff --git a/src/pages/HomePage/sections/Services.tsx b/src/pages/HomePage/sections/Services.tsx
index c903f2d..94d4ae9 100644
--- a/src/pages/HomePage/sections/Services.tsx
+++ b/src/pages/HomePage/sections/Services.tsx
@@ -1,58 +1,17 @@
-// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
-// file as the canonical source for the "services" section.
+// Created by add_section_from_catalog (FeaturesTaggedCards).
 
 import React from 'react';
-import FeaturesMediaCarousel from '@/components/sections/features/FeaturesMediaCarousel';
-import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+import FeaturesTaggedCards from '@/components/sections/features/FeaturesTaggedCards';
 
 export default function ServicesSection(): React.JSX.Element {
   return (
-    <div id="services" data-section="services">
-        <SectionErrorBoundary name="services">
-              <FeaturesMediaCarousel
-          tag="What We Do"
-          title="Our Expert Services"
-          description="Comprehensive maintenance solutions for your property in Brisbane."
-          items={[
-            {
-              title: "Pressure Washing",
-              description: "Revitalize your surfaces, driveways, and fences with our high-pressure cleaning technology.",
-              buttonIcon: "Droplets",
-              imageSrc: "https://storage.googleapis.com/webild/users/user_3CW6pk8xM4aynzUXG3oyWQAp0l3/uploaded-1782117653888-694shgr4.png?_wi=2",
-            },
-            {
-              title: "Lawn Care",
-              description: "Professional mowing, edging, and lawn health maintenance to keep your grass lush and green.",
-              buttonIcon: "Scissors",
-              imageSrc: "http://img.b2bpic.net/free-photo/kids-learnign-about-environment_23-2149176587.jpg?_wi=1",
-            },
-            {
-              title: "Landscaping",
-              description: "Complete garden redesign, garden bed maintenance, and overall property beautification services.",
-              buttonIcon: "Leaf",
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-smiley-people-greenhouse_23-2149098326.jpg?_wi=1",
-            },
-            {
-              title: "Gutter Cleaning",
-              description: "Safely clear your gutters to prevent blockages and water damage to your property roof.",
-              buttonIcon: "Wind",
-              imageSrc: "http://img.b2bpic.net/free-photo/tired-man-cleaning-window_23-2148521053.jpg?_wi=1",
-            },
-            {
-              title: "Window Cleaning",
-              description: "Streak-free cleaning for your residential windows, letting in natural light and clarity.",
-              buttonIcon: "Sun",
-              imageSrc: "http://img.b2bpic.net/free-photo/people-working-tech-brand-together_23-2150966128.jpg?_wi=1",
-            },
-            {
-              title: "Deck Restoration",
-              description: "Protect and enhance your timber decks with professional sanding and sealing services.",
-              buttonIcon: "Hammer",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-servant-caring-garden_23-2149530842.jpg?_wi=1",
-            },
-          ]}
-        />
-        </SectionErrorBoundary>
-      </div>
+    <div data-webild-section="services" id="services">
+      <FeaturesTaggedCards
+        title="Our Expert Services"
+        tag="What We Do"
+        items={[{"description":"Complete garden redesign, garden bed maintenance, and overall property beautification services.","primaryButton":{"text":"View Landscaping","href":"/landscaping"},"title":"Landscaping","imageSrc":"http://img.b2bpic.net/free-photo/close-up-smiley-people-greenhouse_23-2149098326.jpg?_wi=1","tag":"Service"},{"title":"Lawn Care","primaryButton":{"text":"View Lawn Care","href":"/lawn-care"},"description":"Professional mowing, edging, and lawn health maintenance to keep your grass lush and green.","tag":"Service","imageSrc":"http://img.b2bpic.net/free-photo/kids-learnign-about-environment_23-2149176587.jpg?_wi=1"},{"description":"Revitalize your surfaces, driveways, and fences with our high-pressure cleaning technology.","primaryButton":{"href":"/pressure-washing","text":"View Pressure Washing"},"title":"Pressure Washing","imageSrc":"http://img.b2bpic.net/free-photo/tired-man-cleaning-window_23-2148521053.jpg?_wi=1","tag":"Service"}]}
+        description="Comprehensive maintenance solutions for your property in Brisbane."
+      />
+    </div>
   );
 }