EZP-22465: fixed: track container builder file
EZP-22465: refactor service container