diff --git a/classes/obmc-phosphor-image.bbclass b/classes/obmc-phosphor-image.bbclass
index 0e699ee..079495b 100644
--- a/classes/obmc-phosphor-image.bbclass
+++ b/classes/obmc-phosphor-image.bbclass
@@ -53,35 +53,6 @@
 # tree under phosphor-ipmi-host
 FEATURE_PACKAGES_obmc-net-ipmi_qemuall = ""
 
-# Install entire Phosphor application stack by default
-IMAGE_FEATURES += " \
-        obmc-bmc-state-mgmt \
-        obmc-chassis-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-fan-control \
-        obmc-fan-mgmt \
-        obmc-flash-mgmt \
-        obmc-host-ctl \
-        obmc-host-ipmi \
-        obmc-host-state-mgmt \
-        obmc-inventory \
-        obmc-leds \
-        obmc-logging-mgmt \
-        obmc-remote-logging-mgmt \
-        obmc-net-ipmi \
-        obmc-sensors \
-        obmc-software \
-        obmc-system-mgmt \
-        obmc-user-mgmt \
-        ssh-server-dropbear \
-        obmc-debug-collector \
-        obmc-network-mgmt \
-        obmc-settings-mgmt \
-        "
-
-IMAGE_FEATURES_append_df-obmc-ubi-fs = " read-only-rootfs"
-IMAGE_FEATURES_append_df-phosphor-mmc = " read-only-rootfs"
-
 CORE_IMAGE_EXTRA_INSTALL_append = " bash \
         packagegroup-obmc-apps-extras \
         packagegroup-obmc-apps-extrasdevtools \
diff --git a/recipes-phosphor/images/obmc-phosphor-image.bb b/recipes-phosphor/images/obmc-phosphor-image.bb
index dc7050a..ccd24be 100644
--- a/recipes-phosphor/images/obmc-phosphor-image.bb
+++ b/recipes-phosphor/images/obmc-phosphor-image.bb
@@ -4,4 +4,31 @@
 
 IMAGE_LINGUAS = ""
 
+IMAGE_FEATURES += " \
+        obmc-bmc-state-mgmt \
+        obmc-chassis-mgmt \
+        obmc-chassis-state-mgmt \
+        obmc-fan-control \
+        obmc-fan-mgmt \
+        obmc-flash-mgmt \
+        obmc-host-ctl \
+        obmc-host-ipmi \
+        obmc-host-state-mgmt \
+        obmc-inventory \
+        obmc-leds \
+        obmc-logging-mgmt \
+        obmc-remote-logging-mgmt \
+        obmc-net-ipmi \
+        obmc-sensors \
+        obmc-software \
+        obmc-system-mgmt \
+        obmc-user-mgmt \
+        ssh-server-dropbear \
+        obmc-debug-collector \
+        obmc-network-mgmt \
+        obmc-settings-mgmt \
+        "
+IMAGE_FEATURES_append_df-obmc-ubi-fs = " read-only-rootfs"
+IMAGE_FEATURES_append_df-phosphor-mmc = " read-only-rootfs"
+
 inherit obmc-phosphor-image