diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index c1a520a..a3e35d5 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -33,7 +33,7 @@
 
 config BR2_HCODE_VERSION
 	string
-	default "hw091820a.opmst" if BR2_HCODE_LATEST_VERSION
+	default "hw092120a.opmst" if BR2_HCODE_LATEST_VERSION
 	default BR2_HCODE_CUSTOM_VERSION_VALUE \
 		if BR2_HCODE_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 7caeb62..ee3feda 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
 
 config BR2_HOSTBOOT_VERSION
 	string
-	default "51d983838ade94aa0efdd35896881f53dc4add62" if BR2_HOSTBOOT_LATEST_VERSION
+	default "994518198f09af04c22ba5931e55c473d4e573c0" if BR2_HOSTBOOT_LATEST_VERSION
 	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_CUSTOM_VERSION