Update upgrade script to use upstream for upgrading