More restriction on deps
Reduce intermediate steps in dockerfile