Consolidate package update steps

run dist-upgrade once only