diff --git a/openpower/configs/hostboot/everest.config b/openpower/configs/hostboot/everest.config
index 2f2ef2a..96b6953 100644
--- a/openpower/configs/hostboot/everest.config
+++ b/openpower/configs/hostboot/everest.config
@@ -88,3 +88,6 @@
 # Disable presence detection (workaround for Everest bug)
 unset PHYS_PRES_PWR_BUTTON
 unset KEY_CLEAR
+
+# Disable TOD redundancy (workaround for Everest bug)
+unset ENABLE_TOD_REDUNDANCY
diff --git a/openpower/configs/hostboot/rainier.config b/openpower/configs/hostboot/rainier.config
index a0bf15f..b4460ce 100755
--- a/openpower/configs/hostboot/rainier.config
+++ b/openpower/configs/hostboot/rainier.config
@@ -91,3 +91,6 @@
 
 # enable multi-chip
 unset FORCE_SINGLE_CHIP
+
+# Disable TOD redundancy (workaround for Everest bug)
+unset ENABLE_TOD_REDUNDANCY
diff --git a/openpower/configs/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig
index a6ef6de..d1724c0 100644
--- a/openpower/configs/p10ebmc_defconfig
+++ b/openpower/configs/p10ebmc_defconfig
@@ -51,18 +51,18 @@
 BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
 BR2_RAINIER_2U_XML_CUSTOM_GIT=y
 BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_2U_XML_VERSION="44d80279449e658b564ee2357fa932424d9912e3"
+BR2_RAINIER_2U_XML_VERSION="3d6140808f051ddb7c8829f19d5cfdcea8a19af6"
 BR2_RAINIER_2U_XML_SYSTEM_FILENAME="Rainier-2U-MRW_hb.system.xml"
 BR2_RAINIER_2U_XML_TARGETING_FILENAME="Rainier-2U-MRW_hb.mrw.xml"
 BR2_RAINIER_4U_XML_CUSTOM_GIT=y
 BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_4U_XML_VERSION="44d80279449e658b564ee2357fa932424d9912e3"
+BR2_RAINIER_4U_XML_VERSION="3d6140808f051ddb7c8829f19d5cfdcea8a19af6"
 BR2_RAINIER_4U_XML_SYSTEM_FILENAME="Rainier-4U-MRW_hb.system.xml"
 BR2_RAINIER_4U_XML_TARGETING_FILENAME="Rainier-4U-MRW_hb.mrw.xml"
 BR2_PACKAGE_EVEREST_XML=y
 BR2_EVEREST_XML_CUSTOM_GIT=y
 BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/everest-xml.git"
-BR2_EVEREST_XML_VERSION="ecf9dbf45297a5260898c4dc333bdd92b52fc010"
+BR2_EVEREST_XML_VERSION="ca658e91457262af4a2aa7794d53af42e5412eee"
 BR2_EVEREST_XML_SYSTEM_FILENAME="Everest-MRW_hb.system.xml"
 BR2_EVEREST_XML_TARGETING_FILENAME="Everest-MRW_hb.mrw.xml"
 BR2_PACKAGE_OPENPOWER_PNOR_P10=y
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index cbea664..e152695 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -51,12 +51,12 @@
 BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
 BR2_RAINIER_2U_XML_CUSTOM_GIT=y
 BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_2U_XML_VERSION="44d80279449e658b564ee2357fa932424d9912e3"
+BR2_RAINIER_2U_XML_VERSION="3d6140808f051ddb7c8829f19d5cfdcea8a19af6"
 BR2_RAINIER_2U_XML_SYSTEM_FILENAME="Rainier-2U-MRW_hb.system.xml"
 BR2_RAINIER_2U_XML_TARGETING_FILENAME="Rainier-2U-MRW_hb.mrw.xml"
 BR2_RAINIER_4U_XML_CUSTOM_GIT=y
 BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_4U_XML_VERSION="44d80279449e658b564ee2357fa932424d9912e3"
+BR2_RAINIER_4U_XML_VERSION="3d6140808f051ddb7c8829f19d5cfdcea8a19af6"
 BR2_RAINIER_4U_XML_SYSTEM_FILENAME="Rainier-4U-MRW_hb.system.xml"
 BR2_RAINIER_4U_XML_TARGETING_FILENAME="Rainier-4U-MRW_hb.mrw.xml"
 BR2_PACKAGE_OPENPOWER_PNOR_P10=y
@@ -70,5 +70,5 @@
 BR2_PACKAGE_PETITBOOT_MTD=y
 # BR2_PACKAGE_CAPP_UCODE is not set
 BR2_PACKAGE_LOADKEYS=y
-BR2_IMA_CATALOG_DTS="POWER9"
+BR2_IMA_CATALOG_DTS="POWER10"
 BR2_PACKAGE_OCMB_EXPLORER_FW=y
diff --git a/openpower/package/ekb/Config.in b/openpower/package/ekb/Config.in
index 7a74f0c..f1909fb 100644
--- a/openpower/package/ekb/Config.in
+++ b/openpower/package/ekb/Config.in
@@ -30,7 +30,7 @@
 
 config BR2_EKB_VERSION
     string
-    default "cdad059b3ad8e8421afb0fa569e5bd6a71ddb428" if BR2_EKB_LATEST_VERSION
+    default "211ecb050b648e5abade5acf833964fd52c01f2a" if BR2_EKB_LATEST_VERSION
     default BR2_EKB_CUSTOM_VERSION_VALUE if BR2_EKB_CUSTOM_VERSION
 endif
 
diff --git a/openpower/package/hcode-p10/Config.in b/openpower/package/hcode-p10/Config.in
index c7d7a24..f18668d 100644
--- a/openpower/package/hcode-p10/Config.in
+++ b/openpower/package/hcode-p10/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_HCODE_P10_VERSION
 	string
-	default "hw032021a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+	default "hw040221a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
 	default BR2_HCODE_P10_CUSTOM_VERSION_VALUE \
 		if BR2_HCODE_P10_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index 943ca36..3092044 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 "hw032021a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	default "hw040221a.opmst10" 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-p10/Config.in b/openpower/package/hostboot-p10/Config.in
index b8b27a7..94f16db 100644
--- a/openpower/package/hostboot-p10/Config.in
+++ b/openpower/package/hostboot-p10/Config.in
@@ -25,7 +25,7 @@
 
 config BR2_HOSTBOOT_P10_VERSION
 	string
-	default "0b9d17e0d8b59e05c5117727fbc746e6f0209c1d" if BR2_HOSTBOOT_P10_LATEST_VERSION
+	default "b48824e59a8fd04d16106b450f9e0404e2dc05f6" if BR2_HOSTBOOT_P10_LATEST_VERSION
 	default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_P10_CUSTOM_VERSION
 
diff --git a/openpower/package/ima-catalog/ima-catalog.mk b/openpower/package/ima-catalog/ima-catalog.mk
index c93b09d..f985a3b 100644
--- a/openpower/package/ima-catalog/ima-catalog.mk
+++ b/openpower/package/ima-catalog/ima-catalog.mk
@@ -3,8 +3,10 @@
 # ima-catalog.mk
 #
 ################################################################################
-IMA_CATALOG_VERSION ?= 89e00ee3ef424b5ff49f4d89d609004ae863bf26 
-IMA_CATALOG_SITE ?= $(call github,open-power,ima-catalog,$(IMA_CATALOG_VERSION))
+IMA_CATALOG_VERSION ?= 1231d0378ba38c883871e3bb5073e1fca5659ab6
+#IMA_CATALOG_SITE ?= $(call github,open-power,ima-catalog,$(IMA_CATALOG_VERSION))
+IMA_CATALOG_SITE ?= git@github.ibm.com:open-power/ima-catalog.git
+IMA_CATALOG_SITE_METHOD ?= git
 IMA_CATALOG_LICENSE = Apache-2.0
 IMA_CATALOG_DEPENDENCIES = host-dtc host-xz
 
diff --git a/openpower/package/occ-p10/Config.in b/openpower/package/occ-p10/Config.in
index 52157d1..6021e7f 100644
--- a/openpower/package/occ-p10/Config.in
+++ b/openpower/package/occ-p10/Config.in
@@ -43,7 +43,7 @@
 
 config BR2_OCC_P10_VERSION
 	string
-	default "cbf2701936ee7fe9eb2a63b5b57a0c7f639f30bf" if BR2_OCC_P10_LATEST_VERSION
+	default "29e48f6593c76d07cdb8f681b60fd5fdf7eab3c8" if BR2_OCC_P10_LATEST_VERSION
 	default BR2_OCC_P10_CUSTOM_VERSION_VALUE \
 		if BR2_OCC_P10_CUSTOM_VERSION
 
diff --git a/openpower/package/pdata/Config.in b/openpower/package/pdata/Config.in
index 83a07eb..5b2ea02 100644
--- a/openpower/package/pdata/Config.in
+++ b/openpower/package/pdata/Config.in
@@ -47,7 +47,7 @@
 
 config BR2_PDATA_VERSION
     string
-    default "65e213ad8e0f6d94a7323f1d174c02de5b7b1db8" if BR2_PDATA_LATEST_VERSION
+    default "2ac93796079adb4464e61c403b936e5fe824f089" if BR2_PDATA_LATEST_VERSION
     default BR2_PDATA_CUSTOM_VERSION_VALUE if BR2_PDATA_CUSTOM_VERSION
 
 endif
diff --git a/openpower/package/sbe-p10/Config.in b/openpower/package/sbe-p10/Config.in
index a9f25dd..161e52b 100644
--- a/openpower/package/sbe-p10/Config.in
+++ b/openpower/package/sbe-p10/Config.in
@@ -26,7 +26,7 @@
 
 config BR2_SBE_P10_VERSION
 	string
-	default "3d6ff6deb64e0863c864ff0b41f968bd89d65365" if BR2_SBE_P10_LATEST_VERSION
+	default "f7e7b609909e06eb6fa0f62fb285ebe8891c5017" if BR2_SBE_P10_LATEST_VERSION
 	default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
 		if BR2_SBE_P10_CUSTOM_VERSION