diff --git a/openpower/configs/hostboot/witherspoon.config b/openpower/configs/hostboot/witherspoon.config
index 106b303..87a5f7c 100755
--- a/openpower/configs/hostboot/witherspoon.config
+++ b/openpower/configs/hostboot/witherspoon.config
@@ -71,3 +71,7 @@
 # Terminate Hostboot when errors occur in manufacturing mode
 #   (relies on BMC to not trigger reboot)
 unset HANG_ON_MFG_SRC_TERM
+
+# Support Physical Presence Detection and Key Clear Requests
+set PHYS_PRES_PWR_BUTTON
+set KEY_CLEAR
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index 7f2820a..e4daab7 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_HCODE_VERSION
 	string
-	default "hw042020a.opmst" if BR2_HCODE_LATEST_VERSION
+	default "hw042220a.opmst" if BR2_HCODE_LATEST_VERSION
 	default BR2_HCODE_CUSTOM_VERSION_VALUE \
 		if BR2_HCODE_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 2f86106..1125e56 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
 
 config BR2_HOSTBOOT_VERSION
 	string
-	default "cc929c6fda8c63bec53dc0d297c3742559226905" if BR2_HOSTBOOT_LATEST_VERSION
+	default "cc7fb146afd86c1e5e2f9a8e5ea3724c7f3bc4d6" if BR2_HOSTBOOT_LATEST_VERSION
 	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_CUSTOM_VERSION