Gh506 improve build versions

#506