Fix build executor collision issues in Jenkins