diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc
similarity index 91%
rename from meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend
rename to meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc
index a13903c..8fa7252 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc
@@ -1,4 +1,4 @@
 OBMC_IMAGE_EXTRA_INSTALL:append = " \
     phosphor-nvme \
     plat-svc \
-"
+    "
diff --git a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc
new file mode 100644
index 0000000..fbc8080
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc
@@ -0,0 +1,9 @@
+IMAGE_FEATURES:remove:fb-nohost = "obmc-console"
+
+OBMC_IMAGE_EXTRA_INSTALL:append = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \
+        bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d), \
+        '', d)} \
+    "
+
+include recipes-phosphor/images/fb-${MACHINE}-phosphor-image.inc
diff --git a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend
index ba9cc1f..23979e6 100644
--- a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,9 +1,5 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+require recipes-phosphor/images/fb-phosphor-image.inc
 
-IMAGE_FEATURES:remove:fb-nohost = "obmc-console"
-
-OBMC_IMAGE_EXTRA_INSTALL:append = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \
-        bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d), \
-        '', d)} \
-    "
+# Please do not add any content directly to this file.  Instead add it to
+# the corresponding .inc file.  Otherwise, builds from facebook/openbmc will
+# not be able to pick up your content.