diff --git a/installer/README.md b/installer/README.md
index 4d54097..b4869d5 100644
--- a/installer/README.md
+++ b/installer/README.md
@@ -131,3 +131,26 @@ These simulations establish software behavior only. They do not establish USB re
 6. Before enabling USB updates: capable confirmed firmware and approved rollback bootloader; desktop Chrome/Edge streaming and exact version confirmation; Atom-only transfer then bottom-power startup; preservation readback; disconnect/power cuts before and after selection; failed startup rollback; invalid/truncated/out-of-order traffic; competing Wi-Fi/USB/settings actions; runtime heap, fragmentation and prayer/audio responsiveness. Prior fresh-install or Wi-Fi update evidence does not establish this new transport.
 
 Use the firmware repository's current hardware runbooks and fresh private backups for coordinated acceptance. Historical full-flash images can roll back prayer history and are not routine credential recovery. Keep private diagnostics, credentials and recovery images outside this repository. Published recordings are imported only through the reviewed release manifest; never commit generated binaries.
+
+## Waveshare Box V2 release preparation
+
+The installer supports hardware-specific schema-1 bundles when a published stable
+release provides them. Atom retains its existing release fields and filenames.
+`hardwareReleases` adds a Waveshare pin under
+`waveshare-esp32-s3-touch-lcd-1_85c-box-v2`; automatic selection adopts the prefixed
+manifest only when present and source-matched. Legacy Atom-only releases continue
+to work. Additional pins must use the same release tag; manual pins and disabling
+installation retain their existing policy. Static metadata and freshness checks
+include all selected hardware manifests.
+
+Recognized OpenAthan reports hardware through USB status; older responses retain
+Atom compatibility. Factory/blank devices require explicit model selection,
+followed by full-erasure confirmation. Changing models clears that confirmation.
+The flasher checks unlocked ESP32-S3 and matching 8/16 MiB capacity; capacity alone
+cannot identify the board or distinguish Waveshare V1 from V2. V1 is unsupported.
+
+Waveshare bundles use `waveshare-box-v2.` names except for shared
+`athan-audio.bin`. Signed USB updates verify the selected hardware, and recovery
+continues to preserve settings/history. Public USB update writes remain disabled
+by the existing policy until physical qualification. New simulator scenarios
+`waveshare` and `waveshare-new` exercise existing and fresh-install flows.
diff --git a/installer/entry.ts b/installer/entry.ts
index c78b92a..c5c1c0f 100644
--- a/installer/entry.ts
+++ b/installer/entry.ts
@@ -1,4 +1,4 @@
-import { parsePin } from './release';
+import { parsePin, parseHardwareReleases } from './release';
 import { usbSupport } from './browser-transport';
 import { RealService } from './real-service';
 import { mountInstaller } from './ui';
@@ -11,6 +11,9 @@ if (root) {
       new RealService(
         parsePin(JSON.parse(root.dataset.releaseSelection ?? 'null')),
         JSON.parse(root.dataset.releaseSelection ?? 'null')?.usbUpdateEnabled === true,
+        parseHardwareReleases(
+          JSON.parse(root.dataset.releaseSelection ?? 'null')?.hardwareReleases,
+        ),
       ),
       usbSupport(),
     );
diff --git a/installer/flasher.ts b/installer/flasher.ts
index 2d7a31f..645ee0c 100644
--- a/installer/flasher.ts
+++ b/installer/flasher.ts
@@ -2,7 +2,7 @@ import { ESPLoader } from 'esptool-js';
 import { md5 } from '@noble/hashes/legacy.js';
 import { bytesToHex } from '@noble/hashes/utils.js';
 import { FlashTransport } from './flash-transport';
-import { FLASH_BYTES, parseManifest, verifyBundle, type ReleaseBundle } from './release';
+import { HARDWARE_PROFILES, parseManifest, verifyBundle, type ReleaseBundle } from './release';
 
 export interface Programmer {
   inspect(): Promise<{ chip: string; flashBytes: number; secured: boolean }>;
@@ -22,6 +22,7 @@ export async function flashBundle(
   try {
     if (!confirmed) throw new Error('Confirm a new installation before continuing.');
     const manifest = parseManifest(input.manifest, {
+      hardware: input.manifest.hardware,
       tag: input.manifest.tag,
       manifestSha256: '0'.repeat(64),
       mediaReviewed: true,
@@ -32,9 +33,13 @@ export async function flashBundle(
       new Map(input.parts.map((part) => [part.metadata.file, part.bytes])),
     );
     const device = await programmer.inspect();
-    if (device.chip !== 'ESP32-S3' || device.flashBytes !== FLASH_BYTES || device.secured)
+    if (
+      device.chip !== 'ESP32-S3' ||
+      device.flashBytes !== HARDWARE_PROFILES[manifest.hardware].flashBytes ||
+      device.secured
+    )
       throw new Error(
-        'This device does not match the supported unlocked 8 MB ESP32-S3 hardware. Nothing was installed.',
+        'This device does not match the selected unlocked ESP32-S3 hardware. Nothing was installed.',
       );
     await programmer.write(bundle, progress);
     for (const part of bundle.parts) {
@@ -76,7 +81,7 @@ export function serialProgrammer(port: SerialPort): Programmer {
       const size = await loader.detectFlashSize();
       return {
         chip: loader.chip.CHIP_NAME,
-        flashBytes: size === '8MB' ? FLASH_BYTES : 0,
+        flashBytes: size === '8MB' ? 0x800000 : size === '16MB' ? 0x1000000 : 0,
         secured:
           loader.secureDownloadMode ||
           info.parsedFlags.SECURE_BOOT_EN ||
diff --git a/installer/protocol.ts b/installer/protocol.ts
index fa61329..5ba4b08 100644
--- a/installer/protocol.ts
+++ b/installer/protocol.ts
@@ -1,3 +1,4 @@
+import { HARDWARE, isHardware, type Hardware } from './release';
 /** Improv Serial v1 and the OpenAthan v1 extension. No transport or browser imports. */
 const encoder = new TextEncoder();
 const decoder = new TextDecoder('utf-8', { fatal: true });
@@ -124,6 +125,7 @@ export function validatePassword(password: string): void {
 }
 
 export interface DeviceStatus {
+  hardware?: Hardware;
   wifi: '2' | '3' | '4';
   password: 'absent' | 'ready' | 'fault';
   setup: 'incomplete' | 'active' | 'storage_fault';
@@ -166,6 +168,10 @@ export function localDeviceUrls(urls: string[], hostname: string): string[] {
 
 export function parseStatus(fields: string[]): DeviceStatus {
   const [version, wifi, password, setup, revision, hostname, storage, ...urls] = fields;
+  const hardwareFields = urls.filter((value) => value.startsWith('hardware='));
+  const hardware = hardwareFields[0]?.slice(9) ?? HARDWARE;
+  if (hardwareFields.length > 1 || !isHardware(hardware))
+    throw new Error('Unsupported connected hardware.');
   if (
     version !== '1' ||
     !['2', '3', '4'].includes(wifi ?? '') ||
@@ -179,6 +185,7 @@ export function parseStatus(fields: string[]): DeviceStatus {
     throw new Error('This device returned an unsupported OpenAthan status.');
   }
   return {
+    hardware,
     wifi,
     password,
     setup,
diff --git a/installer/real-service.ts b/installer/real-service.ts
index 995a424..9905518 100644
--- a/installer/real-service.ts
+++ b/installer/real-service.ts
@@ -10,12 +10,20 @@ import {
   type UpgradeOffer,
   type UpgradeCheck,
 } from './upgrade';
-import { loadRelease, type ReleasePin } from './release';
+import {
+  loadRelease,
+  HARDWARE,
+  type Hardware,
+  type HardwareReleases,
+  type ReleasePin,
+} from './release';
 import type { InstallerService, Connected } from './service';
 
 export class RealService implements InstallerService {
   readonly simulated = false;
   readonly installAvailable: boolean;
+  readonly installHardware: Hardware[];
+  private hardware: Hardware = HARDWARE;
   private port?: SerialPort;
   private session?: ProvisioningSession;
   private installationCandidate = false;
@@ -26,8 +34,10 @@ export class RealService implements InstallerService {
   constructor(
     private pin: ReleasePin | null,
     private usbUpdateEnabled = false,
+    private hardwareReleases: HardwareReleases = {},
   ) {
     this.installAvailable = pin !== null;
+    this.installHardware = pin ? [HARDWARE, ...(Object.keys(hardwareReleases) as Hardware[])] : [];
   }
   private async open(): Promise<ProvisioningSession> {
     if (!this.port) throw new Error('Choose the USB device first.');
@@ -62,7 +72,8 @@ export class RealService implements InstallerService {
       const status = await session.status(remaining);
       recognized = true;
       this.installationCandidate = false;
-      return { kind: 'existing', status };
+      this.hardware = status.hardware ?? HARDWARE;
+      return { kind: 'existing', status, hardware: this.hardware };
     } catch {
       if (recognized || this.connectionLost) {
         await this.close();
@@ -80,11 +91,19 @@ export class RealService implements InstallerService {
       return { kind: 'unrecognized' };
     }
   }
-  async install(confirmed: boolean, progress: (percent: number) => void) {
+  async install(
+    confirmed: boolean,
+    progress: (percent: number) => void,
+    hardware: Hardware = HARDWARE,
+  ) {
     if (!confirmed || !this.installationCandidate || !this.port || !this.pin || this.session)
       throw new Error('A confirmed new-device connection is required.');
     this.installationCandidate = false;
-    const bundle = await loadRelease(this.pin);
+    const selected = hardware === HARDWARE ? this.pin : this.hardwareReleases[hardware];
+    if (!selected || !this.installHardware.includes(hardware))
+      throw new Error('No reviewed release for this hardware.');
+    this.hardware = hardware;
+    const bundle = await loadRelease(selected);
     const { flashBundle, serialProgrammer } = await import('./flasher');
     try {
       await flashBundle(serialProgrammer(this.port), bundle, true, progress);
@@ -170,7 +189,7 @@ export class RealService implements InstallerService {
               : undefined,
         detail:
           info.state === 'awaiting_power'
-            ? 'An update is verified. Switch to Pyramid bottom power to finish.'
+            ? 'An update is verified. Switch to normal speaker power to finish.'
             : 'The device has an update or startup check in progress. Check its status before another update.',
       };
     if (!this.usbUpdateEnabled || !this.pin)
@@ -181,7 +200,10 @@ export class RealService implements InstallerService {
           'USB updating is awaiting physical qualification. Use firmware updates on the device’s settings page.',
       };
     try {
-      const bundle = await loadUpgrade(this.pin);
+      const selected =
+        (info.hardware ?? HARDWARE) === HARDWARE ? this.pin : this.hardwareReleases[info.hardware!];
+      if (!selected) throw new Error('No reviewed update for this hardware.');
+      const bundle = await loadUpgrade(selected);
       if (!newerVersion(bundle.offer.version, info.version))
         return {
           state: 'current',
diff --git a/installer/release.ts b/installer/release.ts
index a50ebd1..1a70620 100644
--- a/installer/release.ts
+++ b/installer/release.ts
@@ -1,10 +1,36 @@
 /** Versioned contract consumed from the firmware repository; no device access. */
 export const HARDWARE = 'atoms3r-c126-pyramid-a167';
+export const WAVESHARE = 'waveshare-esp32-s3-touch-lcd-1_85c-box-v2';
+export const HARDWARE_PROFILES = {
+  [HARDWARE]: { label: 'AtomS3R C126 + Pyramid A167', flashBytes: 0x800000, prefix: '' },
+  [WAVESHARE]: { label: 'Waveshare Box V2', flashBytes: 0x1000000, prefix: 'waveshare-box-v2.' },
+} as const;
+export type Hardware = keyof typeof HARDWARE_PROFILES;
+export function isHardware(value: unknown): value is Hardware {
+  return value === HARDWARE || value === WAVESHARE;
+}
+export function assetName(hardware: Hardware, name: string): string {
+  return name === 'athan-audio.bin' ? name : HARDWARE_PROFILES[hardware].prefix + name;
+}
+export type HardwareReleases = Partial<Record<Hardware, ReleasePin>>;
+export function parseHardwareReleases(value: unknown): HardwareReleases {
+  if (value === undefined) return {};
+  const releases = object(value),
+    result: HardwareReleases = {};
+  for (const [hardware, pin] of Object.entries(releases)) {
+    if (hardware !== WAVESHARE) throw new Error('Unsupported additional release hardware.');
+    const parsed = parsePin({ schema: 1, release: { ...object(pin), hardware } });
+    if (!parsed) throw new Error('Invalid hardware release.');
+    result[hardware] = parsed;
+  }
+  return result;
+}
 export const LAYOUT = 'dual-2m-audio-3_5m-v1';
 export const FLASH_BYTES = 0x800000;
 export const AUDIO_OFFSET = 0x410000;
 export const AUDIO_BYTES = 0x380000;
 export interface ReleasePin {
+  hardware?: Hardware;
   tag: string;
   manifestSha256: string;
   mediaReviewed: true;
@@ -22,7 +48,7 @@ export interface ReleaseManifest {
   repository: 'OpenAthan-Project/openathan';
   tag: string;
   commit: string;
-  hardware: typeof HARDWARE;
+  hardware: Hardware;
   chip: 'ESP32-S3';
   flashBytes: number;
   layout: typeof LAYOUT;
@@ -51,6 +77,7 @@ export function parsePin(value: unknown): ReleasePin | null {
     !tagPattern.test(pin.tag) ||
     typeof pin.manifestSha256 !== 'string' ||
     !digestPattern.test(pin.manifestSha256) ||
+    (pin.hardware !== undefined && !isHardware(pin.hardware)) ||
     pin.mediaReviewed !== true ||
     pin.hardwareQualified !== true
   )
@@ -67,9 +94,9 @@ export function parseManifest(value: unknown, pin: ReleasePin): ReleaseManifest
     !tagPattern.test(pin.tag) ||
     typeof m.commit !== 'string' ||
     !/^[a-f0-9]{40}$/.test(m.commit) ||
-    m.hardware !== HARDWARE ||
+    m.hardware !== (pin.hardware ?? HARDWARE) ||
     m.chip !== 'ESP32-S3' ||
-    m.flashBytes !== FLASH_BYTES ||
+    m.flashBytes !== HARDWARE_PROFILES[pin.hardware ?? HARDWARE].flashBytes ||
     m.layout !== LAYOUT ||
     m.provisioningProtocol !== 1 ||
     media.redistributionApproved !== true ||
@@ -92,7 +119,7 @@ export function parseManifest(value: unknown, pin: ReleasePin): ReleaseManifest
         !Number.isSafeInteger(p.bytes) ||
         Number(p.bytes) <= 0 ||
         Number(p.offset) < 0 ||
-        Number(p.offset) + Number(p.bytes) > FLASH_BYTES ||
+        Number(p.offset) + Number(p.bytes) > Number(m.flashBytes) ||
         typeof p.sha256 !== 'string' ||
         !digestPattern.test(p.sha256)
       )
@@ -130,7 +157,7 @@ export async function checkedManifest(
   return parseManifest(JSON.parse(new TextDecoder('utf-8', { fatal: true }).decode(bytes)), pin);
 }
 /** Check the real factory partition table and app header, not just manifest claims. */
-export function verifyFactory(bytes: Uint8Array): void {
+export function verifyFactory(bytes: Uint8Array, hardware: Hardware = HARDWARE): void {
   const expected = [
     ['nvs', 1, 2, 0x9000, 0x5000],
     ['otadata', 1, 0, 0xe000, 0x2000],
@@ -140,6 +167,8 @@ export function verifyFactory(bytes: Uint8Array): void {
   ];
   if (bytes.length < 0x10020 || bytes[0] !== 0xe9 || bytes[0x10000] !== 0xe9)
     throw new Error('Invalid factory image header.');
+  if (hardware === WAVESHARE && (bytes[3]! >> 4 !== 4 || bytes[0x10003]! >> 4 !== 4))
+    throw new Error('Factory flash capacity differs from hardware.');
   const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
   if (view.getUint16(12, true) !== 9 || view.getUint16(0x1000c, true) !== 9)
     throw new Error('Factory image is not for ESP32-S3.');
@@ -169,7 +198,7 @@ export async function verifyBundle(
     const bytes = inputs.get(metadata.file);
     if (!bytes || bytes.length !== metadata.bytes || (await sha256(bytes)) !== metadata.sha256)
       throw new Error(`Image verification failed: ${metadata.role}.`);
-    if (metadata.role === 'factory') verifyFactory(bytes);
+    if (metadata.role === 'factory') verifyFactory(bytes, manifest.hardware);
     parts.push({ metadata, bytes });
   }
   return { manifest, parts };
@@ -211,7 +240,10 @@ export async function loadRelease(
       reader.releaseLock();
     }
   };
-  const manifest = await checkedManifest(await get('manifest.json', 16_384), pin);
+  const manifest = await checkedManifest(
+    await get(assetName(pin.hardware ?? HARDWARE, 'manifest.json'), 16_384),
+    pin,
+  );
   const inputs = new Map<string, Uint8Array>();
   for (const part of manifest.parts) inputs.set(part.file, await get(part.file, part.bytes));
   return verifyBundle(manifest, inputs);
diff --git a/installer/service.ts b/installer/service.ts
index c8584ae..6efda15 100644
--- a/installer/service.ts
+++ b/installer/service.ts
@@ -1,12 +1,20 @@
+import type { Hardware } from './release';
 import type { DeviceStatus } from './protocol';
 import type { FirmwareInfo, UpgradeCheck, UpgradeOffer } from './upgrade';
-export type Connected = { kind: 'unrecognized' } | { kind: 'existing'; status: DeviceStatus };
+export type Connected =
+  | { kind: 'unrecognized' }
+  | { kind: 'existing'; status: DeviceStatus; hardware?: Hardware };
 export interface InstallerService {
   readonly simulated: boolean;
   readonly installAvailable: boolean;
+  readonly installHardware?: Hardware[];
   onDisconnect?: () => void;
   connect(): Promise<Connected>;
-  install(confirmed: boolean, progress: (percent: number) => void): Promise<DeviceStatus>;
+  install(
+    confirmed: boolean,
+    progress: (percent: number) => void,
+    hardware?: Hardware,
+  ): Promise<DeviceStatus>;
   discardUpdate(): Promise<void>;
   firmware(): Promise<FirmwareInfo>;
   checkUpdate(): Promise<UpgradeCheck>;
diff --git a/installer/simulator.ts b/installer/simulator.ts
index d7e33d5..8b2873e 100644
--- a/installer/simulator.ts
+++ b/installer/simulator.ts
@@ -1,3 +1,4 @@
+import { HARDWARE, WAVESHARE, type Hardware } from './release';
 /** Deliberately has no dependency on Web Serial, release files or the flasher. */
 import { decodeFields, encodeFrame, FrameDecoder, rpcPayload } from './protocol';
 import { ProvisioningSession, type ByteTransport } from './session';
@@ -6,6 +7,8 @@ import type { Connected, InstallerService } from './service';
 export const scenarios = [
   'success',
   'new-device',
+  'waveshare',
+  'waveshare-new',
   'unreadable',
   'denied',
   'busy',
@@ -77,6 +80,21 @@ export class SimulatedTransport implements ByteTransport {
       ]);
       return;
     }
+    if (extension && command === 0x10) {
+      this.send(true, 0x10, [
+        '1',
+        'v0.4.0',
+        'a'.repeat(40),
+        'unsupported',
+        'idle',
+        'confirmed',
+        '',
+        '',
+        '0',
+        this.scenario === 'waveshare' ? WAVESHARE : HARDWARE,
+      ]);
+      return;
+    }
     if (extension && command === 1) {
       this.send(true, 1, [
         '1',
@@ -126,6 +144,8 @@ export class SimulatedTransport implements ByteTransport {
 }
 
 export class SimulatorService implements InstallerService {
+  readonly installHardware: Hardware[] = [HARDWARE, WAVESHARE];
+  private hardware: Hardware = HARDWARE;
   readonly simulated = true;
   readonly installAvailable = true;
   private session?: ProvisioningSession;
@@ -141,7 +161,7 @@ export class SimulatorService implements InstallerService {
     await this.close();
     if (this.scenario === 'denied') throw new DOMException('Permission dismissed', 'NotFoundError');
     if (this.scenario === 'busy') throw new DOMException('Port busy', 'InvalidStateError');
-    if (['new-device', 'unknown', 'flash-failed'].includes(this.scenario)) {
+    if (['new-device', 'waveshare-new', 'unknown', 'flash-failed'].includes(this.scenario)) {
       this.installationCandidate = true;
       return { kind: 'unrecognized' };
     }
@@ -153,12 +173,18 @@ export class SimulatorService implements InstallerService {
         'OpenAthan was recognized, but its status could not be read. Reconnect your speaker; do not reinstall.',
       );
     }
-    return { kind: 'existing', status: await session.status() };
+    this.hardware = this.scenario === 'waveshare' ? WAVESHARE : HARDWARE;
+    return { kind: 'existing', status: await session.status(), hardware: this.hardware };
   }
-  async install(confirmed: boolean, progress: (percent: number) => void) {
+  async install(
+    confirmed: boolean,
+    progress: (percent: number) => void,
+    hardware: Hardware = HARDWARE,
+  ) {
     if (!confirmed || !this.installationCandidate)
       throw new Error('Confirm the simulated installation first.');
     this.installationCandidate = false;
+    this.hardware = hardware;
     for (const percent of [15, 40, 75, 100]) {
       await new Promise((resolve) => setTimeout(resolve, 100));
       progress(percent);
@@ -172,6 +198,7 @@ export class SimulatorService implements InstallerService {
   async discardUpdate() {}
   async firmware(): Promise<FirmwareInfo> {
     return {
+      hardware: this.hardware,
       version: 'v0.4.0',
       commit: 'a'.repeat(40),
       supported: true,
diff --git a/installer/ui.ts b/installer/ui.ts
index 740e331..7c94600 100644
--- a/installer/ui.ts
+++ b/installer/ui.ts
@@ -1,3 +1,4 @@
+import { HARDWARE, WAVESHARE, HARDWARE_PROFILES, isHardware, type Hardware } from './release';
 import { validatePassword, validateWifi, type DeviceStatus } from './protocol';
 import { DeviceError, UncertainOutcome } from './session';
 import type { InstallerService } from './service';
@@ -29,6 +30,7 @@ export function mountInstaller(
     offered: UpgradeOffer | undefined,
     installed = false,
     updateWritten = false;
+  let hardware: Hardware = HARDWARE;
   let operation: 'wifi' | 'password' | 'update' | 'none' = 'none';
   let notice = '',
     mutationBlocked = false,
@@ -64,14 +66,14 @@ export function mountInstaller(
     if (unsupported) {
       render(
         'Use a computer for USB setup',
-        `<p>${escape(unsupported)}</p><p><a href="/docs/getting-started/">Setup instructions</a> · <a href="/docs/troubleshooting/">Troubleshooting</a></p><p>USB recovery can fix Wi-Fi or your device password without resetting prayer settings or history.</p>${!service.installAvailable ? unavailable : ''}<p class="small">Supported hardware: AtomS3R C126 + Pyramid A167. Use a USB data cable.</p>`,
+        `<p>${escape(unsupported)}</p><p><a href="/docs/getting-started/">Setup instructions</a> · <a href="/docs/troubleshooting/">Troubleshooting</a></p><p>USB recovery can fix Wi-Fi or your device password without resetting prayer settings or history.</p>${!service.installAvailable ? unavailable : ''}<p class="small">Supported hardware: AtomS3R C126 + Pyramid A167 and Waveshare Box V2. Use a USB data cable.</p>`,
         0,
         true,
       );
     } else {
       render(
         'Connect speaker',
-        `<p>Use a <strong>USB data cable</strong> to connect your computer to the <strong>Atom’s USB-C port</strong>. Leave the Pyramid’s bottom power cable unplugged.</p><div class="connection-diagram" aria-label="Computer connects to Atom USB-C. Pyramid bottom power is unplugged."><span>Computer</span><span class="cable" aria-hidden="true"></span><span>Atom USB-C</span></div><p class="small muted">Use desktop Chrome or Edge. Close other serial tools first. Choose the USB JTAG/serial device in your browser’s connection window.</p><p>We’ll check for OpenAthan, then show settings and recovery options or ask you to confirm a new installation. Connecting does not install or erase firmware.</p>${!service.installAvailable ? unavailable : ''}<div class="actions">${button(service.simulated ? 'Connect simulated device' : 'Choose USB device', 'connect')}<a href="/docs/getting-started/">Setup instructions</a><a href="/docs/troubleshooting/">Troubleshooting</a></div>`,
+        `<p>Use a <strong>USB data cable</strong> to connect your computer to the <strong>speaker’s USB-C port</strong>. For Atom, use its USB-C port and leave the Pyramid’s bottom power cable unplugged. For Waveshare Box V2, use the rear USB-C port.</p><div class="connection-diagram" aria-label="Computer connects to the speaker USB-C port."><span>Computer</span><span class="cable" aria-hidden="true"></span><span>Speaker USB-C</span></div><p class="small muted">Use desktop Chrome or Edge. Close other serial tools first. Choose the USB JTAG/serial device in your browser’s connection window.</p><p>We’ll check for OpenAthan, then show settings and recovery options or ask you to confirm a new installation. Connecting does not install or erase firmware.</p>${!service.installAvailable ? unavailable : ''}<div class="actions">${button(service.simulated ? 'Connect simulated device' : 'Choose USB device', 'connect')}<a href="/docs/getting-started/">Setup instructions</a><a href="/docs/troubleshooting/">Troubleshooting</a></div>`,
         0,
         true,
       );
@@ -81,9 +83,15 @@ export function mountInstaller(
   function confirmation() {
     path = 'install';
     const available = service.installAvailable;
+    const choices = service.installHardware ?? [HARDWARE];
+    hardware = choices[0] ?? HARDWARE;
+    const modelChoice =
+      choices.length > 1
+        ? `<label for="hardware-choice">Speaker model</label><select id="hardware-choice"><option value="">Choose your model</option>${choices.map((board) => `<option value="${board}">${HARDWARE_PROFILES[board].label}</option>`).join('')}</select><p class="small muted">Check the model printed on your device. Waveshare V1 is not supported.</p>`
+        : '';
     render(
       available ? 'Confirm a new installation' : 'New installation is unavailable',
-      `<p>OpenAthan was not recognized. This does not prove the device is new or empty. If you expected an existing OpenAthan, check the cable and retry before considering installation.</p>${available ? '<div class="notice warning"><strong>This erases the device.</strong><p>Existing firmware, saved Wi-Fi, prayer settings and prayer history will be replaced. This is not an update or a password recovery.</p></div><label class="check-line"><input type="checkbox" id="confirm-install" /> <span>I have an AtomS3R C126 with Pyramid A167 and want to erase it for a new installation.</span></label>' : '<p>No installation release is available. Check the connection or follow the troubleshooting instructions.</p>'}<div class="actions">${available ? '<button class="button" type="button" data-action="install" disabled>Install OpenAthan</button>' : ''}${button('Back to connection', 'start', true)}<a href="/docs/troubleshooting/">Troubleshooting</a></div>`,
+      `<p>OpenAthan was not recognized. This does not prove the device is new or empty. If you expected an existing OpenAthan, check the cable and retry before considering installation.</p>${available ? `${modelChoice}<div class="notice warning"><strong>This erases the device.</strong><p>Existing firmware, saved Wi-Fi, prayer settings and prayer history will be replaced. This is not an update or a password recovery.</p></div><label class="check-line"><input type="checkbox" id="confirm-install" ${choices.length > 1 ? 'disabled' : ''} /> <span id="model-confirmation">${choices.length > 1 ? 'Choose a model, then confirm that you want to erase it for a new installation.' : 'I have an AtomS3R C126 with Pyramid A167 and want to erase it for a new installation.'}</span></label>` : '<p>No installation release is available. Check the connection or follow the troubleshooting instructions.</p>'}<div class="actions">${available ? '<button class="button" type="button" data-action="install" disabled>Install OpenAthan</button>' : ''}${button('Back to connection', 'start', true)}<a href="/docs/troubleshooting/">Troubleshooting</a></div>`,
       0,
     );
   }
@@ -153,7 +161,7 @@ export function mountInstaller(
           : button('Continue to device settings', 'finish');
     render(
       'Your OpenAthan is connected',
-      `<p class="device-name">${escape(status?.hostname ?? '')}</p><p>${wifiMissing ? 'Wi-Fi is not connected.' : 'Wi-Fi is connected.'} ${passwordMissing ? 'A device password is needed.' : 'Your device password is set.'}</p>
+      `<p class="device-name">${escape(status?.hostname ?? '')}</p><p class="small muted">${HARDWARE_PROFILES[hardware].label}</p><p>${wifiMissing ? 'Wi-Fi is not connected.' : 'Wi-Fi is connected.'} ${passwordMissing ? 'A device password is needed.' : 'Your device password is set.'}</p>
       <p class="small muted">Compatible firmware updates preserve settings, prayer history and recordings. Recovery changes only the Wi-Fi or password you choose.</p>
       <div class="actions">${primary}${!recoveryBlocked && wifiMissing ? button('Refresh status', 'refresh-status', true) : ''}</div>
       ${recoveryBlocked ? row('Firmware', firmwareText) : row('Firmware', firmwareText, upgradeCheck?.state === 'available' ? 'Review update' : 'Check for updates', upgradeCheck?.state === 'available' ? 'review-update' : 'check-update')}
@@ -180,9 +188,13 @@ export function mountInstaller(
   }
   function reviewUpdate() {
     if (!offered || mutationBlocked || recoveryBlocked) return;
+    const powerInstructions =
+      hardware === WAVESHARE
+        ? 'Keep the Waveshare rear USB-C cable connected during transfer. After verification, press RESET to restart and complete startup checks.'
+        : 'Keep Atom USB connected during transfer. After verification, you’ll switch to Pyramid bottom power.';
     render(
       'Review firmware update',
-      `<p>Install <strong>${escape(offered.version)}</strong> over USB.</p><p>Your Wi-Fi, device password, prayer settings, playback history and recordings stay on the speaker. The current application is retained for startup rollback.</p><p><a href="${escape(offered.notes)}" target="_blank" rel="noopener noreferrer">Read the release notes</a></p><p>Keep Atom USB connected during transfer. After verification, you’ll switch to Pyramid bottom power.</p><div class="actions">${button('Install update', 'update')}${button('Back', 'recovery', true)}</div>`,
+      `<p>Install <strong>${escape(offered.version)}</strong> over USB.</p><p>Your Wi-Fi, device password, prayer settings, playback history and recordings stay on the speaker. The current application is retained for startup rollback.</p><p><a href="${escape(offered.notes)}" target="_blank" rel="noopener noreferrer">Read the release notes</a></p><p>${powerInstructions}</p><div class="actions">${button('Install update', 'update')}${button('Back', 'recovery', true)}</div>`,
       1,
     );
   }
@@ -216,7 +228,9 @@ export function mountInstaller(
     const needsRecovery = passwordAbsent || wifiDisconnected;
     const urls = needsRecovery ? [] : device.urls;
     const recoveryGuidance = needsRecovery
-      ? `<div class="notice">${passwordAbsent ? '<p>Your device password still needs to be created through USB setup.</p>' : ''}${wifiDisconnected ? '<p>The speaker may reconnect using its saved Wi-Fi settings. If it stays offline, check or change Wi-Fi through USB setup.</p>' : ''}<p><strong>For USB recovery after startup:</strong></p><ol class="finish-list"><li>After the speaker starts, unplug the Pyramid’s bottom power cable before connecting the Atom’s USB-C port to your computer.</li><li>Select <strong>Back to connection</strong>, reconnect, then choose <strong>Check for updates</strong>.</li><li>Follow any remaining update instructions before changing Wi-Fi or creating a device password.</li><li>After recovery, unplug Atom USB and return to Pyramid bottom-only power, then open the device’s settings.</li></ol></div>`
+      ? hardware === WAVESHARE
+        ? `<div class="notice"><p>After restarting, connect the rear USB-C port to your computer and reconnect through USB setup. Check firmware status before changing Wi-Fi or the device password. Keep your saved prayer settings and history.</p></div>`
+        : `<div class="notice">${passwordAbsent ? '<p>Your device password still needs to be created through USB setup.</p>' : ''}${wifiDisconnected ? '<p>The speaker may reconnect using its saved Wi-Fi settings. If it stays offline, check or change Wi-Fi through USB setup.</p>' : ''}<p><strong>For USB recovery after startup:</strong></p><ol class="finish-list"><li>After the speaker starts, unplug the Pyramid’s bottom power cable before connecting the Atom’s USB-C port to your computer.</li><li>Select <strong>Back to connection</strong>, reconnect, then choose <strong>Check for updates</strong>.</li><li>Follow any remaining update instructions before changing Wi-Fi or creating a device password.</li><li>After recovery, unplug Atom USB and return to Pyramid bottom-only power, then open the device’s settings.</li></ol></div>`
       : '';
     render(
       updateWritten
@@ -224,7 +238,7 @@ export function mountInstaller(
         : path === 'install'
           ? 'Ready for device setup'
           : 'Continue on speaker power',
-      `<div class="success-mark" aria-hidden="true"><svg viewBox="0 0 32 32" fill="none"><circle cx="16" cy="16" r="15" stroke="currentColor"/><path d="m9 16 5 5 9-11" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg></div><p>${updateWritten ? 'The signed application was verified and selected. Switch to normal speaker power so it can start and complete its health checks.' : path === 'install' ? 'Wi-Fi and your device password are saved. Finish your prayer settings on the device.' : 'Your device is ready to open. Its prayer settings and history were not reset.'}</p><ol class="finish-list"><li>Unplug the Atom’s USB cable.</li><li>Connect <strong>only the Pyramid’s bottom USB-C power</strong>.</li><li>${needsRecovery ? 'Let the speaker start and complete its startup checks.' : 'Wait for it to reconnect, then open its settings on the same home network.'}</li></ol>${recoveryGuidance}${urls.length && !service.simulated ? '<p id="device-new-tab" class="small muted">Device links open in a new tab.</p>' : ''}<div class="device-links">${urls.map((url, index) => (service.simulated ? `<div class="demo-url"><span>${index === 0 ? 'Device address' : 'IP fallback'}</span><a class="address-link" href="/preview/device/" target="_blank" rel="noopener noreferrer" aria-describedby="device-link-help-${index}"><code>${escape(url)}</code><span aria-hidden="true">↗</span></a><small id="device-link-help-${index}">Opens a local preview in a new tab</small></div>` : `<div class="device-address"><a class="${index === 0 ? 'button' : 'fallback-link'}" href="${escape(url)}" target="_blank" rel="noopener noreferrer" aria-describedby="device-new-tab">${index === 0 ? 'Open device settings' : 'Try the IP address'} <span aria-hidden="true">↗</span></a><a class="address-link" href="${escape(url)}" target="_blank" rel="noopener noreferrer" aria-describedby="device-new-tab"><code>${escape(url)}</code><span aria-hidden="true">↗</span></a></div>`)).join('')}</div><p class="small muted">${needsRecovery ? '' : 'Sign in as <strong>admin</strong> with the password you chose. '}${path === 'install' && !updateWritten ? 'Review your location, timezone and timetable, then select <strong>Finish setup</strong>.' : updateWritten ? 'Check the firmware version and update result on the device’s settings page. Startup success is confirmed there; an interrupted connection alone cannot establish success or rollback.' : 'Continue with your saved prayer settings.'} Athan playback waits until the device has synchronized its clock.</p>${!urls.length && !needsRecovery ? '<p class="notice">A device address was not returned. Reconnect through USB setup to read it again.</p>' : ''}<div class="actions">${button('Back to connection', 'start', true)}<a href="/docs/getting-started/">Setup instructions</a></div>`,
+      `<div class="success-mark" aria-hidden="true"><svg viewBox="0 0 32 32" fill="none"><circle cx="16" cy="16" r="15" stroke="currentColor"/><path d="m9 16 5 5 9-11" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg></div><p>${updateWritten ? 'The signed application was verified and selected. Switch to normal speaker power so it can start and complete its health checks.' : path === 'install' ? 'Wi-Fi and your device password are saved. Finish your prayer settings on the device.' : 'Your device is ready to open. Its prayer settings and history were not reset.'}</p>${hardware === WAVESHARE ? '<ol class="finish-list"><li>Use the Waveshare rear USB-C port for normal power.</li><li>Press RESET to restart after a verified update.</li>' : '<ol class="finish-list"><li>Unplug the Atom’s USB cable.</li><li>Connect <strong>only the Pyramid’s bottom USB-C power</strong>.</li>'}<li>${needsRecovery ? 'Let the speaker start and complete its startup checks.' : 'Wait for it to reconnect, then open its settings on the same home network.'}</li></ol>${recoveryGuidance}${urls.length && !service.simulated ? '<p id="device-new-tab" class="small muted">Device links open in a new tab.</p>' : ''}<div class="device-links">${urls.map((url, index) => (service.simulated ? `<div class="demo-url"><span>${index === 0 ? 'Device address' : 'IP fallback'}</span><a class="address-link" href="/preview/device/" target="_blank" rel="noopener noreferrer" aria-describedby="device-link-help-${index}"><code>${escape(url)}</code><span aria-hidden="true">↗</span></a><small id="device-link-help-${index}">Opens a local preview in a new tab</small></div>` : `<div class="device-address"><a class="${index === 0 ? 'button' : 'fallback-link'}" href="${escape(url)}" target="_blank" rel="noopener noreferrer" aria-describedby="device-new-tab">${index === 0 ? 'Open device settings' : 'Try the IP address'} <span aria-hidden="true">↗</span></a><a class="address-link" href="${escape(url)}" target="_blank" rel="noopener noreferrer" aria-describedby="device-new-tab"><code>${escape(url)}</code><span aria-hidden="true">↗</span></a></div>`)).join('')}</div><p class="small muted">${needsRecovery ? '' : 'Sign in as <strong>admin</strong> with the password you chose. '}${path === 'install' && !updateWritten ? 'Review your location, timezone and timetable, then select <strong>Finish setup</strong>.' : updateWritten ? 'Check the firmware version and update result on the device’s settings page. Startup success is confirmed there; an interrupted connection alone cannot establish success or rollback.' : 'Continue with your saved prayer settings.'} Athan playback waits until the device has synchronized its clock.</p>${!urls.length && !needsRecovery ? '<p class="notice">A device address was not returned. Reconnect through USB setup to read it again.</p>' : ''}<div class="actions">${button('Back to connection', 'start', true)}<a href="/docs/getting-started/">Setup instructions</a></div>`,
       3,
     );
   }
@@ -250,7 +264,9 @@ export function mountInstaller(
         await service.close();
       } catch {
         notify(
-          'The browser could not close the USB connection. Unplug the Atom’s USB cable and follow the power steps below.',
+          hardware === WAVESHARE
+            ? 'The browser could not close the USB connection. Disconnect the data cable, then follow the restart and power steps below.'
+            : 'The browser could not close the USB connection. Unplug the Atom’s USB cable and follow the power steps below.',
         );
       }
     } else {
@@ -348,6 +364,19 @@ export function mountInstaller(
   };
   root.addEventListener('change', (event) => {
     const target = event.target as HTMLInputElement;
+    if (target.id === 'hardware-choice') {
+      const valid =
+        isHardware(target.value) && (service.installHardware ?? [HARDWARE]).includes(target.value);
+      const checkbox = panel.querySelector<HTMLInputElement>('#confirm-install')!;
+      checkbox.checked = false;
+      checkbox.disabled = !valid;
+      panel.querySelector<HTMLButtonElement>('[data-action="install"]')!.disabled = true;
+      if (valid) {
+        hardware = target.value as Hardware;
+        panel.querySelector('#model-confirmation')!.textContent =
+          `I have ${hardware === HARDWARE ? 'an' : 'a'} ${HARDWARE_PROFILES[hardware].label} and want to erase it for a new installation.`;
+      }
+    }
     if (target.id === 'confirm-install')
       panel.querySelector<HTMLButtonElement>('[data-action="install"]')!.disabled = !target.checked;
     if (target.id === 'network-choice')
@@ -374,6 +403,7 @@ export function mountInstaller(
         notify('');
         if (result.kind === 'unrecognized') confirmation();
         else {
+          hardware = result.hardware ?? HARDWARE;
           status = result.status;
           path = 'recovery';
           recoveryMenu();
@@ -387,11 +417,15 @@ export function mountInstaller(
           0,
         );
         try {
-          status = await service.install(confirmed, (percent) => {
-            panel.querySelector('progress')!.value = percent;
-            panel.querySelector('[data-progress]')!.textContent =
-              `${percent}% · ${percent === 100 ? 'Verifying…' : 'Writing firmware…'}`;
-          });
+          status = await service.install(
+            confirmed,
+            (percent) => {
+              panel.querySelector('progress')!.value = percent;
+              panel.querySelector('[data-progress]')!.textContent =
+                `${percent}% · ${percent === 100 ? 'Verifying…' : 'Writing firmware…'}`;
+            },
+            hardware,
+          );
           installed = true;
           wifiScreen();
         } catch (error) {
@@ -449,7 +483,7 @@ export function mountInstaller(
         const selected = offered;
         render(
           'Updating firmware',
-          '<p>Keep Atom USB connected while the application is written and verified. You will switch to speaker power afterwards.</p><progress max="100" value="0" aria-label="Firmware update progress"></progress><p data-progress>Preparing signed update…</p>',
+          `<p>Keep ${hardware === WAVESHARE ? 'Waveshare USB' : 'Atom USB'} connected while the application is written and verified. You will switch to speaker power afterwards.</p><progress max="100" value="0" aria-label="Firmware update progress"></progress><p data-progress>Preparing signed update…</p>`,
           1,
         );
         try {
diff --git a/installer/upgrade.ts b/installer/upgrade.ts
index dca4772..ee3ef27 100644
--- a/installer/upgrade.ts
+++ b/installer/upgrade.ts
@@ -1,6 +1,9 @@
 /** Signed application-only updates. Does not import the destructive flasher. */
 import {
   HARDWARE,
+  assetName,
+  isHardware,
+  type Hardware,
   LAYOUT,
   checkedManifest,
   sha256,
@@ -8,6 +11,7 @@ import {
   type ReleaseManifest,
 } from './release.ts';
 export interface FirmwareInfo {
+  hardware?: Hardware;
   version: string;
   commit: string;
   supported: boolean;
@@ -18,6 +22,7 @@ export interface FirmwareInfo {
   received: number;
 }
 export interface UpgradeOffer {
+  hardware?: Hardware;
   version: string;
   commit: string;
   bytes: number;
@@ -72,9 +77,11 @@ export function newerVersion(offered: string, installed: string): boolean {
   return false;
 }
 export function parseFirmware(fields: string[]): FirmwareInfo {
-  const [protocol, version, commit, support, state, boot, result, offered, received] = fields;
+  const [protocol, version, commit, support, state, boot, result, offered, received, hardware] =
+    fields;
   if (
-    fields.length !== 9 ||
+    ![9, 10].includes(fields.length) ||
+    (fields.length === 10 && !isHardware(hardware)) ||
     protocol !== '1' ||
     !stable.test(version ?? '') ||
     !/^(?:[a-f0-9]{40}|development)$/.test(commit ?? '') ||
@@ -114,6 +121,7 @@ export function parseFirmware(fields: string[]): FirmwareInfo {
     result: result!,
     offered: offered!,
     received: Number(received),
+    hardware: (hardware ?? HARDWARE) as Hardware,
   };
 }
 /** Strict DER ECDSA to WebCrypto's fixed-width P-256 r || s representation. */
@@ -184,7 +192,7 @@ export async function verifyDescriptor(
     p.version !== manifest.tag ||
     p.commit !== manifest.commit ||
     !stable.test(p.version) ||
-    p.hardware !== HARDWARE ||
+    p.hardware !== manifest.hardware ||
     p.layout !== LAYOUT ||
     p.storageFormat !== 1 ||
     p.audioFormat !== 1 ||
@@ -197,6 +205,7 @@ export async function verifyDescriptor(
     throw new Error('Incompatible firmware update.');
   newerVersion(p.version, p.version);
   return {
+    hardware: manifest.hardware,
     version: p.version,
     commit: p.commit,
     bytes: p.bytes,
@@ -267,10 +276,19 @@ async function bounded(url: string, maximum: number): Promise<Uint8Array> {
 }
 export async function loadUpgrade(pin: ReleasePin): Promise<UpgradeBundle> {
   const base = `/releases/${pin.tag}/`;
-  const manifest = await checkedManifest(await bounded(base + 'manifest.json', 16384), pin);
-  const descriptor = await bounded(base + 'upgrade.json', 8192),
+  const manifest = await checkedManifest(
+    await bounded(base + assetName(pin.hardware ?? HARDWARE, 'manifest.json'), 16384),
+    pin,
+  );
+  const descriptor = await bounded(
+      base + assetName(pin.hardware ?? HARDWARE, 'upgrade.json'),
+      8192,
+    ),
     offer = await verifyDescriptor(descriptor, manifest);
-  const application = await bounded(base + 'firmware.ota.bin', offer.bytes);
+  const application = await bounded(
+    base + assetName(pin.hardware ?? HARDWARE, 'firmware.ota.bin'),
+    offer.bytes,
+  );
   await verifyApplication(offer, application);
   return { offer, descriptor, application };
 }
diff --git a/site/docs/getting-started.md b/site/docs/getting-started.md
index f9a1f99..5231090 100644
--- a/site/docs/getting-started.md
+++ b/site/docs/getting-started.md
@@ -22,3 +22,21 @@ development simulator lets reviewers explore the flow without hardware and is
 excluded from the production build.
 
 USB setup has one connection entry. Choose the USB device, then read-only discovery opens existing-speaker controls or installation confirmation. An unrecognized result is not proof of a blank device. Installation requires explicit hardware and full-erasure confirmation; recognized OpenAthan with unreadable status receives troubleshooting, never installation.
+
+## Waveshare Box V2
+
+Support is being prepared for v0.5.0. It becomes available in the browser installer
+when that qualified release is published. Use the **ESP32-S3-Touch-LCD-1.85C-BOX V2**;
+V1 is not supported. Connect a USB data cable to its rear USB-C port.
+
+The installer recognizes hardware already running compatible OpenAthan. For a
+new installation, select **Waveshare Box V2** and confirm erasure. Installation
+replaces existing firmware, Wi-Fi credentials, settings and prayer history.
+After installation, save Wi-Fi and a device password, open the device page and
+finish location, prayer settings and volume. Use the same rear USB-C port for
+normal power. BOOT stops playback, skips the next prayer or cancels that skip;
+use RESET to restart. Touch and microphone features are not part of this release.
+
+The RTC can retain synchronized time across powered restarts. The first boot
+still needs internet time. Battery retention, unplugged retention and drift
+have not been qualified.
diff --git a/site/pages/docs/getting-started.astro b/site/pages/docs/getting-started.astro
index 0208837..6dc6c53 100644
--- a/site/pages/docs/getting-started.astro
+++ b/site/pages/docs/getting-started.astro
@@ -2,7 +2,9 @@
 import Layout from '../../layouts/Layout.astro';
 import CableDiagram from '../../components/CableDiagram.astro';
 import { siteSelection } from '../../release-selection';
-const { release } = await siteSelection();
+import { WAVESHARE } from '../../../installer/release';
+const { release, hardwareReleases } = await siteSelection();
+const waveshareRelease = hardwareReleases?.[WAVESHARE];
 ---
 
 <Layout
@@ -38,7 +40,9 @@ const { release } = await siteSelection();
         Purchase an <a href="https://docs.m5stack.com/en/core/AtomS3R">M5Stack AtomS3R C126</a>{' '}
         and a <a href="https://docs.m5stack.com/en/atom/Voice_Pyramid">Voice Pyramid A167</a> speaker
         base separately. A167 has also been called “Echo Pyramid”; check the SKU when buying. These instructions
-        and the browser installer currently support only this combination of parts.
+        describe this combination of parts. See the <a href="#waveshare-setup"
+          >Waveshare Box V2 instructions</a
+        > below for that model.
       </p><p>
         You will need a computer with desktop Chrome or Edge, a USB-C <strong>data</strong> cable, and
         a 2.4 GHz WPA2/WPA3 personal Wi-Fi network. A charging-only cable will not work for USB setup.
@@ -96,8 +100,8 @@ const { release } = await siteSelection();
         > to enable the Athan. If the clock has not synchronized yet, Athan playback will wait.
       </p><h2>Everyday use</h2><p>
         Your speaker calculates prayer times and plays recordings stored on the device. The current
-        build needs internet access to set its clock after a restart, before it can play the Athan.
-        To open its settings, connect your phone or computer to the same home Wi-Fi. Keep the
+        Atom build needs internet access to set its clock after a restart, before it can play the
+        Athan. To open its settings, connect your phone or computer to the same home Wi-Fi. Keep the
         settings page on your trusted home network; do not make it accessible from the internet.
       </p>
       <h2 id="firmware-updates">Update your firmware</h2>
@@ -153,7 +157,7 @@ const { release } = await siteSelection();
       <p>
         Additional hardware integrations require development and testing. The reusable core and
         ESPHome integration provide a starting point; broader support for optional peripherals is
-        still planned. The browser installer currently targets only our first reference build.
+        still planned. The browser installer offers qualified releases for supported boards.
       </p>
       <p>For implementation details, see:</p>
       <ul>
@@ -172,4 +176,32 @@ const { release } = await siteSelection();
       </ul>
     </div>
   </article>
+  <section class="docs wrap" aria-labelledby="waveshare-setup">
+    <div class="docs-body">
+      <h2 id="waveshare-setup">Waveshare Box V2</h2>
+      <p>
+        {
+          waveshareRelease
+            ? `OpenAthan ${waveshareRelease.tag} is available for this model.`
+            : 'Support is being prepared for v0.5.0 and becomes available after its qualified release is published.'
+        }
+        Use ESP32-S3-Touch-LCD-1.85C-BOX V2; V1 is not supported.
+      </p>
+      <p>
+        Connect its rear USB-C port using a USB data cable. Existing OpenAthan reports its hardware
+        automatically. For a new installation, choose Waveshare Box V2 and confirm that existing
+        firmware and saved data will be erased.
+      </p>
+      <p>
+        Save Wi-Fi and a device password, then open device settings to choose your location, prayer
+        settings and volume. The rear USB-C port also supplies normal power; RESET restarts the
+        device. Touch and microphones are not supported.
+      </p>
+      <p>
+        The onboard RTC restores previously synchronized time across powered restarts. First use
+        needs internet time. Retention after unplugging, battery behavior and clock drift remain
+        unqualified.
+      </p>
+    </div>
+  </section>
 </Layout>
diff --git a/site/pages/install/index.astro b/site/pages/install/index.astro
index ab3aeea..7894c52 100644
--- a/site/pages/install/index.astro
+++ b/site/pages/install/index.astro
@@ -7,7 +7,7 @@ const selection = await siteSelection();
 
 <Layout
   title="Connect your speaker"
-  description="Install OpenAthan or recover Wi-Fi and your device password over USB on AtomS3R C126 + Pyramid A167."
+  description="Install OpenAthan or recover Wi-Fi and your device password over USB on AtomS3R C126 + Pyramid A167 or Waveshare Box V2."
 >
   <section class="page-heading wrap">
     <h1>Set up OpenAthan</h1><p>
@@ -17,9 +17,8 @@ const selection = await siteSelection();
   </section>
   <div class="wrap">
     <InstallerShell catalog={selection} /><div class="under-installer">
-      <span>AtomS3R C126 + Pyramid A167</span><span>USB setup: desktop Chrome or Edge</span><a
-        href="/docs/troubleshooting/">Connection trouble?</a
-      >
+      <span>AtomS3R + Pyramid · Waveshare Box V2</span><span>USB setup: desktop Chrome or Edge</span
+      ><a href="/docs/troubleshooting/">Connection trouble?</a>
     </div>{
       import.meta.env.DEV && (
         <div class="preview-link">
diff --git a/site/pages/preview/[page].astro b/site/pages/preview/[page].astro
index df5bc95..23b663d 100644
--- a/site/pages/preview/[page].astro
+++ b/site/pages/preview/[page].astro
@@ -34,6 +34,8 @@ const isInstaller = Astro.params.page === 'installer';
                       <>
                         <option value="success">Existing OpenAthan</option>
                         <option value="new-device">New device installation</option>
+                        <option value="waveshare">Connected Waveshare Box V2</option>
+                        <option value="waveshare-new">New Waveshare Box V2 installation</option>
                         <option value="unreadable">OpenAthan status unreadable</option>
                         <option value="denied">No device selected</option>
                         <option value="busy">USB port busy</option>
diff --git a/site/release-selection.ts b/site/release-selection.ts
index baf8ed0..8c414a7 100644
--- a/site/release-selection.ts
+++ b/site/release-selection.ts
@@ -12,6 +12,7 @@ export async function siteSelection(): Promise<Selection> {
     return {
       schema: 1,
       automatic: policy.automatic,
+      ...(policy.hardwareReleases ? { hardwareReleases: policy.hardwareReleases } : {}),
       ...(policy.usbUpdateEnabled === undefined
         ? {}
         : { usbUpdateEnabled: policy.usbUpdateEnabled }),
diff --git a/tests/browser/installer.spec.ts b/tests/browser/installer.spec.ts
index 5a3d373..95e6b53 100644
--- a/tests/browser/installer.spec.ts
+++ b/tests/browser/installer.spec.ts
@@ -22,7 +22,8 @@ async function connect(page: Page) {
 async function install(page: Page) {
   await connect(page);
   await expect(page.getByRole('button', { name: 'Install OpenAthan', exact: true })).toBeDisabled();
-  await page.getByLabel(/I have an AtomS3R/).check();
+  await page.getByLabel('Speaker model').selectOption('atoms3r-c126-pyramid-a167');
+  await page.getByLabel(/I have an? AtomS3R/).check();
   await page.getByRole('button', { name: 'Install OpenAthan', exact: true }).click();
   await expect(page.getByRole('heading', { name: 'Connect to your Wi-Fi' })).toBeVisible();
 }
@@ -177,7 +178,8 @@ test('password validation and lost acknowledgement do not silently repeat writes
 test('interrupted flashing gives a recovery exit', async ({ page }) => {
   await demo(page, 'flash-failed');
   await connect(page);
-  await page.getByLabel(/I have an AtomS3R/).check();
+  await page.getByLabel('Speaker model').selectOption('atoms3r-c126-pyramid-a167');
+  await page.getByLabel(/I have an? AtomS3R/).check();
   await page.getByRole('button', { name: 'Install OpenAthan', exact: true }).click();
   await expect(page.getByRole('heading', { name: 'Installation needs attention' })).toBeVisible();
   await expect(page.getByRole('button', { name: 'Disconnect and start again' })).toBeEnabled();
@@ -227,7 +229,8 @@ for (const action of ['Back to connection']) {
     await expect(
       page.locator('[data-panel]').getByRole('link', { name: 'Troubleshooting', exact: true }),
     ).toBeVisible();
-    await page.getByLabel(/I have an AtomS3R/).check();
+    await page.getByLabel('Speaker model').selectOption('atoms3r-c126-pyramid-a167');
+    await page.getByLabel(/I have an? AtomS3R/).check();
     await expect(
       page.getByRole('button', { name: 'Install OpenAthan', exact: true }),
     ).toBeEnabled();
@@ -245,3 +248,38 @@ for (const action of ['Back to connection']) {
     );
   });
 }
+
+test('Waveshare fresh installation requires model selection and a renewed erase confirmation', async ({
+  page,
+}) => {
+  await demo(page, 'waveshare-new');
+  await connect(page);
+  const installButton = page.getByRole('button', { name: 'Install OpenAthan', exact: true });
+  await expect(installButton).toBeDisabled();
+  await page.getByLabel('Speaker model').selectOption('waveshare-esp32-s3-touch-lcd-1_85c-box-v2');
+  await page.getByLabel(/I have a Waveshare Box V2/).check();
+  await expect(installButton).toBeEnabled();
+  await page.getByLabel('Speaker model').selectOption('atoms3r-c126-pyramid-a167');
+  await expect(installButton).toBeDisabled();
+  await page.getByLabel('Speaker model').selectOption('waveshare-esp32-s3-touch-lcd-1_85c-box-v2');
+  await page.getByLabel(/I have a Waveshare Box V2/).check();
+  await installButton.click();
+  await expect(page.getByRole('heading', { name: 'Connect to your Wi-Fi' })).toBeVisible();
+  await saveWifi(page);
+  await page.getByLabel('Device password', { exact: true }).fill('made-up device secret');
+  await page.getByLabel('Repeat password').fill('made-up device secret');
+  await page.getByRole('button', { name: 'Save device password' }).click();
+  await expect(page.getByText('Use the Waveshare rear USB-C port for normal power.')).toBeVisible();
+  await expect(page.getByText(/Pyramid’s bottom USB-C power/)).toHaveCount(0);
+});
+
+test('recognized Waveshare uses its identity without fresh-install choices', async ({ page }) => {
+  await demo(page, 'waveshare');
+  await connect(page);
+  await expect(page.getByRole('heading', { name: 'Your OpenAthan is connected' })).toBeVisible();
+  await expect(
+    page.locator('[data-panel]').getByText('Waveshare Box V2', { exact: true }),
+  ).toBeVisible();
+  await expect(page.getByLabel('Speaker model')).toHaveCount(0);
+  await expect(page.getByRole('button', { name: 'Install OpenAthan', exact: true })).toHaveCount(0);
+});
diff --git a/tests/browser/usb-update.spec.ts b/tests/browser/usb-update.spec.ts
index e56d740..ec53784 100644
--- a/tests/browser/usb-update.spec.ts
+++ b/tests/browser/usb-update.spec.ts
@@ -1,11 +1,13 @@
 import { test, expect, type Page } from '@playwright/test';
 import { mkdir } from 'node:fs/promises';
 import { resolve } from 'node:path';
+import { HARDWARE, WAVESHARE, type Hardware } from '../../installer/release';
 import type { DeviceStatus } from '../../installer/protocol';
 import type { InstallerService } from '../../installer/service';
 import type { UpgradeCheck, UpgradeOffer } from '../../installer/upgrade';
 
 interface HandoffOptions {
+  hardware?: Hardware;
   cleanup?: 'reject' | 'pending';
   transfer?: 'failed' | 'uncertain';
   queuedDisconnect?: boolean;
@@ -76,7 +78,9 @@ async function injectHandoffService(page: Page, options: HandoffOptions = {}) {
       throw new Error(`Unexpected ${operation} operation`);
     };
     const missingWifi = options.missingWifi || options.missingCredentials;
+    const hardware = options.hardware ?? 'atoms3r-c126-pyramid-a167';
     const status: DeviceStatus = {
+      hardware,
       wifi: missingWifi ? '2' : '4',
       password: options.missingPassword || options.missingCredentials ? 'absent' : 'ready',
       setup: 'active',
@@ -86,6 +90,7 @@ async function injectHandoffService(page: Page, options: HandoffOptions = {}) {
       urls: missingWifi ? [] : ['http://openathan-test.local/', 'http://192.168.1.50/'],
     };
     const offer: UpgradeOffer = {
+      hardware,
       version: 'v0.5.0',
       commit: 'b'.repeat(40),
       bytes: 1024,
@@ -100,7 +105,7 @@ async function injectHandoffService(page: Page, options: HandoffOptions = {}) {
       installAvailable: false,
       async connect() {
         counts.connect++;
-        return { kind: 'existing', status };
+        return { kind: 'existing', status, hardware };
       },
       async checkUpdate() {
         counts.checkUpdate++;
@@ -141,6 +146,7 @@ async function injectHandoffService(page: Page, options: HandoffOptions = {}) {
       async firmware() {
         counts.firmware++;
         return {
+          hardware,
           version: 'v0.4.0',
           commit: 'a'.repeat(40),
           supported: true,
@@ -385,6 +391,48 @@ async function expectOperations(page: Page, update: number, close: number, firmw
   expect(await page.evaluate(() => window.usbHandoffFixture.unexpectedOperations)).toEqual([]);
 }
 
+for (const hardware of [HARDWARE, WAVESHARE] as const) {
+  test(`firmware review uses ${hardware} power instructions without writing`, async ({
+    page,
+  }, testInfo) => {
+    await injectHandoffService(page, { hardware, deferCheck: true });
+    await page.getByRole('button', { name: 'Check for updates' }).press('Enter');
+    await page.getByRole('button', { name: 'Review update' }).press('Enter');
+    await expect(page.getByRole('heading', { name: 'Review firmware update' })).toBeFocused();
+    const panel = page.locator('[data-panel]');
+    if (hardware === WAVESHARE) {
+      await expect(
+        panel.getByText(
+          'Keep the Waveshare rear USB-C cable connected during transfer. After verification, press RESET to restart and complete startup checks.',
+          { exact: true },
+        ),
+      ).toBeVisible();
+      await expect(panel).not.toContainText(/Atom|Pyramid/);
+    } else {
+      await expect(
+        panel.getByText(
+          'Keep Atom USB connected during transfer. After verification, you’ll switch to Pyramid bottom power.',
+          { exact: true },
+        ),
+      ).toBeVisible();
+      await expect(panel).not.toContainText(/Waveshare|RESET/);
+    }
+    await expect(page.getByRole('button', { name: 'Install update', exact: true })).toBeEnabled();
+    expect(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth)).toBe(
+      true,
+    );
+    await expectOperations(page, 0, 0);
+    const capture = process.env.OPENATHAN_REVIEW_DIR;
+    if (capture && ['chromium', 'mobile'].includes(testInfo.project.name)) {
+      await mkdir(capture, { recursive: true });
+      await page.screenshot({
+        path: resolve(capture, `${hardware}-${testInfo.project.name}-review.png`),
+        fullPage: true,
+      });
+    }
+  });
+}
+
 test('verified update retains the power handoff when USB cleanup rejects', async ({
   page,
 }, testInfo) => {
@@ -894,6 +942,7 @@ test('post-install Back preserves installation and cannot return to erase confir
   await page.goto('/preview/installer/');
   await page.getByLabel('Preview scenario').selectOption('new-device');
   await page.getByRole('button', { name: 'Connect simulated device' }).click();
+  await page.getByLabel('Speaker model').selectOption('atoms3r-c126-pyramid-a167');
   await page.getByLabel(/I have an AtomS3R/).check();
   await page.getByRole('button', { name: 'Install OpenAthan', exact: true }).click();
   await page.getByRole('button', { name: 'Back', exact: true }).click();
diff --git a/tests/unit/hardware.test.ts b/tests/unit/hardware.test.ts
new file mode 100644
index 0000000..eae1e56
--- /dev/null
+++ b/tests/unit/hardware.test.ts
@@ -0,0 +1,150 @@
+import { expect, it, vi } from 'vitest';
+import {
+  HARDWARE,
+  WAVESHARE,
+  HARDWARE_PROFILES,
+  assetName,
+  checkedManifest,
+  parseManifest,
+  parseHardwareReleases,
+  sha256,
+  verifyBundle,
+} from '../../installer/release';
+import { parseFirmware } from '../../installer/upgrade';
+import { flashBundle } from '../../installer/flasher';
+import { fixture } from './fixtures/release';
+import {
+  needsDeployment,
+  parsePolicy,
+  parseSelection,
+  resolveHardwareReleases,
+} from '../../tools/release-selection';
+
+async function waveshareFixture() {
+  const f = await fixture();
+  f.factory[3] = f.factory[0x10003] = 0x40;
+  const manifest = {
+    ...f.manifest,
+    hardware: WAVESHARE,
+    flashBytes: 0x1000000,
+    parts: f.manifest.parts.map((part) =>
+      part.role === 'factory'
+        ? { ...part, file: assetName(WAVESHARE, part.file), sha256: '' }
+        : part,
+    ),
+  };
+  manifest.parts[0]!.sha256 = await sha256(f.factory);
+  const bytes = new TextEncoder().encode(JSON.stringify(manifest));
+  const pin = {
+    ...f.pin,
+    hardware: WAVESHARE as typeof WAVESHARE,
+    manifestSha256: await sha256(bytes),
+  };
+  const inputs = new Map([
+    [assetName(WAVESHARE, 'firmware.factory.bin'), f.factory],
+    ['athan-audio.bin', f.audio],
+  ]);
+  return { ...f, manifest, bytes, pin, inputs };
+}
+it('binds a Waveshare manifest and factory to 16 MiB hardware', async () => {
+  const f = await waveshareFixture();
+  const manifest = await checkedManifest(f.bytes, f.pin);
+  const bundle = await verifyBundle(manifest, f.inputs);
+  expect(() => parseManifest(f.manifest, { ...f.pin, hardware: HARDWARE })).toThrow();
+  const programmer = {
+    inspect: vi.fn(async () => ({ chip: 'ESP32-S3', flashBytes: 0x800000, secured: false })),
+    write: vi.fn(),
+    digest: vi.fn(),
+    restart: vi.fn(),
+    close: vi.fn(),
+  };
+  await expect(flashBundle(programmer, bundle, true, () => {})).rejects.toThrow('hardware');
+  expect(programmer.write).not.toHaveBeenCalled();
+  f.factory[0x10003] = 0x30;
+  manifest.parts[0]!.sha256 = await sha256(f.factory);
+  await expect(verifyBundle(manifest, f.inputs)).rejects.toThrow('capacity');
+});
+it('recognizes hardware in new INFO and preserves legacy Atom compatibility', () => {
+  const fields = ['1', 'v0.4.0', 'a'.repeat(40), 'supported', 'idle', 'confirmed', '', '', '0'];
+  expect(parseFirmware(fields).hardware).toBe(HARDWARE);
+  expect(parseFirmware([...fields, WAVESHARE]).hardware).toBe(WAVESHARE);
+  expect(() => parseFirmware([...fields, 'waveshare-v1'])).toThrow();
+});
+it('validates hardware pins and includes them in deployment decisions', () => {
+  const pin = {
+    tag: 'v0.5.0',
+    manifestSha256: 'a'.repeat(64),
+    mediaReviewed: true as const,
+    hardwareQualified: true as const,
+  };
+  expect(() => parseHardwareReleases({ other: pin })).toThrow();
+  expect(() => parsePolicy({ schema: 1, release: { ...pin, hardware: WAVESHARE } })).toThrow(
+    'Atom',
+  );
+  const additional = parseHardwareReleases({ [WAVESHARE]: pin });
+  expect(additional[WAVESHARE]?.hardware).toBe(WAVESHARE);
+  expect(() =>
+    parseSelection({
+      schema: 1,
+      automatic: true,
+      policySha256: 'a'.repeat(64),
+      websiteCommit: 'b'.repeat(40),
+      release: pin,
+      hardwareReleases: { [WAVESHARE]: { ...pin, tag: 'v0.4.0' } },
+    }),
+  ).toThrow();
+  const deployed = { schema: 1 as const, websiteCommit: 'b'.repeat(40), release: pin };
+  expect(needsDeployment({ ...deployed, hardwareReleases: additional }, deployed)).toBe(true);
+  expect(HARDWARE_PROFILES[WAVESHARE].flashBytes).toBe(0x1000000);
+});
+it('automatically selects a same-source Waveshare manifest and rejects mismatched source', async () => {
+  const atom = await fixture(),
+    wave = await waveshareFixture();
+  const release = {
+    draft: false,
+    prerelease: false,
+    tag_name: atom.pin.tag,
+    published_at: '2026-10-10T00:00:00Z',
+    assets: [
+      {
+        name: 'manifest.json',
+        size: atom.bytes.length,
+        browser_download_url: `https://github.com/OpenAthan-Project/openathan/releases/download/${atom.pin.tag}/manifest.json`,
+      },
+      {
+        name: assetName(WAVESHARE, 'manifest.json'),
+        size: wave.bytes.length,
+        browser_download_url: `https://github.com/OpenAthan-Project/openathan/releases/download/${atom.pin.tag}/${assetName(WAVESHARE, 'manifest.json')}`,
+      },
+    ],
+  };
+  const fetcher = vi.fn(
+    async (url: string | URL | Request) =>
+      new Response(
+        String(url).endsWith('waveshare-box-v2.manifest.json')
+          ? wave.bytes
+          : String(url).endsWith('/manifest.json')
+            ? atom.bytes
+            : JSON.stringify(release),
+      ),
+  ) as unknown as typeof fetch;
+  expect(
+    (await resolveHardwareReleases({ automatic: true, pin: atom.pin }, atom.pin, fetcher))[
+      WAVESHARE
+    ]?.hardware,
+  ).toBe(WAVESHARE);
+  wave.bytes = new TextEncoder().encode(
+    JSON.stringify({
+      ...wave.manifest,
+      commit: 'b'.repeat(40),
+      media: {
+        ...wave.manifest.media,
+        licenseUrl: `https://github.com/OpenAthan-Project/openathan/blob/${'b'.repeat(40)}/AUDIO-LICENSES.md`,
+      },
+    }),
+  );
+  release.assets[1]!.size = wave.bytes.length;
+  await expect(
+    resolveHardwareReleases({ automatic: true, pin: atom.pin }, atom.pin, fetcher),
+  ).rejects.toThrow('different source');
+});
diff --git a/tests/unit/recovery.test.ts b/tests/unit/recovery.test.ts
index bc1251d..e8980cc 100644
--- a/tests/unit/recovery.test.ts
+++ b/tests/unit/recovery.test.ts
@@ -15,7 +15,10 @@ vi.mock('../../installer/flasher', () => ({
   flashBundle: hooks.flash,
   serialProgrammer: hooks.programmer,
 }));
-vi.mock('../../installer/release', () => ({ loadRelease: hooks.bundle }));
+vi.mock('../../installer/release', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('../../installer/release')>()),
+  loadRelease: hooks.bundle,
+}));
 import { RealService } from '../../installer/real-service';
 
 const pin = {
diff --git a/tools/check-static.mjs b/tools/check-static.mjs
index be0ace1..9146aea 100644
--- a/tools/check-static.mjs
+++ b/tools/check-static.mjs
@@ -1,6 +1,6 @@
 import { readFile, readdir, stat } from 'node:fs/promises';
 import { resolve, dirname, join } from 'node:path';
-import { checkedManifest, verifyBundle } from '../installer/release.ts';
+import { checkedManifest, verifyBundle, HARDWARE, assetName } from '../installer/release.ts';
 import { verifyDescriptor, verifyApplication } from '../installer/upgrade.ts';
 import { readSelection, metadata, parseMetadata } from './release-selection.ts';
 
@@ -56,33 +56,45 @@ if (!pin && binaries.length)
     'No release is selected, but firmware binaries are present. Remove stale generated release files.',
   );
 if (pin) {
-  const directory = resolve(dist, 'releases', pin.tag);
-  const manifest = await checkedManifest(
-    new Uint8Array(await readFile(join(directory, 'manifest.json'))),
-    pin,
-  );
-  const inputs = new Map();
-  for (const part of manifest.parts)
-    inputs.set(part.file, new Uint8Array(await readFile(join(directory, part.file))));
-  await verifyBundle(manifest, inputs);
-  const otaPath = join(directory, 'firmware.ota.bin');
-  const descriptorPath = join(directory, 'upgrade.json');
-  const hasOta = output.includes(otaPath),
-    hasDescriptor = output.includes(descriptorPath);
-  if (hasOta !== hasDescriptor || (selection.usbUpdateEnabled && !hasOta))
-    throw new Error('Selected USB update artifacts are incomplete.');
-  if (hasOta) {
-    const offer = await verifyDescriptor(new Uint8Array(await readFile(descriptorPath)), manifest);
-    const application = new Uint8Array(await readFile(otaPath));
-    await verifyApplication(offer, application);
-    const factory = inputs.get(manifest.parts.find((part) => part.role === 'factory').file);
-    if (
-      factory.length !== 0x10000 + application.length ||
-      !application.every((byte, i) => byte === factory[0x10000 + i])
-    )
-      throw new Error('USB application differs from the verified factory image.');
+  const expectedBinaries = new Set();
+  for (const boardPin of [pin, ...Object.values(selection.hardwareReleases ?? {})]) {
+    const hardware = boardPin.hardware ?? HARDWARE;
+    const directory = resolve(dist, 'releases', pin.tag);
+    const manifest = await checkedManifest(
+      new Uint8Array(await readFile(join(directory, assetName(hardware, 'manifest.json')))),
+      boardPin,
+    );
+    const inputs = new Map();
+    for (const part of manifest.parts)
+      inputs.set(part.file, new Uint8Array(await readFile(join(directory, part.file))));
+    await verifyBundle(manifest, inputs);
+    const otaPath = join(directory, assetName(hardware, 'firmware.ota.bin'));
+    const descriptorPath = join(directory, assetName(hardware, 'upgrade.json'));
+    const hasOta = output.includes(otaPath),
+      hasDescriptor = output.includes(descriptorPath);
+    if (hasOta !== hasDescriptor || (selection.usbUpdateEnabled && !hasOta))
+      throw new Error('Selected USB update artifacts are incomplete.');
+    if (hasOta) {
+      const offer = await verifyDescriptor(
+        new Uint8Array(await readFile(descriptorPath)),
+        manifest,
+      );
+      const application = new Uint8Array(await readFile(otaPath));
+      await verifyApplication(offer, application);
+      const factory = inputs.get(manifest.parts.find((part) => part.role === 'factory').file);
+      if (
+        factory.length !== 0x10000 + application.length ||
+        !application.every((byte, i) => byte === factory[0x10000 + i])
+      )
+        throw new Error('USB application differs from the verified factory image.');
+    }
+    for (const part of manifest.parts) expectedBinaries.add(join(directory, part.file));
+    if (hasOta) expectedBinaries.add(otaPath);
   }
-  if (binaries.length !== manifest.parts.length + Number(hasOta))
+  if (
+    binaries.length !== expectedBinaries.size ||
+    binaries.some((path) => !expectedBinaries.has(path))
+  )
     throw new Error('Unexpected release binaries in static output.');
 }
 console.log(
diff --git a/tools/import-release.ts b/tools/import-release.ts
index 7be9fac..33b25b4 100644
--- a/tools/import-release.ts
+++ b/tools/import-release.ts
@@ -2,7 +2,13 @@
 import { mkdir, writeFile, rename, rm } from 'node:fs/promises';
 import { execFileSync } from 'node:child_process';
 import { resolve } from 'node:path';
-import { checkedManifest, verifyBundle } from '../installer/release.ts';
+import {
+  checkedManifest,
+  verifyBundle,
+  HARDWARE,
+  assetName,
+  type ReleasePin,
+} from '../installer/release.ts';
 import { verifyDescriptor, verifyApplication } from '../installer/upgrade.ts';
 import { publishedRelease, readSelection, releaseAsset } from './release-selection.ts';
 
@@ -14,47 +20,72 @@ if (!process.argv.includes('--snapshot'))
     ['--experimental-strip-types', resolve(root, 'tools/select-release.ts')],
     { stdio: 'inherit' },
   );
-const { release: pin } = await readSelection(root);
+const selection = await readSelection(root);
+const { release: pin } = selection;
 const directory = resolve(root, 'public/releases');
 if (!pin) {
   await rm(directory, { force: true, recursive: true });
   console.log('Recovery only; generated firmware imports removed.');
 } else {
-  const release = await publishedRelease(pin.tag);
-  const manifestBytes = await releaseAsset(release, 'manifest.json', 16_384);
-  const manifest = await checkedManifest(manifestBytes, pin);
-  const inputs = new Map<string, Uint8Array>();
-  for (const part of manifest.parts)
-    inputs.set(part.file, await releaseAsset(release, part.file, part.bytes));
-  await verifyBundle(manifest, inputs);
-  const upgradeAssets = release.assets.filter(
-    (asset) =>
-      asset &&
-      typeof asset === 'object' &&
-      ['upgrade.json', 'firmware.ota.bin'].includes((asset as { name: string }).name),
-  );
-  if (upgradeAssets.length) {
-    if (upgradeAssets.length !== 2) throw new Error('Incomplete upgrade asset pair.');
-    const descriptor = await releaseAsset(release, 'upgrade.json', 8192),
-      offer = await verifyDescriptor(descriptor, manifest);
-    const application = await releaseAsset(release, 'firmware.ota.bin', offer.bytes);
-    await verifyApplication(offer, application);
-    const factory = inputs.get('firmware.factory.bin');
-    if (
-      !factory ||
-      factory.length !== 0x10000 + application.length ||
-      !application.every((byte, i) => byte === factory[0x10000 + i])
-    )
-      throw new Error('Upgrade differs from the selected factory application.');
-    inputs.set('upgrade.json', descriptor);
-    inputs.set('firmware.ota.bin', application);
+  const pins = [pin, ...Object.values(selection.hardwareReleases ?? {})] as ReleasePin[];
+  const verified = new Map<string, Uint8Array>();
+  let sourceCommit: string | undefined;
+  for (const boardPin of pins) {
+    const hardware = boardPin.hardware ?? HARDWARE;
+    const release = await publishedRelease(boardPin.tag);
+    const manifestBytes = await releaseAsset(release, assetName(hardware, 'manifest.json'), 16_384);
+    const manifest = await checkedManifest(manifestBytes, boardPin);
+    if (sourceCommit && sourceCommit !== manifest.commit)
+      throw new Error('Hardware bundles use different source commits.');
+    sourceCommit = manifest.commit;
+    const inputs = new Map<string, Uint8Array>();
+    for (const part of manifest.parts)
+      inputs.set(part.file, await releaseAsset(release, part.file, part.bytes));
+    await verifyBundle(manifest, inputs);
+    const upgradeAssets = release.assets.filter(
+      (asset) =>
+        asset &&
+        typeof asset === 'object' &&
+        [assetName(hardware, 'upgrade.json'), assetName(hardware, 'firmware.ota.bin')].includes(
+          (asset as { name: string }).name,
+        ),
+    );
+    if (upgradeAssets.length) {
+      if (upgradeAssets.length !== 2) throw new Error('Incomplete upgrade asset pair.');
+      const descriptor = await releaseAsset(release, assetName(hardware, 'upgrade.json'), 8192),
+        offer = await verifyDescriptor(descriptor, manifest);
+      const application = await releaseAsset(
+        release,
+        assetName(hardware, 'firmware.ota.bin'),
+        offer.bytes,
+      );
+      await verifyApplication(offer, application);
+      const factory = inputs.get(assetName(hardware, 'firmware.factory.bin'));
+      if (
+        !factory ||
+        factory.length !== 0x10000 + application.length ||
+        !application.every((byte, i) => byte === factory[0x10000 + i])
+      )
+        throw new Error('Upgrade differs from the selected factory application.');
+      inputs.set(assetName(hardware, 'upgrade.json'), descriptor);
+      inputs.set(assetName(hardware, 'firmware.ota.bin'), application);
+    }
+    verified.set(assetName(hardware, 'manifest.json'), manifestBytes);
+    for (const [name, bytes] of inputs) {
+      const shared = verified.get(name);
+      if (
+        shared &&
+        (shared.length !== bytes.length || !shared.every((byte, i) => byte === bytes[i]))
+      )
+        throw new Error('Shared hardware asset differs.');
+      verified.set(name, bytes);
+    }
   }
   const temporary = resolve(root, 'build/release-import');
   await rm(temporary, { force: true, recursive: true });
   try {
     await mkdir(resolve(temporary, pin.tag), { recursive: true });
-    await writeFile(resolve(temporary, pin.tag, 'manifest.json'), manifestBytes);
-    for (const [name, bytes] of inputs) await writeFile(resolve(temporary, pin.tag, name), bytes);
+    for (const [name, bytes] of verified) await writeFile(resolve(temporary, pin.tag, name), bytes);
     // Remove only generated imports, after every candidate byte has passed validation.
     await rm(directory, { force: true, recursive: true });
     await rename(temporary, directory);
diff --git a/tools/release-selection.ts b/tools/release-selection.ts
index 0559bab..ba53084 100644
--- a/tools/release-selection.ts
+++ b/tools/release-selection.ts
@@ -1,17 +1,29 @@
 /** Build-only release discovery. Publication as stable latest is the human approval gate. */
 import { readFile, mkdir, writeFile, rename } from 'node:fs/promises';
 import { resolve } from 'node:path';
-import { checkedManifest, parsePin, sha256, type ReleasePin } from '../installer/release.ts';
+import {
+  checkedManifest,
+  parsePin,
+  parseHardwareReleases,
+  HARDWARE,
+  WAVESHARE,
+  assetName,
+  sha256,
+  type HardwareReleases,
+  type ReleasePin,
+} from '../installer/release.ts';
 
 export const FIRMWARE_API = 'https://api.github.com/repos/OpenAthan-Project/openathan';
 export const WEBSITE_API = 'https://api.github.com/repos/OpenAthan-Project/website';
 export const DEPLOYED_METADATA = 'https://openathan.com/release.json';
 export interface Policy {
+  hardwareReleases?: HardwareReleases;
   usbUpdateEnabled?: boolean;
   automatic: boolean;
   pin: ReleasePin | null;
 }
 export interface Selection {
+  hardwareReleases?: HardwareReleases;
   usbUpdateEnabled?: boolean;
   schema: 1;
   automatic: boolean;
@@ -20,12 +32,15 @@ export interface Selection {
   release: ReleasePin | null;
 }
 export interface Metadata {
+  hardwareReleases?: HardwareReleases;
   schema: 1;
   websiteCommit: string;
   release: { tag: string; manifestSha256: string } | null;
 }
 export function parsePolicy(value: unknown): Policy {
   const pin = parsePin(value);
+  const hardwareReleases = parseHardwareReleases((value as Policy).hardwareReleases);
+  validateHardwareSelection(pin, hardwareReleases);
   const automatic = (value as { automatic?: unknown }).automatic;
   if (automatic !== undefined && typeof automatic !== 'boolean')
     throw new Error('Invalid automatic release policy.');
@@ -35,6 +50,7 @@ export function parsePolicy(value: unknown): Policy {
   return {
     automatic: automatic === true,
     pin,
+    ...(Object.keys(hardwareReleases).length ? { hardwareReleases } : {}),
     ...(usbUpdateEnabled === undefined ? {} : { usbUpdateEnabled }),
   };
 }
@@ -50,18 +66,33 @@ export function parseSelection(value: unknown): Selection {
     !/^[a-f0-9]{40}$/.test(s.websiteCommit)
   )
     throw new Error('Invalid build release selection.');
-  return { ...s, release: pin };
+  const hardwareReleases = parseHardwareReleases(s.hardwareReleases);
+  validateHardwareSelection(pin, hardwareReleases);
+  return {
+    ...s,
+    release: pin,
+    ...(Object.keys(hardwareReleases).length ? { hardwareReleases } : {}),
+  };
 }
 export function metadata(selection: Selection): Metadata {
   return {
     schema: 1,
     websiteCommit: selection.websiteCommit,
+    ...(selection.hardwareReleases ? { hardwareReleases: selection.hardwareReleases } : {}),
     release: selection.release && {
       tag: selection.release.tag,
       manifestSha256: selection.release.manifestSha256,
     },
   };
 }
+function validateHardwareSelection(pin: ReleasePin | null, hardwareReleases: HardwareReleases) {
+  if (pin?.hardware !== undefined && pin.hardware !== HARDWARE)
+    throw new Error('The primary release must remain the Atom bundle.');
+  if (pin && Object.values(hardwareReleases).some((other) => other?.tag !== pin.tag))
+    throw new Error('Hardware bundles must use the same release tag.');
+  if (!pin && Object.keys(hardwareReleases).length)
+    throw new Error('Disabled installation cannot select additional hardware.');
+}
 export function parseMetadata(value: unknown): Metadata {
   if (!value || typeof value !== 'object' || Array.isArray(value))
     throw new Error('Invalid deployed release metadata.');
@@ -79,6 +110,15 @@ export function sameRelease(a: Metadata['release'], b: Metadata['release']): boo
   return a?.tag === b?.tag && a?.manifestSha256 === b?.manifestSha256;
 }
 export function needsDeployment(candidate: Metadata, deployed: Metadata | null): boolean {
+  const next = candidate.hardwareReleases?.[WAVESHARE],
+    previous = deployed?.hardwareReleases?.[WAVESHARE];
+  if (
+    next &&
+    previous &&
+    next.tag === previous.tag &&
+    next.manifestSha256 !== previous.manifestSha256
+  )
+    throw new Error('A served hardware manifest changed. Publish a new release tag.');
   if (
     candidate.release &&
     deployed?.release &&
@@ -89,7 +129,9 @@ export function needsDeployment(candidate: Metadata, deployed: Metadata | null):
   return (
     !deployed ||
     !sameRelease(candidate.release, deployed.release) ||
-    candidate.websiteCommit !== deployed.websiteCommit
+    candidate.websiteCommit !== deployed.websiteCommit ||
+    JSON.stringify(candidate.hardwareReleases ?? {}) !==
+      JSON.stringify(deployed.hardwareReleases ?? {})
   );
 }
 /** Bound streamed bytes even when Content-Length is absent or incorrect. */
@@ -216,6 +258,31 @@ export async function resolveRelease(
     throw new Error('Release tag does not match its source commit.');
   return pin;
 }
+/** Legacy releases omit Waveshare assets. New stable releases include a matched pair of boards. */
+export async function resolveHardwareReleases(
+  policy: Policy,
+  pin: ReleasePin | null,
+  fetcher: typeof fetch = fetch,
+): Promise<HardwareReleases> {
+  if (!pin) return {};
+  if (!policy.automatic) return policy.hardwareReleases ?? {};
+  const release = await publishedRelease(pin.tag, fetcher);
+  const name = assetName(WAVESHARE, 'manifest.json');
+  const present = release.assets.some(
+    (asset) => !!asset && typeof asset === 'object' && (asset as { name?: string }).name === name,
+  );
+  if (!present) return {};
+  const bytes = await releaseAsset(release, name, 16384, fetcher);
+  const selected: ReleasePin = { ...pin, hardware: WAVESHARE, manifestSha256: await sha256(bytes) };
+  const manifest = await checkedManifest(bytes, selected);
+  const reference = await checkedManifest(
+    await releaseAsset(release, 'manifest.json', 16384, fetcher),
+    pin,
+  );
+  if (manifest.commit !== reference.commit)
+    throw new Error('Hardware bundles use different source commits.');
+  return { [WAVESHARE]: selected };
+}
 export async function deployedMetadata(fetcher: typeof fetch = fetch): Promise<Metadata | null> {
   const bytes = await download(DEPLOYED_METADATA, 4096, fetcher, true);
   return bytes === null ? null : parseMetadata(parseBytes(bytes));
@@ -232,9 +299,20 @@ export async function freshSelection(
     throw new Error('Invalid website main commit.');
   if (head.sha !== selection.websiteCommit) return false;
   const release = await resolveRelease(policy, fetcher);
+  const hardwareReleases = await resolveHardwareReleases(policy, release, fetcher);
   // Also detect tag mutation against the currently served release at deployment time.
-  needsDeployment(metadata({ ...selection, release }), await deployedMetadata(fetcher));
-  return sameRelease(release, selection.release);
+  needsDeployment(
+    metadata({
+      ...selection,
+      release,
+      hardwareReleases: Object.keys(hardwareReleases).length ? hardwareReleases : undefined,
+    }),
+    await deployedMetadata(fetcher),
+  );
+  return (
+    sameRelease(release, selection.release) &&
+    JSON.stringify(hardwareReleases) === JSON.stringify(selection.hardwareReleases ?? {})
+  );
 }
 export async function readPolicy(root = process.cwd()) {
   const bytes = new Uint8Array(await readFile(resolve(root, 'installer/catalog.json')));
@@ -250,6 +328,9 @@ export async function readSelection(root = process.cwd()): Promise<Selection> {
     selection.usbUpdateEnabled !== policy.usbUpdateEnabled ||
     selection.automatic !== policy.automatic ||
     (!policy.automatic && !sameRelease(selection.release, policy.pin)) ||
+    (!policy.automatic &&
+      JSON.stringify(selection.hardwareReleases ?? {}) !==
+        JSON.stringify(policy.hardwareReleases ?? {})) ||
     (!policy.pin && selection.release)
   )
     throw new Error('Release policy changed. Run npm run release:select again.');
diff --git a/tools/select-release.ts b/tools/select-release.ts
index fc10c6b..18aa0f0 100644
--- a/tools/select-release.ts
+++ b/tools/select-release.ts
@@ -8,6 +8,7 @@ import {
   parseSelection,
   readPolicy,
   resolveRelease,
+  resolveHardwareReleases,
   writeSelection,
 } from './release-selection.ts';
 
@@ -26,13 +27,16 @@ if (process.argv.includes('--freshness')) {
   );
 } else {
   const websiteCommit = execFileSync('git', ['rev-parse', 'HEAD'], { encoding: 'utf8' }).trim();
+  const release = await resolveRelease(policy);
+  const hardwareReleases = await resolveHardwareReleases(policy, release);
   const selection = parseSelection({
     schema: 1,
     automatic: policy.automatic,
     ...(policy.usbUpdateEnabled === undefined ? {} : { usbUpdateEnabled: policy.usbUpdateEnabled }),
     policySha256,
     websiteCommit,
-    release: await resolveRelease(policy),
+    release,
+    ...(Object.keys(hardwareReleases).length ? { hardwareReleases } : {}),
   });
   const changed =
     process.argv.includes('--deployed') || process.argv.includes('--poll')