Revert "Revert "Server upgrade""

This reverts commit 5fd7ccbb025de1dad68de138cbfadff1d5184ebf.