upgpkg: city-defaults 1-7

Use Marco again in MATE