Remove swap-server from config.yml, make dynamic