diff --git a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc
index 2d73bc1..d15ea10 100644
--- a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc
+++ b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc
@@ -1,13 +1,13 @@
 IMAGE_FEATURES:remove = "\
     obmc-net-ipmi \
     obmc-user-mgmt-ldap \
+    ssh-server-dropbear \
+    "
+IMAGE_FEATURES:append = "\
+    ssh-server-openssh \
     "
 IMAGE_FEATURES:remove:fb-nohost = "\
     obmc-console \
-    ssh-server-dropbear \
-    "
-IMAGE_FEATURES:append:fb-nohost = "\
-    ssh-server-openssh \
     "
 
 OBMC_IMAGE_EXTRA_INSTALL:append = "\