diff --git a/openpower/configs/hostboot/habanero.config b/openpower/configs/hostboot/habanero.config
index 3270a8f..f98554f 100755
--- a/openpower/configs/hostboot/habanero.config
+++ b/openpower/configs/hostboot/habanero.config
@@ -35,6 +35,6 @@
 set DISABLE_HOSTBOOT_RUNTIME
 
 # OCC Enablment flags
-set SET_NOMINAL_PSTATE
-unset HTMGT
-unset START_OCC_DURING_BOOT
+unset SET_NOMINAL_PSTATE
+set HTMGT
+set START_OCC_DURING_BOOT
diff --git a/openpower/configs/hostboot/palmetto.config b/openpower/configs/hostboot/palmetto.config
index b30d7c9..0a1caf9 100755
--- a/openpower/configs/hostboot/palmetto.config
+++ b/openpower/configs/hostboot/palmetto.config
@@ -31,5 +31,8 @@
 
 set NO_DMI_EREPAIR
 set DISABLE_HOSTBOOT_RUNTIME
+
+# OCC Enablment flags
+unset SET_NOMINAL_PSTATE
 set HTMGT
 set START_OCC_DURING_BOOT
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 38f9443..194d656 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOSTBOOT_VERSION ?= 9b53fb2a9083e62380f7bf2fb041378ef4de96ee
+HOSTBOOT_VERSION ?= c9613b312be0600491ffb367aa71a97cb0216949
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
 
 HOSTBOOT_LICENSE = Apache-2.0