upgrade: Fix upgrade and add goals