diff --git a/board/boundary/bootscripts/upgrade.txt b/board/boundary/bootscripts/upgrade.txt
index de70e42dc5b5f284be99f823575e124a64dd2d7b..24b705eb7624ca1214aabb3be005734b44b387e7 100644
--- a/board/boundary/bootscripts/upgrade.txt
+++ b/board/boundary/bootscripts/upgrade.txt
@@ -67,6 +67,11 @@ for n in 5 4 3 2 1 ; do
 done
 mmc write ${a_uImage1} ${cntoffset} ${cntfile}
 
+# Make sure to boot from the proper partition
+if itest ${env_part} != 0 ; then
+	mmc partconf ${env_dev} 1 ${env_part} 0
+fi
+
 # Switch back to main eMMC partition (to avoid confusion)
 mmc dev ${env_dev}