Add -server package to ensure upgrades work