diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index e1a030c..7b9516b 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -33,7 +33,7 @@
 
 config BR2_HCODE_VERSION
 	string
-	default "hw080321a.opmst" if BR2_HCODE_LATEST_VERSION
+	default "hw080421a.opmst" if BR2_HCODE_LATEST_VERSION
 	default BR2_HCODE_CUSTOM_VERSION_VALUE \
 		if BR2_HCODE_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index 560c5c0..931b4b0 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 "hw080321a.opmst" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	default "hw080421a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
 	default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION