Change everything for new server layout

[#75089952]
Merge branch 'master' into staging