Merge "[POMBA] Uses new tpls for repos / images"