Adding Server suffix to Container and Admin