diff --git a/contrib/jenkins-arm.sh b/contrib/jenkins-arm.sh
index ef116b1..acdbe3c 100755
--- a/contrib/jenkins-arm.sh
+++ b/contrib/jenkins-arm.sh
@@ -24,3 +24,5 @@
 build builddir
 # verify build in source tree
 build .
+
+osmo-clean-workspace.sh
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index d731504..5798c95 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -29,3 +29,5 @@
 # is well separated from the source tree state.
 $MAKE distcheck \
     || cat-testlogs.sh
+
+osmo-clean-workspace.sh
diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh
index bc4ac65..a6ffe7f 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -8,6 +8,8 @@
     exit 1
 fi
 
+osmo-clean-workspace.sh
+
 verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
 
 prep_build() {
@@ -16,11 +18,8 @@
 
     cd "$_src_dir"
 
-    # a failed 'make distcheck' may leave files without write permissions
-    chmod -R a+w .
-    git clean -dxf
-    # make absolutely sure no src files have modifications
-    git checkout -f HEAD
+    # clean again before each build variant
+    osmo-clean-workspace.sh
 
     autoreconf --install --force