diff --git a/src/lib/compatibility-meta.json b/src/lib/compatibility-meta.json
index 6b0c7279..bd60269f 100644
--- a/src/lib/compatibility-meta.json
+++ b/src/lib/compatibility-meta.json
@@ -1,3 +1,3 @@
 {
-  "last_updated": "June 13, 2026"
+  "last_updated": "June 21, 2026"
 }
\ No newline at end of file
diff --git a/src/lib/utils/harnesses.js b/src/lib/utils/harnesses.js
index ab8091a3..d367c649 100644
--- a/src/lib/utils/harnesses.js
+++ b/src/lib/utils/harnesses.js
@@ -44,6 +44,7 @@ async function initializeHarnesses() {
         backordered: harness?.backordered,  // these overrides are only shown if the harness is out of stock in Shopify
         setupNotes: model.setup_notes,
         setupVideo: model.setup_video,
+        requiresCommaPower: model.requires_comma_power === true,
       };
     }).filter(Boolean);
   });
diff --git a/src/lib/vehicles.json b/src/lib/vehicles.json
index 383a7646..842e54c6 100644
--- a/src/lib/vehicles.json
+++ b/src/lib/vehicles.json
@@ -3336,7 +3336,9 @@
       "footnotes": [
       ],
       "setup_notes": [
-      ]
+        "Mazda vehicles \u003cb\u003erequire\u003c/b\u003e comma power installation."
+      ],
+      "requires_comma_power": true
     },
     {
       "name": "Mazda CX-9 2021-23",
@@ -3351,7 +3353,9 @@
       "footnotes": [
       ],
       "setup_notes": [
-      ]
+        "Mazda vehicles \u003cb\u003erequire\u003c/b\u003e comma power installation."
+      ],
+      "requires_comma_power": true
     }
   ],
   "Nissan": [
diff --git a/src/routes/setup/+page.svelte b/src/routes/setup/+page.svelte
index 65084b91..ed95970c 100644
--- a/src/routes/setup/+page.svelte
+++ b/src/routes/setup/+page.svelte
@@ -38,6 +38,8 @@
   const handleHarnessSelection = (value) => {
     selectedVehicle = value;
   }
+  $: requiresCommaPower = selectedVehicle?.requiresCommaPower === true;
+  $: totalSteps = requiresCommaPower ? 6 : 5;
 
   function getVideoEmbedSrc(videoLink) {
     const url = new URL(videoLink);
@@ -71,7 +73,7 @@
           <div class="overview">
             <div>
               {@html RecordingsIcon}
-              <span>5 steps</span>
+              <span>{totalSteps} steps</span>
             </div>
             <div class="divider" />
             <div>
@@ -173,7 +175,7 @@
     </div>
 
         <div class="step" id="step-1">
-      <Badge style="dark">Step 1 <span class="muted">of 5</span></Badge>
+      <Badge style="dark">Step 1 <span class="muted">of {totalSteps}</span></Badge>
       <h2>Remove the rearview mirror cover trim</h2>
       <Grid templateColumns="0.875fr 0.75fr">
         <div class="image-grid">
@@ -192,7 +194,7 @@
     </div>
     <hr />
     <div class="step" id="step-2">
-      <Badge style="dark">Step 2 <span class="muted">of 5</span></Badge>
+      <Badge style="dark">Step 2 <span class="muted">of {totalSteps}</span></Badge>
       <h2>Connect car harness into the camera</h2>
       <Grid templateColumns="0.875fr 0.75fr">
         <div class="image-grid">
@@ -213,7 +215,7 @@
     </div>
     <hr />
     <div class="step" id="step-3">
-      <Badge style="dark">Step 3 <span class="muted">of 5</span></Badge>
+      <Badge style="dark">Step 3 <span class="muted">of {totalSteps}</span></Badge>
       <h2>Place mount high and centered on the windshield</h2>
       <Grid templateColumns="0.875fr 0.75fr">
         <div class="image-grid">
@@ -235,7 +237,7 @@
     </div>
     <hr />
     <div class="step" id="step-4">
-      <Badge style="dark">Step 4 <span class="muted">of 5</span></Badge>
+      <Badge style="dark">Step 4 <span class="muted">of {totalSteps}</span></Badge>
       <h2>Plug in OBD-C and mount the device</h2>
       <Grid templateColumns="0.875fr 0.75fr">
         <div class="image-grid">
@@ -252,7 +254,7 @@
     </div>
     <hr />
     <div class="step" id="step-5">
-      <Badge style="dark">Step 5 <span class="muted">of 5</span></Badge>
+      <Badge style="dark">Step 5 <span class="muted">of {totalSteps}</span></Badge>
       <h2>Reinstall the rearview mirror cover trim</h2>
       <Grid templateColumns="0.875fr 0.75fr">
         <div class="image-grid">
@@ -269,44 +271,54 @@
     </div>
 
     <hr />
-    <div class="step">
-      <Badge style="dark">OPTIONAL STEP</Badge>
-      <h2>Pair your device with comma connect</h2>
+    <div class="step" id="comma-power-step">
+      <Badge style="dark">
+        {#if requiresCommaPower}
+          Step 6 <span class="muted">of {totalSteps}</span>
+        {:else}
+          OPTIONAL STEP
+        {/if}
+      </Badge>
+      <h2>Add the comma power</h2>
       <Grid templateColumns="0.875fr 0.75fr">
         <div>
-          <img src={StepSixImage} loading="lazy" alt="comma connect application logo" />
+          <img src={CommaPowerImage} loading="lazy" alt="comma power" />
         </div>
         <div>
           <p>
-            Pair your comma four with <a href="https://connect.comma.ai/" target="_blank" class="highlight">connect.comma.ai</a> on your phone to see your recorded drives.
+            {#if requiresCommaPower}
+              Installing comma power is required for this vehicle.
+            {:else}
+              Installing the comma power is entirely optional and can be done at any time.
+            {/if}
+            Simply connect one end to your car's OBD-II port and the other to the harness box.
           </p>
-          <br />
-          <LinkButton href="https://connect.comma.ai/" target="_blank" style="primary" fullWidth={true}>comma Connect</LinkButton>
+          <p>
+            With a comma power:
+          </p>
+          <ul>
+            <li>The start and end of every drive are recorded.</li>
+            <li>Your comma four remains powered and online while the car is off.</li>
+            <li>Your comma four downloads updates while the car is off.</li>
+          </ul>
         </div>
       </Grid>
     </div>
 
     <hr />
-    <div class="step">
+    <div class="step" id="comma-connect-step">
       <Badge style="dark">OPTIONAL STEP</Badge>
-      <h2>Add the comma power</h2>
+      <h2>Pair your device with comma connect</h2>
       <Grid templateColumns="0.875fr 0.75fr">
         <div>
-          <img src={CommaPowerImage} loading="lazy" alt="comma power" />
+          <img src={StepSixImage} loading="lazy" alt="comma connect application logo" />
         </div>
         <div>
           <p>
-            Installing the comma power is entirely optional and can be done at any time.
-            Simply connect one end to your car's OBD-II port and the other to the harness box.
-          </p>
-          <p>
-            With a comma power:
+            Pair your comma four with <a href="https://connect.comma.ai/" target="_blank" class="highlight">connect.comma.ai</a> on your phone to see your recorded drives.
           </p>
-          <ul>
-            <li>The start and end of every drive are recorded.</li>
-            <li>Your comma four remains powered and online while the car is off.</li>
-            <li>Your comma four downloads updates while the car is off.</li>
-          </ul>
+          <br />
+          <LinkButton href="https://connect.comma.ai/" target="_blank" style="primary" fullWidth={true}>comma Connect</LinkButton>
         </div>
       </Grid>
     </div>
diff --git a/templates/vehicles_template.json b/templates/vehicles_template.json
index a2b385b5..e015eee9 100644
--- a/templates/vehicles_template.json
+++ b/templates/vehicles_template.json
@@ -22,7 +22,8 @@
         {% for footnote in car.footnotes if footnote.value.setup_note %}
         {{ footnote.value.text | tojson }}{{ "" if loop.last else "," }}
         {% endfor %}
-      ]
+      ]{% if car.requires_comma_power %},
+      "requires_comma_power": true{% endif +%}
     }{{ "" if loop.last else "," }}
     {% endfor %}
   ]{{ "" if loop.last else "," }}