[Combainer] Adopt for the current repo