diff --git a/.github/workflows/zephyr-shell.yml b/.github/workflows/zephyr-shell.yml
new file mode 100644
index 000000000000..23f8e6947b22
--- /dev/null
+++ b/.github/workflows/zephyr-shell.yml
@@ -0,0 +1,64 @@
+---
+# SPDX-License-Identifier: BSD-3-Clause
+# Tools that can save round-trips to github and a lot of time:
+#
+# yamllint -f parsable zephyr-shell.yml
+# pip3 install ruamel.yaml.cmd
+# yaml merge-expand zephyr-shell.yml exp.yml && diff -w -u zephyr-shell.yml exp.yml
+#
+# github.com also has a powerful web editor that can be used without
+# committing.
+
+name: Zephyr Shell
+
+# 'workflow_dispatch' allows running this workflow manually from the
+# 'Actions' tab
+# yamllint disable-line rule:truthy
+on: [pull_request, workflow_dispatch]
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    container:
+      image: thesofproject/zephyr-lite:v0.29.0
+
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [tgl, mtl, lnl]
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          path: sof
+          fetch-depth: 0  # fix git describe
+          filter: 'tree:0'
+
+      - name: west update
+        working-directory: sof
+        run: |
+          west init -l
+          west update --narrow --fetch-opt=--depth=5
+
+      - name: print all available sdks in /opt/toolchains/
+        run: |
+          ls -l /opt/toolchains/
+
+      - name: shell build
+        run: |
+          ln -s  /opt/toolchains/zephyr-sdk-*  ~/
+          python sof/scripts/xtensa-build-zephyr.py \
+            --cmake-args=-DEXTRA_CFLAGS=-Werror \
+            --cmake-args=-DEXTRA_CXXFLAGS=-Werror \
+            --cmake-args=-DEXTRA_AFLAGS='-Werror -Wa,--fatal-warnings' \
+            --cmake-args=--warn-uninitialized \
+            --overlay=sof/app/shell_overlay.conf \
+            ${{ matrix.platform }}
diff --git a/zephyr/sof_shell.c b/zephyr/sof_shell.c
index f10a2c9275b5..9e90abe417bb 100644
--- a/zephyr/sof_shell.c
+++ b/zephyr/sof_shell.c
@@ -62,8 +62,8 @@ static int cmd_sof_module_heap_usage(const struct shell *sh,
 			continue;
 
 		usage = module_adapter_heap_usage(comp_mod(icd->cd), &hwm);
-		shell_print(sh, "comp id 0x%08x%9zu usage%9zu hwm %9zu max\tbytes",
-			    icd->id, usage, hwm, comp_mod(icd->cd)->priv.cfg.heap_bytes);
+		shell_print(sh, "comp id 0x%08x%9zu usage%9zu hwm\tbytes",
+			    icd->id, usage, hwm);
 	}
 	return 0;
 }