diff --git a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
index bc3f31b..f643373 100644
--- a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
+++ b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
@@ -1,5 +1,4 @@
 require conf/distro/openbmc-phosphor.conf
 
 DISTRO_FEATURES_remove = "avahi"
-DISTRO_FEATURES_remove = "ldap"
 DISTRO_FEATURES_remove = "slp"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 1ad5f9d..d4f5684 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -3,3 +3,4 @@
 OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys"
 OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " gsj-hotswap-change-setting"
 OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " iperf3"
+IMAGE_FEATURES_remove_gsj = "obmc-user-mgmt-ldap"