diff --git a/public/svgs/chip.svg b/public/svgs/chip.svg
new file mode 100644
index 0000000..d3f15d9
--- /dev/null
+++ b/public/svgs/chip.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-cpu"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M5 6a1 1 0 0 1 1 -1h12a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-12a1 1 0 0 1 -1 -1l0 -12" /><path d="M9 9h6v6h-6l0 -6" /><path d="M3 10h2" /><path d="M3 14h2" /><path d="M10 3v2" /><path d="M14 3v2" /><path d="M21 10h-2" /><path d="M21 14h-2" /><path d="M14 21v-2" /><path d="M10 21v-2" /></svg>
\ No newline at end of file
diff --git a/public/svgs/zwave.svg b/public/svgs/zwave.svg
new file mode 100644
index 0000000..60969e7
--- /dev/null
+++ b/public/svgs/zwave.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-access-point"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M12 12l0 .01" /><path d="M14.828 9.172a4 4 0 0 1 0 5.656" /><path d="M17.657 6.343a8 8 0 0 1 0 11.314" /><path d="M9.168 14.828a4 4 0 0 1 0 -5.656" /><path d="M6.337 17.657a8 8 0 0 1 0 -11.314" /></svg>
\ No newline at end of file
diff --git a/src-11ty/_includes/install.html b/src-11ty/_includes/install.html
index 37a50c9..1544a78 100644
--- a/src-11ty/_includes/install.html
+++ b/src-11ty/_includes/install.html
@@ -128,6 +128,8 @@
 
   .installer-card install-esphome-firmware,
   .installer-card install-esp-bridge-firmware,
+  .installer-card install-firmware,
+  .installer-card configure-zwa2,
   .installer-card recover-adapter {
     width: 100%;
     border: none;
@@ -137,6 +139,8 @@
 
   install-esphome-firmware .min-h-screen,
   install-esp-bridge-firmware .min-h-screen,
+  install-firmware .min-h-screen,
+  configure-zwa2 .min-h-screen,
   recover-adapter .min-h-screen {
     min-height: auto !important;
   }
diff --git a/src-11ty/_includes/product-overview.html b/src-11ty/_includes/product-overview.html
index 65f090c..0b4bf9b 100644
--- a/src-11ty/_includes/product-overview.html
+++ b/src-11ty/_includes/product-overview.html
@@ -20,6 +20,9 @@ <h1 class="details-hero-title">{{ productTitle }}</h1>
 
       <div class="details-actions">
         {%- for action in actions %}
+        {% if action.section_header %}
+          <div class="action-section-header">{{ action.section_header }}</div>
+        {% endif %}
         {% set external = action.href.startsWith('http') %}
         {% if action.tag_open %}
           {{ action.tag_open | safe }}
diff --git a/src-11ty/home-assistant-connect-zbt-2/index.md b/src-11ty/home-assistant-connect-zbt-2/index.md
index 7d82f69..ffb20c5 100644
--- a/src-11ty/home-assistant-connect-zbt-2/index.md
+++ b/src-11ty/home-assistant-connect-zbt-2/index.md
@@ -9,7 +9,7 @@ productSubtitle: Zigbee 3.0 & Thread USB adapter
 
 actions:
   - title: Install firmware
-    description: Update your ZBT-2 with the latest Zigbee or Thread firmware
+    description: Update your ZBT-2 with the latest Zigbee, Zigbee Repeater or Thread firmware
     href: /home-assistant-connect-zbt-2/install
     icon: /svgs/install.svg
 
diff --git a/src-11ty/home-assistant-connect-zbt-2/install.njk b/src-11ty/home-assistant-connect-zbt-2/install.njk
index 34cdba1..7775488 100644
--- a/src-11ty/home-assistant-connect-zbt-2/install.njk
+++ b/src-11ty/home-assistant-connect-zbt-2/install.njk
@@ -1,7 +1,7 @@
 ---
 layout: install.html
 title: Install Firmware
-subtitle: Update your ZBT-2 with the latest Zigbee or Thread firmware
+subtitle: Update your ZBT-2 with the latest Zigbee, Zigbee Repeater or Thread firmware
 description: Install the latest Zigbee or Thread firmware on your ZBT-2
 backHref: /home-assistant-connect-zbt-2/
 hero: |
diff --git a/src-11ty/home-assistant-connect-zwa-2/configure-zwa2.njk b/src-11ty/home-assistant-connect-zwa-2/configure-zwa2.njk
new file mode 100644
index 0000000..feb4a59
--- /dev/null
+++ b/src-11ty/home-assistant-connect-zwa-2/configure-zwa2.njk
@@ -0,0 +1,19 @@
+---
+layout: install.html
+title: Configure ZWA-2
+subtitle: Change region, view DSK and QR code
+description: Configure your Home Assistant Connect ZWA-2
+backHref: /home-assistant-connect-zwa-2/
+hero: |
+  <p>
+    Configure an existing ZWA-2 adapter. Change the Z-Wave region, view the DSK, and display the QR code for SmartStart inclusion.
+  </p>
+---
+
+<div class="installer-wrapper">
+  <div class="installer-card">
+    <configure-zwa2></configure-zwa2>
+  </div>
+</div>
+
+<script type="module" src="https://home-assistant.github.io/zwa2-toolbox/standalone/configure-zwa2.js"></script>
diff --git a/src-11ty/home-assistant-connect-zwa-2/index.md b/src-11ty/home-assistant-connect-zwa-2/index.md
index 6e03f00..fb81e0d 100644
--- a/src-11ty/home-assistant-connect-zwa-2/index.md
+++ b/src-11ty/home-assistant-connect-zwa-2/index.md
@@ -8,23 +8,48 @@ productTitle: Home Assistant Connect ZWA-2
 productSubtitle: The ultimate way to connect Z-Wave devices to Home Assistant.
 
 actions:
-  - title: Install original firmware
+  - title: Install original USB bridge firmware
+    section_header: ESP firmware
     description: The original firmware that allows to connect the ZWA-2 directly to Home Assistant hub via USB cable.
     href: /home-assistant-connect-zwa-2/install
-    icon: /svgs/install.svg
+    icon: /svgs/chip.svg
 
   - title: Install portable Z-Wave firmware
     description: Place the ZWA-2 in the most optimal position and connect it to Home Assistant via Wi-Fi.
     href: /home-assistant-connect-zwa-2/install-portable
-    icon: /svgs/install.svg
+    icon: /svgs/chip.svg
     experimental: true
 
   - title: Use Portable Z-Wave with Power-over-Ethernet
     description: Place the ZWA-2 in the most optimal position and connect it to Home Assistant via Power-over-Ethernet.
     href: /home-assistant-connect-zwa-2/use-poe
-    icon: /svgs/install.svg
+    icon: /svgs/chip.svg
     experimental: true
 
+  - title: Install Z-Wave controller firmware
+    section_header: Z-Wave firmware
+    description: Restore the original Z-Wave controller firmware after using the repeater or Zniffer firmware.
+    href: /home-assistant-connect-zwa-2/install-controller
+    icon: /svgs/zwave.svg
+
+  - title: Install Z-Wave repeater firmware
+    description: This firmware turns ZWA-2 into a standalone Z-Wave device, which can help strengthen an existing Z-Wave network.
+    href: /home-assistant-connect-zwa-2/install-repeater
+    icon: /svgs/zwave.svg
+    experimental: true
+
+  - title: Install Z-Wave Zniffer firmware
+    description: This is a development firmware that can be used to inspect packets, decode traffic, send commands, gather statistics, and more.
+    href: /home-assistant-connect-zwa-2/install-zniffer
+    icon: /svgs/zwave.svg
+    experimental: true
+
+  - title: Configure ZWA-2
+    section_header: Tools
+    description: Change region, view DSK and QR code for an existing ZWA-2.
+    href: /home-assistant-connect-zwa-2/configure-zwa2
+    icon: /svgs/wrench.svg
+
   - title: Recover adapter
     description: Recover a non-responsive ZWA-2 adapter.
     href: /home-assistant-connect-zwa-2/recover
diff --git a/src-11ty/home-assistant-connect-zwa-2/install-controller.njk b/src-11ty/home-assistant-connect-zwa-2/install-controller.njk
new file mode 100644
index 0000000..7f78826
--- /dev/null
+++ b/src-11ty/home-assistant-connect-zwa-2/install-controller.njk
@@ -0,0 +1,19 @@
+---
+layout: install.html
+title: Install Z-Wave controller firmware
+subtitle: Restore the original Z-Wave controller firmware
+description: Install Z-Wave controller firmware on your Home Assistant Connect ZWA-2
+backHref: /home-assistant-connect-zwa-2/
+hero: |
+  <p>
+    Restore the original Z-Wave controller firmware after using the repeater or Zniffer firmware.
+  </p>
+---
+
+<div class="installer-wrapper">
+  <div class="installer-card">
+    <install-firmware firmware="controller"></install-firmware>
+  </div>
+</div>
+
+<script type="module" src="https://home-assistant.github.io/zwa2-toolbox/standalone/install-firmware.js"></script>
diff --git a/src-11ty/home-assistant-connect-zwa-2/install-repeater.njk b/src-11ty/home-assistant-connect-zwa-2/install-repeater.njk
new file mode 100644
index 0000000..75b7c3c
--- /dev/null
+++ b/src-11ty/home-assistant-connect-zwa-2/install-repeater.njk
@@ -0,0 +1,19 @@
+---
+layout: install.html
+title: Install Z-Wave repeater firmware
+subtitle: Turn ZWA-2 into a standalone Z-Wave repeater
+description: Install Z-Wave repeater firmware on your Home Assistant Connect ZWA-2
+backHref: /home-assistant-connect-zwa-2/
+hero: |
+  <p>
+    This firmware turns ZWA-2 into a standalone Z-Wave device, which can help strengthen an existing Z-Wave network.
+  </p>
+---
+
+<div class="installer-wrapper">
+  <div class="installer-card">
+    <install-firmware firmware="repeater"></install-firmware>
+  </div>
+</div>
+
+<script type="module" src="https://home-assistant.github.io/zwa2-toolbox/standalone/install-firmware.js"></script>
diff --git a/src-11ty/home-assistant-connect-zwa-2/install-zniffer.njk b/src-11ty/home-assistant-connect-zwa-2/install-zniffer.njk
new file mode 100644
index 0000000..fca85b3
--- /dev/null
+++ b/src-11ty/home-assistant-connect-zwa-2/install-zniffer.njk
@@ -0,0 +1,19 @@
+---
+layout: install.html
+title: Install Z-Wave Zniffer firmware
+subtitle: Inspect packets, decode traffic, and gather statistics
+description: Install Z-Wave Zniffer firmware on your Home Assistant Connect ZWA-2
+backHref: /home-assistant-connect-zwa-2/
+hero: |
+  <p>
+    This is a development firmware that can be used to inspect packets, decode traffic, send commands, gather statistics, and more.
+  </p>
+---
+
+<div class="installer-wrapper">
+  <div class="installer-card">
+    <install-firmware firmware="zniffer"></install-firmware>
+  </div>
+</div>
+
+<script type="module" src="https://home-assistant.github.io/zwa2-toolbox/standalone/install-firmware.js"></script>
diff --git a/src/styles/details-page.css b/src/styles/details-page.css
index 07f7cdb..c736f64 100644
--- a/src/styles/details-page.css
+++ b/src/styles/details-page.css
@@ -71,6 +71,15 @@
   flex-direction: column;
 }
 
+.action-section-header {
+  padding: 12px 16px 4px;
+  font-size: 0.8rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  color: var(--app-text-muted);
+}
+
 .action-item {
   display: grid;
   grid-template-columns: auto 1fr auto;
diff --git a/vite.config.ts b/vite.config.ts
index a3b7064..d35498e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -93,6 +93,22 @@ export default defineConfig({
           __dirname,
           'dist/home-assistant-connect-zwa-2/recover/index.html'
         ),
+        homeAssistantConnectZwa2InstallController: resolve(
+          __dirname,
+          'dist/home-assistant-connect-zwa-2/install-controller/index.html'
+        ),
+        homeAssistantConnectZwa2InstallRepeater: resolve(
+          __dirname,
+          'dist/home-assistant-connect-zwa-2/install-repeater/index.html'
+        ),
+        homeAssistantConnectZwa2InstallZniffer: resolve(
+          __dirname,
+          'dist/home-assistant-connect-zwa-2/install-zniffer/index.html'
+        ),
+        homeAssistantConnectZwa2ConfigureZwa2: resolve(
+          __dirname,
+          'dist/home-assistant-connect-zwa-2/configure-zwa2/index.html'
+        ),
         homeAssistantConnectZbt1: resolve(
           __dirname,
           'dist/home-assistant-connect-zbt-1/index.html'