20210903 city.goa: Upgrade likely for various state infra