diff --git a/meta-fii/meta-mori/conf/bblayers.conf.sample b/meta-fii/meta-mori/conf/bblayers.conf.sample
index f0f913c..6d45954 100644
--- a/meta-fii/meta-mori/conf/bblayers.conf.sample
+++ b/meta-fii/meta-mori/conf/bblayers.conf.sample
@@ -10,6 +10,7 @@
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-security \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-nuvoton \
   ##OEROOT##/meta-google \
diff --git a/meta-fii/meta-mori/conf/layer.conf b/meta-fii/meta-mori/conf/layer.conf
index 238b5a9..35a1530 100644
--- a/meta-fii/meta-mori/conf/layer.conf
+++ b/meta-fii/meta-mori/conf/layer.conf
@@ -8,3 +8,4 @@
 BBFILE_COLLECTIONS += "mori-layer"
 BBFILE_PATTERN_mori-layer = "^${LAYERDIR}/"
 LAYERSERIES_COMPAT_mori-layer = "honister kirkstone"
+LAYERDEPENDS_mori-layer = "core phosphor-layer google-layer fii-layer"
diff --git a/meta-fii/meta-mori/conf/machine/mori.conf b/meta-fii/meta-mori/conf/machine/mori.conf
index b4ae271..9205790 100644
--- a/meta-fii/meta-mori/conf/machine/mori.conf
+++ b/meta-fii/meta-mori/conf/machine/mori.conf
@@ -10,6 +10,7 @@
 FLASH_RWFS_OFFSET:flash-65536 = "62400"
 
 UBOOT_MACHINE = "PolegSVB_config"
+UBOOT_DEVICETREE = "nuvoton-npcm730-mori"
 IGPS_MACHINE = "EB"
 
 GBMC_MAC_EEPROM_OF_NAME = "bmcfru"
@@ -20,9 +21,36 @@
 
 SERIAL_CONSOLES = "115200;ttyS0"
 
-IMAGE_FEATURES:remove = "obmc-system-mgmt"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif"
+PREFERRED_PROVIDER_virtual/bmc-update = "mori-bmc-update"
+PREFERRED_PROVIDER_virtual/bios-update = "mori-bios-update"
+PREFERRED_PROVIDER_virtual/cpld-update = "mori-cpld-update"
 
-OBMC_MACHINE_FEATURES += " \
-    obmc-host-ipmi \
-    obmc-host-state-mgmt \
-    "
+# Remove unneeded binaries from image
+IMAGE_FEATURES:remove = "obmc-bmcweb"
+IMAGE_FEATURES:remove = "obmc-console"
+IMAGE_FEATURES:remove = "obmc-devtools"
+IMAGE_FEATURES:remove = "obmc-fan-control"
+IMAGE_FEATURES:remove = "obmc-fan-mgmt"
+IMAGE_FEATURES:remove = "obmc-flash-mgmt"
+IMAGE_FEATURES:remove = "obmc-fru-ipmi"
+IMAGE_FEATURES:remove = "obmc-health-monitor"
+IMAGE_FEATURES:remove = "obmc-host-ctl"
+IMAGE_FEATURES:remove = "obmc-host-ipmi"
+IMAGE_FEATURES:remove = "obmc-ikvm"
+IMAGE_FEATURES:remove = "obmc-inventory"
+IMAGE_FEATURES:remove = "obmc-leds"
+IMAGE_FEATURES:remove = "obmc-logging-mgmt"
+IMAGE_FEATURES:remove = "obmc-remote-logging-mgmt"
+IMAGE_FEATURES:remove = "obmc-rng"
+IMAGE_FEATURES:remove = "obmc-net-ipmi"
+IMAGE_FEATURES:remove = "obmc-sensors"
+IMAGE_FEATURES:remove = "obmc-software"
+IMAGE_FEATURES:remove = "obmc-telemetry"
+IMAGE_FEATURES:remove = "obmc-debug-collector"
+IMAGE_FEATURES:remove = "obmc-system-mgmt"
+IMAGE_FEATURES:remove = "obmc-settings-mgmt"
+IMAGE_FEATURES:remove = "obmc-network-mgmt"
+IMAGE_FEATURES:remove = "obmc-user-mgmt"
+IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap"
+OBMC_IMAGE_BASE_INSTALL:remove = "packagegroup-obmc-apps-extras"