diff --git a/openpower/configs/p9dsu_dev_defconfig b/openpower/configs/p9dsu_dev_defconfig
deleted file mode 100644
index 2c25f47..0000000
--- a/openpower/configs/p9dsu_dev_defconfig
+++ /dev/null
@@ -1,68 +0,0 @@
-BR2_powerpc64le=y
-BR2_powerpc_power8=y
-BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TARGET_GENERIC_HOSTNAME="skiroot"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
-BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
-BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
-BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
-BR2_SYSTEM_ENABLE_NLS=y
-BR2_ROOTFS_OVERLAY="../openpower/overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8"
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
-BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
-BR2_LINUX_KERNEL_XZ=y
-BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
-BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
-BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX=y
-BR2_PACKAGE_IPMITOOL=y
-BR2_PACKAGE_IPMITOOL_USB=y
-BR2_PACKAGE_MDADM=y
-BR2_PACKAGE_NCURSES_WCHAR=y
-BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_SERVER is not set
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_LRZSZ=y
-BR2_PACKAGE_NETCAT=y
-BR2_PACKAGE_RSYNC=y
-BR2_TARGET_ROOTFS_CPIO_XZ=y
-BR2_TARGET_ROOTFS_INITRAMFS=y
-BR2_OPENPOWER_PLATFORM=y
-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"
-BR2_OPENPOWER_SYSTEM_XML_FILENAME="P9DSU_hb.system.xml"
-BR2_OPENPOWER_MRW_XML_FILENAME="P9DSU_hb.mrw.xml"
-BR2_OPENPOWER_BIOS_XML_FILENAME="P9DSU_bios.xml"
-BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
-BR2_OPENPOWER_CONFIG_NAME="p9dsu"
-BR2_OPENPOWER_PNOR_FILENAME="p9dsu.pnor"
-BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
-BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
-BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
-BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
-BR2_OPENPOWER_TARGETING_BIN_FILENAME="P9DSU_HB.targeting.bin"
-BR2_OPENPOWER_TARGETING_ECC_FILENAME="P9DSU_HB.targeting.bin.ecc"
-BR2_PACKAGE_PETITBOOT=y
-BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_HCODE_LATEST_VERSION=y
-BR2_OCC_LATEST_VERSION=y
-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
deleted file mode 100644
index d5fa77d..0000000
--- a/openpower/configs/witherspoon_dev_defconfig
+++ /dev/null
@@ -1,68 +0,0 @@
-BR2_powerpc64le=y
-BR2_powerpc_power8=y
-BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TARGET_GENERIC_HOSTNAME="skiroot"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
-BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
-BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
-BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
-BR2_SYSTEM_ENABLE_NLS=y
-BR2_ROOTFS_OVERLAY="../openpower/overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8"
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
-BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
-BR2_LINUX_KERNEL_XZ=y
-BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
-BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
-BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_IPMITOOL=y
-BR2_PACKAGE_IPMITOOL_USB=y
-BR2_PACKAGE_MDADM=y
-BR2_PACKAGE_NCURSES_WCHAR=y
-BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_SERVER is not set
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_LRZSZ=y
-BR2_PACKAGE_NETCAT=y
-BR2_PACKAGE_RSYNC=y
-BR2_TARGET_ROOTFS_CPIO_XZ=y
-BR2_TARGET_ROOTFS_INITRAMFS=y
-BR2_OPENPOWER_PLATFORM=y
-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"
-BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
-BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
-BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
-BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
-BR2_OPENPOWER_CONFIG_NAME="witherspoon"
-BR2_OPENPOWER_PNOR_FILENAME="witherspoon.pnor"
-BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
-BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
-BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
-BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
-BR2_OPENPOWER_TARGETING_BIN_FILENAME="WITHERSPOON_HB.targeting.bin"
-BR2_OPENPOWER_TARGETING_ECC_FILENAME="WITHERSPOON_HB.targeting.bin.ecc"
-BR2_PACKAGE_PETITBOOT=y
-BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_HCODE_LATEST_VERSION=y
-BR2_OCC_GPU_BIN_BUILD=y
-BR2_OCC_LATEST_VERSION=y
-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 ce0cb18..e1030b2 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -15,10 +15,7 @@
 
 choice
 	prompt "HCODE version"
-	default BR2_HCODE_OP920_VERSION
-
-config BR2_HCODE_OP920_VERSION
-	bool "Use latest HCODE stable version (OP920)"
+	default BR2_HCODE_LATEST_VERSION
 
 config BR2_HCODE_LATEST_VERSION
 	bool "Use latest HCODE master"
@@ -34,8 +31,7 @@
 
 config BR2_HCODE_VERSION
 	string
-	default "hw051018a.920" if BR2_HCODE_LATEST_VERSION
-	default "hw051018a.op920" if BR2_HCODE_OP920_VERSION
+	default "hw051618a.920" 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 f5efe9f..3734650 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -8,10 +8,7 @@
 
 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)"
+	default BR2_HOSTBOOT_BINARIES_LATEST_VERSION
 
 config BR2_HOSTBOOT_BINARIES_LATEST_VERSION
 	bool "Use latest HOSTBOOT_BINARIES master"
@@ -27,8 +24,7 @@
 
 config BR2_HOSTBOOT_BINARIES_VERSION
 	string
-	default "81d8233a6dc8b79451c326c9dae6581e310f6cd2" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
-	default "20119f08687783a87862cee268df1260f914c01e" if BR2_HOSTBOOT_BINARIES_OP920_VERSION
+	default "hw051618a.920" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
 	default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 739a095..a432497 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -9,10 +9,7 @@
 
 choice
 	prompt "Hostboot version"
-	default BR2_HOSTBOOT_OP920_VERSION
-
-config BR2_HOSTBOOT_OP920_VERSION
-	bool "Use latest Hostboot stable version (OP920)"
+	default BR2_HOSTBOOT_LATEST_VERSION
 
 config BR2_HOSTBOOT_LATEST_VERSION
 	bool "Use latest Hostboot master"
@@ -28,8 +25,7 @@
 
 config BR2_HOSTBOOT_VERSION
 	string
-	default "43c4502d3b0b87020665a65ad2843e0ddc31906" if BR2_HOSTBOOT_LATEST_VERSION
-	default "8e05a4399bf567a49f91cfee8ad24b3896e96982" if BR2_HOSTBOOT_OP920_VERSION
+	default "c4b9c94600ccc933ccb2dcb7563a6e5423d30153" if BR2_HOSTBOOT_LATEST_VERSION
 	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_CUSTOM_VERSION
 
diff --git a/openpower/package/occ/Config.in b/openpower/package/occ/Config.in
index b559953..6793b31 100644
--- a/openpower/package/occ/Config.in
+++ b/openpower/package/occ/Config.in
@@ -27,10 +27,7 @@
 
 choice
 	prompt "OCC version"
-	default BR2_OCC_OP920_VERSION
-
-config BR2_OCC_OP920_VERSION
-	bool "Use latest OCC stable version (OP920)"
+	default BR2_OCC_LATEST_VERSION
 
 config BR2_OCC_LATEST_VERSION
 	bool "Use latest OCC master"
@@ -47,7 +44,6 @@
 config BR2_OCC_VERSION
 	string
 	default "77bb5e602b4aa3421e38af2b8fadb55bb2e9496b" if BR2_OCC_LATEST_VERSION
-	default "77bb5e602b4aa3421e38af2b8fadb55bb2e9496b" if BR2_OCC_OP920_VERSION
 	default BR2_OCC_CUSTOM_VERSION_VALUE \
 		if BR2_OCC_CUSTOM_VERSION
 
diff --git a/openpower/package/sbe/Config.in b/openpower/package/sbe/Config.in
index 7cd6c08..077ca0c 100644
--- a/openpower/package/sbe/Config.in
+++ b/openpower/package/sbe/Config.in
@@ -10,10 +10,7 @@
 
 choice
 	prompt "SBE version"
-	default BR2_SBE_OP920_VERSION
-
-config BR2_SBE_OP920_VERSION
-	bool "Use latest SBE stable version (OP920)"
+	default BR2_SBE_LATEST_VERSION
 
 config BR2_SBE_LATEST_VERSION
 	bool "Use latest SBE master"
@@ -29,8 +26,7 @@
 
 config BR2_SBE_VERSION
 	string
-	default "a389a5d98c2ab38292ce7451c210b3cb0293938c" if BR2_SBE_LATEST_VERSION
-	default "8e0105e5e964de6e99e60a96ae3f3829efe02080" if BR2_SBE_OP920_VERSION
+	default "af40291dc92d9e67173b7d538cb580c4aa557fee" if BR2_SBE_LATEST_VERSION
 	default BR2_SBE_CUSTOM_VERSION_VALUE \
 		if BR2_SBE_CUSTOM_VERSION