diff --git a/Makefile b/Makefile
index a46c529ee2..d1cbb52d2e 100644
--- a/Makefile
+++ b/Makefile
@@ -608,6 +608,10 @@ clean: | clean-common
 	rm -rf bin/* node_modules bottles/* pkg/* tmp/* $(STATUSGO) $(STATUSKEYCARDGO)
 	+ $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean
 
+clean-git:
+	git clean -fdx
+	git submodule foreach --recursive git clean -fdx
+
 force-rebuild-status-go:
 	bash ./scripts/force-rebuild-status-go.sh $(STATUSGO)
 
diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
index 23681c99e4..94a58267af 100644
--- a/ci/Jenkinsfile.linux
+++ b/ci/Jenkinsfile.linux
@@ -96,6 +96,6 @@ pipeline {
   post {
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    cleanup { cleanWs() }
+    cleanup { sh 'make clean-git' }
   }
 }
diff --git a/ci/Jenkinsfile.linux-cpp b/ci/Jenkinsfile.linux-cpp
index 52a3231a84..545ed1e40f 100644
--- a/ci/Jenkinsfile.linux-cpp
+++ b/ci/Jenkinsfile.linux-cpp
@@ -85,6 +85,6 @@ pipeline {
   post {
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    cleanup { cleanWs() }
+    cleanup { sh 'make clean-git' }
   }
 }
diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos
index 6d5bd8fb31..2bcfd524f1 100644
--- a/ci/Jenkinsfile.macos
+++ b/ci/Jenkinsfile.macos
@@ -108,6 +108,6 @@ pipeline {
   post {
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    cleanup { cleanWs() }
+    cleanup { sh 'make clean-git' }
   }
 }
diff --git a/ci/Jenkinsfile.macos-cpp.todo b/ci/Jenkinsfile.macos-cpp.todo
index 34b606f71b..10fce709a6 100644
--- a/ci/Jenkinsfile.macos-cpp.todo
+++ b/ci/Jenkinsfile.macos-cpp.todo
@@ -77,6 +77,6 @@ pipeline {
   post {
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    cleanup { cleanWs() }
+    cleanup { sh 'make clean-git' }
   }
 }
diff --git a/ci/Jenkinsfile.uitests b/ci/Jenkinsfile.uitests
index 4ffdee48c9..15ba6c6640 100644
--- a/ci/Jenkinsfile.uitests
+++ b/ci/Jenkinsfile.uitests
@@ -145,6 +145,6 @@ pipeline {
   post {
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    cleanup { cleanWs() }
+    cleanup { sh 'make clean-git' }
   }
 }
diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows
index 91940ff8c0..166616d150 100644
--- a/ci/Jenkinsfile.windows
+++ b/ci/Jenkinsfile.windows
@@ -99,6 +99,6 @@ pipeline {
   post {
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    cleanup { cleanWs(disableDeferredWipeout: true, deleteDirs: true) }
+    cleanup { sh 'make clean-git' }
   }
 }
diff --git a/ci/Jenkinsfile.windows-cpp.todo b/ci/Jenkinsfile.windows-cpp.todo
index 55f409b33c..f07297e321 100644
--- a/ci/Jenkinsfile.windows-cpp.todo
+++ b/ci/Jenkinsfile.windows-cpp.todo
@@ -78,6 +78,6 @@ pipeline {
   post {
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    cleanup { cleanWs() }
+    cleanup { sh 'make clean-git' }
   }
 }