diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index 0bde988..d86e284 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="b7a3ed6eb158c571c74536c23fc06e968fb7b087"
+BR2_OPENPOWER_MACHINE_XML_VERSION="36792b48fa19a4e4f620f8ded6a18734aedbffe1"
 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"
diff --git a/openpower/package/hcode-p10/Config.in b/openpower/package/hcode-p10/Config.in
index 1e76694..80c4839 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 "hw061420a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+	default "hw061820a.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-p10/Config.in b/openpower/package/hostboot-p10/Config.in
index d3b0b68..434246c 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 "a483ed18fb9efc4dc2d0c94af7cff9ed604528e0" if BR2_HOSTBOOT_P10_LATEST_VERSION
+	default "af5b8b00e19c5ac6dbb80e875f6340acab04ec67" if BR2_HOSTBOOT_P10_LATEST_VERSION
 	default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_P10_CUSTOM_VERSION
 
diff --git a/openpower/package/sbe-p10/Config.in b/openpower/package/sbe-p10/Config.in
index cd75045..6322c9b 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 "15201a684b81011ad6edf246c222693458b14868" if BR2_SBE_P10_LATEST_VERSION
+	default "d63b4a749104fc4574ef0c41e80dbaf27591683b" if BR2_SBE_P10_LATEST_VERSION
 	default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
 		if BR2_SBE_P10_CUSTOM_VERSION