Please let this fix the Jenkins builds :(
Buildscript fix
Buildscript fixes