diff --git a/packages/storybook/src/nimble/wafer-map/wafer-map-matrix.stories.ts b/packages/storybook/src/nimble/wafer-map/wafer-map-matrix.stories.ts
index e69de29bb2..ecf9ba6f43 100644
--- a/packages/storybook/src/nimble/wafer-map/wafer-map-matrix.stories.ts
+++ b/packages/storybook/src/nimble/wafer-map/wafer-map-matrix.stories.ts
@@ -0,0 +1,230 @@
+import type { StoryFn, Meta } from '@storybook/html';
+import { html, ViewTemplate } from '@microsoft/fast-element';
+import { waferMapTag } from '@ni/nimble-components/dist/esm/wafer-map';
+import { WaferMapOrientation, WaferMapOriginLocation } from '@ni/nimble-components/dist/esm/wafer-map/types';
+import { wafermapDiesTableSets } from './sets';
+import {
+    createMatrix,
+    sharedMatrixParameters,
+    createMatrixThemeStory
+} from '../../utilities/matrix';
+import { createStory } from '../../utilities/storybook';
+
+const colorScale = {
+    colors: ['red', 'blue', 'green'],
+    values: [1, 50, 100]
+} as const;
+
+const waferMapDie = [
+    { x: 0, y: 2, value: '99', tags: ['a'] },
+    { x: 1, y: 2, value: '78', tags: ['a', 'b'] },
+    { x: 1, y: 1, value: '88', tags: ['a'] },
+    { x: 1, y: 3, value: '68' },
+    { x: 2, y: 2, value: '99' },
+    { x: 2, y: 1, value: '99' },
+    { x: 2, y: 0, value: '80', tags: ['b'] },
+    { x: 2, y: 3, value: '99', tags: ['b', 'a'] },
+    { x: 2, y: 4, value: '100', tags: ['b'] },
+    { x: 3, y: 2, value: '40' },
+    { x: 3, y: 1, value: '10' },
+    { x: 3, y: 3, value: '15' },
+    { x: 4, y: 2, value: '30' }
+] as const;
+
+const colorsScaleStates = [
+    [
+        {
+            colors: ['red', 'orange', 'green'],
+            values: [1, 50, 100]
+        }
+    ],
+    [
+        {
+            colors: ['red', 'purple', 'blue'],
+            values: [1, 50, 100]
+        }
+    ]
+] as const;
+type ColorScaleState = (typeof colorsScaleStates)[number];
+
+const dieLabelHiddenStates = [[true], [false]] as const;
+type DieLabelHiddenState = (typeof dieLabelHiddenStates)[number];
+
+const gridDimensionStates = [
+    [
+        {
+            gridMinX: undefined,
+            gridMaxX: undefined,
+            gridMinY: undefined,
+            gridMaxY: undefined
+        }
+    ],
+    [
+        {
+            gridMinX: 0,
+            gridMaxX: 0,
+            gridMinY: 0,
+            gridMaxY: 0
+        }
+    ],
+    [
+        {
+            gridMinX: 0,
+            gridMaxX: 4,
+            gridMinY: 0,
+            gridMaxY: 0
+        }
+    ],
+    [
+        {
+            gridMinX: 0,
+            gridMaxX: 0,
+            gridMinY: 0,
+            gridMaxY: 4
+        }
+    ],
+    [
+        {
+            gridMinX: 0,
+            gridMaxX: 4,
+            gridMinY: 0,
+            gridMaxY: 4
+        }
+    ]
+] as const;
+type GridDimensionState = (typeof gridDimensionStates)[number];
+
+const highlightedTagStates = [['a'], ['b', 'a'], [], ['']] as const;
+type HighlightedTagState = (typeof highlightedTagStates)[number];
+
+const orientationStates = [
+    [WaferMapOrientation.top],
+    [WaferMapOrientation.bottom],
+    [WaferMapOrientation.left],
+    [WaferMapOrientation.right]
+] as const;
+type OrientationState = (typeof orientationStates)[number];
+
+const originLocationStates = [
+    [WaferMapOriginLocation.topLeft],
+    [WaferMapOriginLocation.bottomLeft],
+    [WaferMapOriginLocation.topRight],
+    [WaferMapOriginLocation.bottomRight]
+] as const;
+type OriginLocationStates = (typeof originLocationStates)[number];
+
+const sizeStates = [70, 200, 300, 400] as const;
+type SizeState = (typeof sizeStates)[number];
+
+const metadata: Meta = {
+    title: 'Tests/Wafer Map',
+    parameters: {
+        ...sharedMatrixParameters()
+    }
+};
+
+export default metadata;
+
+const simpleWaferWithDies = (): ViewTemplate => html`<${waferMapTag}
+    :dies="${() => waferMapDie}"
+    :colorScale="${() => colorScale}"
+>
+</${waferMapTag}>`;
+
+const componentWaferWithOrientation = ([
+    orientation
+]: OrientationState): ViewTemplate => html`<${waferMapTag}
+    orientation="${() => orientation}"
+    :dies="${() => waferMapDie}"
+    :colorScale="${() => colorScale}"
+>
+</${waferMapTag}>`;
+
+const componentWaferWithHiddenDieLabel = (
+    [color]: ColorScaleState,
+    [dieLabelHidden]: DieLabelHiddenState
+): ViewTemplate => html`<${waferMapTag}
+    ?die-labels-hidden=${() => dieLabelHidden}
+    :dies="${() => waferMapDie}"
+    :colorScale="${() => color}"
+>
+</${waferMapTag}>`;
+
+const componentWaferWithOriginLocation = ([
+    originLocation
+]: OriginLocationStates): ViewTemplate => html`<${waferMapTag}
+    :originLocation="${() => originLocation}"
+    :dies="${() => waferMapDie}"
+    :colorScale="${() => colorScale}"
+>
+</${waferMapTag}>`;
+
+const componentWaferResize = (
+    size: SizeState
+): ViewTemplate => html`<${waferMapTag}
+    style="width: ${size}px; height: ${size}px"
+    :dies="${() => waferMapDie}"
+    :colorScale="${() => colorScale}"
+>
+</${waferMapTag}> `;
+
+const componentWaferWithGridDimensions = ([
+    dimensions
+]: GridDimensionState): ViewTemplate => html`<${waferMapTag}
+    :dies="${() => waferMapDie}"
+    :colorScale="${() => colorScale}"
+    :gridMaxX=${() => dimensions.gridMaxX}
+    :gridMaxY=${() => dimensions.gridMaxY}
+    :gridMinX=${() => dimensions.gridMinX}
+    :gridMinY=${() => dimensions.gridMinY}
+>
+</${waferMapTag}>`;
+
+const componentWaferMapWorkerCanvas = (): ViewTemplate => html`<${waferMapTag}
+    :diesTable="${() => wafermapDiesTableSets[0]}"
+>
+</${waferMapTag}>`;
+
+const componentWaferWithHighlightedTags = (
+    tags: HighlightedTagState
+): ViewTemplate => html`<${waferMapTag}
+    :dies="${() => waferMapDie}"
+    :colorScale="${() => colorScale}"
+    :highlightedTags="${() => tags}"
+>
+</${waferMapTag}>`;
+
+export const waferMapThemeMatrix: StoryFn = createMatrixThemeStory(
+    createMatrix(simpleWaferWithDies)
+);
+
+export const waferMapDiesAndOrientationTest: StoryFn = createStory(
+    createMatrix(componentWaferWithOrientation, [orientationStates])
+);
+
+export const waferMapDieLabelAndColorScaleTest: StoryFn = createStory(
+    createMatrix(componentWaferWithHiddenDieLabel, [
+        colorsScaleStates,
+        dieLabelHiddenStates
+    ])
+);
+
+export const waferMapOriginLocationTest: StoryFn = createStory(
+    createMatrix(componentWaferWithOriginLocation, [originLocationStates])
+);
+
+export const waferMapResizeTest: StoryFn = createStory(
+    createMatrix(componentWaferResize, [sizeStates])
+);
+
+export const waferMapGridDimensionsTest: StoryFn = createStory(
+    createMatrix(componentWaferWithGridDimensions, [gridDimensionStates])
+);
+
+export const waferMapHighlightedTest: StoryFn = createStory(
+    createMatrix(componentWaferWithHighlightedTags, [highlightedTagStates])
+);
+
+export const waferMapWorkerCanvas: StoryFn = createStory(
+    createMatrix(componentWaferMapWorkerCanvas)
+);