diff --git a/meta-forgefirm/recipes-forgefirm/images/forgefirm-image-dev.bb b/meta-forgefirm/recipes-forgefirm/images/forgefirm-image-dev.bb
index a88cc45..baf6d53 100644
--- a/meta-forgefirm/recipes-forgefirm/images/forgefirm-image-dev.bb
+++ b/meta-forgefirm/recipes-forgefirm/images/forgefirm-image-dev.bb
@@ -1,15 +1,14 @@
-require recipes-glowforge/images/glowforge-image.bb
+require forgefirm-image.bb
 
 DESCRIPTION = "OpenGlow/ForgeFIRM development image for Glowforge"
 
+# Strict superset of forgefirm-image (audit N12): everything the main image
+# ships (incl. the gfui-client removal and v4l-utils), plus the forgectrl
+# placeholder and debug tooling.
 IMAGE_INSTALL += " \
   forgectrl \
 "
 
-IMAGE_INSTALL:remove = " \
-  gfui-client \
-"
-
 IMAGE_FEATURES += " \
   tools-debug \
 "