Container breakup

Signed-off-by: arege <asapteam@gmail>