Extract some deps, now part of base app img