Server infrastructure upgrade

Follow