Better implemetation of jenkins runner script for #811