Merge "[COMMON] Uses new generator for repos and images"