Try the containerized build
More changes, test one target ver until working