Update build-package

More work towards getting production versions to work