Build / Deploy simplification