Merge "[COMMON][MUSIC] Uses new tpls for repos / images"