diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index 49e76c6..b821207 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -33,7 +33,7 @@
 
 config BR2_HCODE_VERSION
 	string
-	default "hw031821a.opmst" if BR2_HCODE_LATEST_VERSION
+	default "hw032021a.opmst" if BR2_HCODE_LATEST_VERSION
 	default BR2_HCODE_CUSTOM_VERSION_VALUE \
 		if BR2_HCODE_CUSTOM_VERSION
 
diff --git a/openpower/package/sbe/Config.in b/openpower/package/sbe/Config.in
index f6d4179..8461b41 100644
--- a/openpower/package/sbe/Config.in
+++ b/openpower/package/sbe/Config.in
@@ -27,7 +27,7 @@
 
 config BR2_SBE_VERSION
 	string
-	default "5799af7203689edc9590544b520595f05d9ce7ca" if BR2_SBE_LATEST_VERSION
+	default "557107132e485beb168473095e5cf6f7121f3d14" if BR2_SBE_LATEST_VERSION
 	default BR2_SBE_CUSTOM_VERSION_VALUE \
 		if BR2_SBE_CUSTOM_VERSION