diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index b6d607d..0cf5e0d 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -54,7 +54,7 @@
 BR2_HOSTBOOT_P10_CONFIG_FILE="rainier.config"
 BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
 BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_OPENPOWER_MACHINE_XML_VERSION="2dc3999065846e5b9a03b1222341b4cbd557bd4c"
+BR2_OPENPOWER_MACHINE_XML_VERSION="1a68f64d491d60a3a13b7a1b30c0af7acef301af"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="Rainier-2U-MRW.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="RAINIER_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="RAINIER_hb.mrw.xml"
@@ -65,6 +65,7 @@
 BR2_HOSTBOOT_BINARY_SBE_FILENAME="p10_sbe.img.ecc"
 BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
 BR2_HOSTBOOT_BINARY_WINK_FILENAME="p10.ref_image.hdr.bin.ecc"
+BR2_PACKAGE_OCMB_EXPLORER_FW=y
 BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
 BR2_OPENPOWER_TARGETING_BIN_FILENAME="RAINIER_HB.targeting.bin"
 BR2_OPENPOWER_TARGETING_ECC_FILENAME="RAINIER_HB.targeting.bin.ecc"
@@ -75,3 +76,4 @@
 BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
 BR2_IMA_CATALOG_DTS="POWER9"
+BR2_OPENPOWER_MAKE_LIDS=y
diff --git a/openpower/package/hcode-p10/Config.in b/openpower/package/hcode-p10/Config.in
index 7f12d0a..4565d21 100644
--- a/openpower/package/hcode-p10/Config.in
+++ b/openpower/package/hcode-p10/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_HCODE_P10_VERSION
 	string
-	default "hw031620b.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+	default "hw041720a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
 	default BR2_HCODE_P10_CUSTOM_VERSION_VALUE \
 		if BR2_HCODE_P10_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index 9128aaf..48371fe 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -24,7 +24,7 @@
 
 config BR2_HOSTBOOT_BINARIES_VERSION
 	string
-	default "hw031020a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	default "hw041620a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
 	default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 5402076..bc9d927 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -66,6 +66,9 @@
 P10_RING_OVERLAYS_FILE=p10.hw.overlays.bin
 P10_RING_QME_FILE=p10.hw.qme.rings.bin
 P10_RING_SBE_FILE=p10.hw.sbe.rings.bin
+P10_RING_FA_EC_CL2_FILE=p10.hw.fa_ec_cl2_far.bin
+P10_RING_FA_EC_MMA_FILE=p10.hw.fa_ec_mma_far.bin
+P10_RING_FA_OVRD_FILE=p10.hw.fa_ring_ovrd.bin
 
 define HOSTBOOT_BINARIES_INSTALL_IMAGES_CMDS
      $(INSTALL) -D $(@D)/gpu_gpe1.bin  $(STAGING_DIR)/hostboot_binaries/gpu_gpe1.bin
@@ -75,6 +78,9 @@
      $(INSTALL) -D $(@D)/$(P10_RING_OVERLAYS_FILE)  $(STAGING_DIR)/hostboot_binaries/
      $(INSTALL) -D $(@D)/$(P10_RING_QME_FILE)  $(STAGING_DIR)/hostboot_binaries/
      $(INSTALL) -D $(@D)/$(P10_RING_SBE_FILE)  $(STAGING_DIR)/hostboot_binaries/
+     $(INSTALL) -D $(@D)/$(P10_RING_FA_EC_CL2_FILE)  $(STAGING_DIR)/hostboot_binaries/
+     $(INSTALL) -D $(@D)/$(P10_RING_FA_EC_MMA_FILE)  $(STAGING_DIR)/hostboot_binaries/
+     $(INSTALL) -D $(@D)/$(P10_RING_FA_OVRD_FILE)  $(STAGING_DIR)/hostboot_binaries/
 endef
 endif
 
diff --git a/openpower/package/hostboot-p10/Config.in b/openpower/package/hostboot-p10/Config.in
index 282bf30..e5cb9af 100644
--- a/openpower/package/hostboot-p10/Config.in
+++ b/openpower/package/hostboot-p10/Config.in
@@ -25,7 +25,7 @@
 
 config BR2_HOSTBOOT_P10_VERSION
 	string
-	default "e17b7ba60ab001a99ef66e476c74de0fdcd2c4a3" if BR2_HOSTBOOT_P10_LATEST_VERSION
+	default "af8bc5aa3e4dbf5702362595d6807c92f956ba49" if BR2_HOSTBOOT_P10_LATEST_VERSION
 	default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_P10_CUSTOM_VERSION
 
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 5233fff..64231ce 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -177,4 +177,8 @@
         bool "Create a virtual PNOR image along with the standard image"
         default n
 
+config BR2_OPENPOWER_MAKE_LIDS
+        bool "Create a package of content and signature binaries to be used for lid creation"
+        default n
+
 endmenu
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 4053dd4..3aa7276 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENPOWER_PNOR_VERSION ?= f65af64e9a554aa877f45a5adeec419145beda12
+OPENPOWER_PNOR_VERSION ?= 7798c11a29589a97e7eacda3fd22c8db49430e62
 
 # TODO: WORKAROUND: Need to reenable next line and comment out the two lines
 # after that, when code is propagated to a public repo
@@ -198,6 +198,15 @@
             $(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).static.tar.gz $(BINARIES_DIR); \
         fi
 
+        # Make the lids 
+        if [ "$(BR2_OPENPOWER_MAKE_LIDS)" == "y" ]; then \
+            $(TARGET_MAKE_ENV) $(@D)/makelidpkg \
+                 $(OUTPUT_IMAGES_DIR) \
+                 $(OPENPOWER_PNOR_SCRATCH_DIR); \
+        else \
+            echo "Not making LIDs"; \
+        fi
+
 	#Create Debug Tarball
 	mkdir -p $(STAGING_DIR)/pnor/host_fw_debug_tarball_files/
 	cp -r $(FILES_TO_TAR) $(STAGING_DIR)/pnor/host_fw_debug_tarball_files/
diff --git a/openpower/package/sbe-p10/Config.in b/openpower/package/sbe-p10/Config.in
index 204f2e8..32028e8 100644
--- a/openpower/package/sbe-p10/Config.in
+++ b/openpower/package/sbe-p10/Config.in
@@ -26,7 +26,7 @@
 
 config BR2_SBE_P10_VERSION
 	string
-	default "3a5de29210da11789e6a8353fb20968d0363a528" if BR2_SBE_P10_LATEST_VERSION
+	default "052a3e140285efd3db4f282be68741c7bdba9369" if BR2_SBE_P10_LATEST_VERSION
 	default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
 		if BR2_SBE_P10_CUSTOM_VERSION