diff --git a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc
index 3a2ec6b..7b1ab65 100644
--- a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc
+++ b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc
@@ -2,7 +2,13 @@
     obmc-net-ipmi \
     obmc-user-mgmt-ldap \
     "
-IMAGE_FEATURES:remove:fb-nohost = "obmc-console"
+IMAGE_FEATURES:remove:fb-nohost = "\
+    obmc-console \
+    ssh-server-dropbear \
+    "
+IMAGE_FEATURES:append:fb-nohost = "\
+    ssh-server-openssh \
+    "
 
 OBMC_IMAGE_EXTRA_INSTALL:append = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \