try to fix singleton depenency in scripting
this will allow us to drop azure builds once this is confirmed working