Merge "[CORD-2214] Updating configs after UNI push automation"