DON'T _create_ partitions if you are upgrading!
That will wipe out your currently existing partitions and setup and is not an upgrade, but a fresh install.
Use your current/existing partitions if you are upgrading. Before starting the upgrade, make a list of where your current partitions are mounted and when the partition part of setup comes just mount the same partitions in the same locations. (Install may recognize what was mounted where, but if you have a list you can be sure that everything is where it belongs.