diff --git a/openpower/configs/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig
index 6437ae9..6a0c750 100644
--- a/openpower/configs/p10ebmc_defconfig
+++ b/openpower/configs/p10ebmc_defconfig
@@ -55,7 +55,7 @@
 #BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/rainier-xml.git"
 #BR2_RAINIER_2U_XML_VERSION="d5127bbed1a181d39cbc24ea33ea7b6df15baa4e"
 BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_2U_XML_VERSION="8cd37ec2ded012563ec79c57f33d1d53bf7eae23"
+BR2_RAINIER_2U_XML_VERSION="6be6ff6c039731f8463442b8311f0147f13cb682"
 BR2_RAINIER_2U_XML_SYSTEM_FILENAME="Rainier-2U-MRW_hb.system.xml"
 BR2_RAINIER_2U_XML_TARGETING_FILENAME="Rainier-2U-MRW_hb.mrw.xml"
 BR2_RAINIER_4U_XML_CUSTOM_GIT=y
@@ -63,7 +63,7 @@
 #BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/rainier-xml.git"
 #BR2_RAINIER_4U_XML_VERSION="d5127bbed1a181d39cbc24ea33ea7b6df15baa4e"
 BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_4U_XML_VERSION="8cd37ec2ded012563ec79c57f33d1d53bf7eae23"
+BR2_RAINIER_4U_XML_VERSION="6be6ff6c039731f8463442b8311f0147f13cb682"
 BR2_RAINIER_4U_XML_SYSTEM_FILENAME="Rainier-4U-MRW_hb.system.xml"
 BR2_RAINIER_4U_XML_TARGETING_FILENAME="Rainier-4U-MRW_hb.mrw.xml"
 BR2_PACKAGE_EVEREST_XML=y
@@ -72,7 +72,7 @@
 #BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/everest-xml.git"
 #BR2_EVEREST_XML_VERSION="f3461debbbde70d33d5264411ee37abde9be6815"
 BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/everest-xml.git"
-BR2_EVEREST_XML_VERSION="fa1f6da1674b572673ec425b2d33b31a936b259b"
+BR2_EVEREST_XML_VERSION="5b3e17401b94ce92ae3cc65f8e79eaccc5e906f9"
 BR2_EVEREST_XML_SYSTEM_FILENAME="Everest-MRW_hb.system.xml"
 BR2_EVEREST_XML_TARGETING_FILENAME="Everest-MRW_hb.mrw.xml"
 BR2_PACKAGE_OPENPOWER_PNOR_P10=y
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index a4c1492..8a7649d 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 "hw030922a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	default "hw031122a.opmst" 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-p10/Config.in b/openpower/package/hostboot-p10/Config.in
index cb790b7..4b25639 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 "d4a7442413a5d90c3da6773a3e393445fb116891" if BR2_HOSTBOOT_P10_LATEST_VERSION
+	default "9c5b65f488809116ce6336a0037810f00da58a95" if BR2_HOSTBOOT_P10_LATEST_VERSION
 	default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_P10_CUSTOM_VERSION