diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index 0e3b935..fdcd07d 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_HCODE_VERSION
 	string
-	default "hw020919a.930" if BR2_HCODE_LATEST_VERSION
+	default "hw021619a.930" 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 9b055de..94e5178 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 "hw012919a.930" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	default "hw021419a.930" 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 c47067a..76633aa 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -28,7 +28,7 @@
 
 config BR2_HOSTBOOT_VERSION
 	string
-	default "cccf89e092dd50e3fe10b70701c9ddfaa84498cb" if BR2_HOSTBOOT_LATEST_VERSION
+	default "84b32560e1aa82855bc2d9191c9f4b699f185885" if BR2_HOSTBOOT_LATEST_VERSION
 	default "610ca55e285e2f0d7cabed6235deef82ee271627" if BR2_HOSTBOOT_STABLE_VERSION
 	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_CUSTOM_VERSION
diff --git a/openpower/package/petitboot/shell_config b/openpower/package/petitboot/shell_config
index ef2c55a..608738d 100644
--- a/openpower/package/petitboot/shell_config
+++ b/openpower/package/petitboot/shell_config
@@ -10,6 +10,10 @@
 	if [[ $? = 0 ]]; then
 		echo "No password set, elevating shell"
 		sudo -i
+		sudo -K
 		exit
 	fi
+	export PS1='$ '
+else
+	export PS1='# '
 fi