Trying to get some stability during the build process