Update docker file and build scripts