First part of Containernet re-integration