diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index edac701..85265d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -182,6 +182,8 @@ jobs:
           timezone: Etc/UTC
           hostname: betterframe-kiosk
           compression: xz
+          # Surface pi-gen's stdout/stderr so failures show their real cause.
+          verbose-output: true
 
       - name: List pi-gen output
         run: ls -la deploy/ || true
diff --git a/deploy/pi-gen/stage-betterframe-client/EXPORT_IMAGE b/deploy/pi-gen/stage-betterframe-client/EXPORT_IMAGE
index e69de29..1911cae 100644
--- a/deploy/pi-gen/stage-betterframe-client/EXPORT_IMAGE
+++ b/deploy/pi-gen/stage-betterframe-client/EXPORT_IMAGE
@@ -0,0 +1 @@
+IMG_SUFFIX="-betterframe-client"