diff --git a/openpower/configs/p9dsu_dev_defconfig b/openpower/configs/p9dsu_dev_defconfig
index a4aea74..c41b21b 100644
--- a/openpower/configs/p9dsu_dev_defconfig
+++ b/openpower/configs/p9dsu_dev_defconfig
@@ -42,6 +42,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_LATEST_VERSION=y
 BR2_HOSTBOOT_CONFIG_FILE="p9dsu.config"
+BR2_HOSTBOOT_BINARIES_LATEST_VERSION=y
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="p9dsu-xml"
 BR2_OPENPOWER_MACHINE_XML_VERSION="32ce616ef80f5cc3f128b3aa08fe50954a087888"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="p9dsu.xml"
@@ -63,3 +64,4 @@
 BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
 BR2_IMA_CATALOG_DTS="POWER9"
+BR2_SBE_LATEST_VERSION=y
diff --git a/openpower/configs/witherspoon_dev_defconfig b/openpower/configs/witherspoon_dev_defconfig
index 9aaa687..ddbe7a9 100644
--- a/openpower/configs/witherspoon_dev_defconfig
+++ b/openpower/configs/witherspoon_dev_defconfig
@@ -41,6 +41,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_LATEST_VERSION=y
 BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
+BR2_HOSTBOOT_BINARIES_LATEST_VERSION=y
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
 BR2_OPENPOWER_MACHINE_XML_VERSION="7cd20a6ac8fe3b693ccf50a5ab86ce55ca994fdc"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
@@ -63,3 +64,4 @@
 BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
 BR2_IMA_CATALOG_DTS="POWER9"
+BR2_SBE_LATEST_VERSION=y
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index e1c810f..8dd7451 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -35,7 +35,7 @@
 config BR2_HCODE_VERSION
 	string
 	default "1b068da5e7532c03b43daea4dc268e7de9cd650d" if BR2_HCODE_LATEST_VERSION
-	default "a4ea84060888d68d179c48ace6d0b0cea20e8988" if BR2_HCODE_OP920_VERSION
+	default "a3a060cd02c7ecab9abc660afc7f403d6aa54f7e" if BR2_HCODE_OP920_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 4c3e770..74d0a8f 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -3,3 +3,33 @@
         default y if (BR2_OPENPOWER_PLATFORM)
         help
             Project to stage hostboot binary images
+
+if BR2_PACKAGE_HOSTBOOT_BINARIES
+
+choice
+	prompt "Hostboot-binaries version"
+	default BR2_HOSTBOOT_BINARIES_OP920_VERSION
+
+config BR2_HOSTBOOT_BINARIES_OP920_VERSION
+	bool "Use latest HOSTBOOT_BINARIES stable version (OP920)"
+
+config BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	bool "Use latest HOSTBOOT_BINARIES master"
+
+config BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
+	bool "Custom HOSTBOOT_BINARIES version"
+
+endchoice
+
+config BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE
+	string "HOSTBOOT_BINARIES version"
+	depends on BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
+
+config BR2_HOSTBOOT_BINARIES_VERSION
+	string
+	default "148fbe195c171dc05a823ea05e82d1bd01bdabaa" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	default "49ecf5277a53fd8be2bb8b89eef6f1b0000ca742" if BR2_HOSTBOOT_BINARIES_OP920_VERSION
+	default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
+		if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
+
+endif
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 3fa1ecd..aefe480 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 
-HOSTBOOT_BINARIES_VERSION ?= 148fbe195c171dc05a823ea05e82d1bd01bdabaa
+HOSTBOOT_BINARIES_VERSION = $(call qstrip,$(BR2_HOSTBOOT_BINARIES_VERSION))
 HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
 
 HOSTBOOT_BINARIES_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 69a3510..d7a11eb 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -29,7 +29,7 @@
 config BR2_HOSTBOOT_VERSION
 	string
 	default "c38615a583b7f19c0ae6a5a152b575fe61ff3d2a" if BR2_HOSTBOOT_LATEST_VERSION
-	default "4b25a2be9395e4d287c94a1900ae54823efd477c" if BR2_HOSTBOOT_OP920_VERSION
+	default "c78530bd29942282e2345295af1f157f0a8eefd7" if BR2_HOSTBOOT_OP920_VERSION
 	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_CUSTOM_VERSION
 
diff --git a/openpower/package/sbe/Config.in b/openpower/package/sbe/Config.in
index c512bbb..67a5135 100644
--- a/openpower/package/sbe/Config.in
+++ b/openpower/package/sbe/Config.in
@@ -5,3 +5,33 @@
         depends on BR2_PACKAGE_HCODE
         help
             Project to build the sbe firmware codebase
+
+if BR2_PACKAGE_SBE
+
+choice
+	prompt "SBE version"
+	default BR2_SBE_OP920_VERSION
+
+config BR2_SBE_OP920_VERSION
+	bool "Use latest SBE stable version (OP920)"
+
+config BR2_SBE_LATEST_VERSION
+	bool "Use latest SBE master"
+
+config BR2_SBE_CUSTOM_VERSION
+	bool "Custom SBE version"
+
+endchoice
+
+config BR2_SBE_CUSTOM_VERSION_VALUE
+	string "SBE version"
+	depends on BR2_SBE_CUSTOM_VERSION
+
+config BR2_SBE_VERSION
+	string
+	default "a389a5d98c2ab38292ce7451c210b3cb0293938c" if BR2_SBE_LATEST_VERSION
+	default "26a37e4d6c82743232c9e06767a223fcaf4f5555" if BR2_SBE_OP920_VERSION
+	default BR2_SBE_CUSTOM_VERSION_VALUE \
+		if BR2_SBE_CUSTOM_VERSION
+
+endif
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 7509881..0cc1942 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-SBE_VERSION ?= a389a5d98c2ab38292ce7451c210b3cb0293938c
-SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
+SBE_VERSION = $(call qstrip,$(BR2_SBE_VERSION))
+SBE_SITE = $(call github,open-power,sbe,$(SBE_VERSION))
 
 SBE_LICENSE = Apache-2.0
 SBE_DEPENDENCIES = host-ppe42-gcc hcode