diff --git a/modules/jenkins_jobs/templates/builder_copy_bundle.xml.erb b/modules/jenkins_jobs/templates/builder_copy_bundle.xml.erb
index be713c36c1..850d6762bd 100644
--- a/modules/jenkins_jobs/templates/builder_copy_bundle.xml.erb
+++ b/modules/jenkins_jobs/templates/builder_copy_bundle.xml.erb
@@ -6,18 +6,6 @@
       <selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
     </hudson.plugins.copyartifact.CopyArtifact>
     <hudson.tasks.Shell>
-      <command># Support jobs, such as nova-docs, which are not yet triggered by gerrit
-if [ &quot;x$GERRIT_BRANCH&quot; = &quot;x&quot; ] ; then
-  GERRIT_BRANCH=master
-fi
-mv jenkins_venvs/$GERRIT_BRANCH/.cache.bundle .
-rm -fr jenkins_venvs
-
-if [ -f tools/test-requires -a \
-    `git diff HEAD^1 tools/test-requires 2&gt;/dev/null | wc -l` -gt 0 -o \
-      `git diff HEAD^1 tools/pip-requires 2&gt;/dev/null | wc -l` -gt 0 ]
-then
-  rm .cache.bundle
-fi</command>
+      <command>bash -x ~/openstack-ci/slave_scripts/copy-bundle.sh</command>
     </hudson.tasks.Shell>
   </builders>
diff --git a/modules/jenkins_jobs/templates/builder_coverage.xml.erb b/modules/jenkins_jobs/templates/builder_coverage.xml.erb
index df75227b87..b60713483c 100644
--- a/modules/jenkins_jobs/templates/builder_coverage.xml.erb
+++ b/modules/jenkins_jobs/templates/builder_coverage.xml.erb
@@ -1,9 +1,4 @@
     <hudson.tasks.Shell>
-      <command>if [ -f .cache.bundle ] ; then
-  tox -ejenkinscover
-else
-  tox -evenv -- nosetests test/unit --with-xcoverage --cover-erase --cover-package=<%= project %>
-
-fi</command>
+      <command>bash -x ~/openstack-ci/slave_scripts/run-cover.sh</command>
     </hudson.tasks.Shell>
 
diff --git a/modules/jenkins_jobs/templates/builder_docs.xml.erb b/modules/jenkins_jobs/templates/builder_docs.xml.erb
index b0820ddddc..24d7db9b0d 100644
--- a/modules/jenkins_jobs/templates/builder_docs.xml.erb
+++ b/modules/jenkins_jobs/templates/builder_docs.xml.erb
@@ -1,10 +1,4 @@
     <hudson.tasks.Shell>
-      <command>mkdir -p doc/build
-export HUDSON_PUBLISH_DOCS=1
-if [ -f .cache.bundle ] ; then
-  tox -ejenkinsvenv python setup.py build_sphinx
-else
-  tox -evenv python setup.py build_sphinx
-fi</command>
+      <command>bash -x ~/openstack-ci/slave_scripts/run-docs.sh</command>
     </hudson.tasks.Shell>
 
diff --git a/modules/jenkins_jobs/templates/builder_gerrit_git_prep.xml.erb b/modules/jenkins_jobs/templates/builder_gerrit_git_prep.xml.erb
index dfbbb5af50..3409055992 100644
--- a/modules/jenkins_jobs/templates/builder_gerrit_git_prep.xml.erb
+++ b/modules/jenkins_jobs/templates/builder_gerrit_git_prep.xml.erb
@@ -1,31 +1,3 @@
     <hudson.tasks.Shell>
-      <command>#!/bin/bash -xe
-
-if [ -z &quot;$GERRIT_NEWREV&quot; ] &amp;&amp; [ -z &quot;$GERRIT_REFSPEC&quot; ]
-then
-    echo &quot;This job may only be triggered by Gerrit.&quot;
-    exit 1
-fi
-
-if [[ ! -e .git ]]
-then
-    git clone https://review.<%= site %>.org/p/$GERRIT_PROJECT .
-fi
-git remote update || git remote update # attempt to work around bug #925790
-git reset --hard
-git clean -x -f -d -q
-
-if [ ! -z &quot;$GERRIT_REFSPEC&quot; ]
-then
-    git checkout $GERRIT_BRANCH
-    git reset --hard remotes/origin/$GERRIT_BRANCH
-    git clean -x -f -d -q
-    git fetch https://review.<%= site %>.org/p/$GERRIT_PROJECT $GERRIT_REFSPEC
-    git merge FETCH_HEAD
-else
-    git checkout $GERRIT_NEWREV
-    git reset --hard $GERRIT_NEWREV
-    git clean -x -f -d -q
-fi
-</command>
+      <command>bash -x ~/openstack-ci/slave_scripts/gerrit-git-prep.sh <%= site %> </command>
     </hudson.tasks.Shell>
diff --git a/modules/jenkins_jobs/templates/builder_pep8.xml.erb b/modules/jenkins_jobs/templates/builder_pep8.xml.erb
index 35a0227dd0..640930f7c2 100644
--- a/modules/jenkins_jobs/templates/builder_pep8.xml.erb
+++ b/modules/jenkins_jobs/templates/builder_pep8.xml.erb
@@ -1,9 +1,3 @@
     <hudson.tasks.Shell>
-      <command>#!/bin/sh
-
-if [ -f .cache.bundle ] ; then
-  tox -v -ejenkinspep8 | tee pep8.txt
-else
-  tox -v -epep8 | tee pep8.txt
-fi</command>
+      <command>tox -v -epep8 | tee pep8.txt</command>
     </hudson.tasks.Shell>
diff --git a/modules/jenkins_jobs/templates/builder_python26.xml.erb b/modules/jenkins_jobs/templates/builder_python26.xml.erb
index 0bf35607c5..a3bc6ca151 100644
--- a/modules/jenkins_jobs/templates/builder_python26.xml.erb
+++ b/modules/jenkins_jobs/templates/builder_python26.xml.erb
@@ -1,8 +1,3 @@
     <hudson.tasks.Shell>
-      <command>if [ -f .cache.bundle ]
-then
-  tox -v -ejenkinspy26
-else
-  tox -v -epy26
-fi</command>
+      <command>bash -x ~/openstack-ci/slave_scripts/run-tox.sh 26</command>
     </hudson.tasks.Shell>
diff --git a/modules/jenkins_jobs/templates/builder_python27.xml.erb b/modules/jenkins_jobs/templates/builder_python27.xml.erb
index 462e5f1ed4..a3bc6ca151 100644
--- a/modules/jenkins_jobs/templates/builder_python27.xml.erb
+++ b/modules/jenkins_jobs/templates/builder_python27.xml.erb
@@ -1,8 +1,3 @@
     <hudson.tasks.Shell>
-      <command>if [ -f .cache.bundle ]
-then
-  tox -v -ejenkinspy27
-else
-  tox -v -epy27
-fi</command>
+      <command>bash -x ~/openstack-ci/slave_scripts/run-tox.sh 26</command>
     </hudson.tasks.Shell>
diff --git a/modules/jenkins_jobs/templates/builder_tarball.xml.erb b/modules/jenkins_jobs/templates/builder_tarball.xml.erb
index 4c51f32b42..0291d8de23 100644
--- a/modules/jenkins_jobs/templates/builder_tarball.xml.erb
+++ b/modules/jenkins_jobs/templates/builder_tarball.xml.erb
@@ -1,4 +1,3 @@
     <hudson.tasks.Shell>
-      <command>~/openstack-ci/slave_scripts/create-tarball.sh
-</command>
+      <command>bash -x ~/openstack-ci/slave_scripts/create-tarball.sh</command>
     </hudson.tasks.Shell>