Update scenarios to multi-cluster and multi-site format