diff --git a/Jenkinsfile b/Jenkinsfile
index 50a9715c2..faeff78bb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -176,7 +176,6 @@ def cleanup() {
     sh "cat build.*"
     sh "make docker-buildx-remove"
     sh "make clean"
-    sh "rm build.*"
   } catch (error) {
     echo "cleanup failed, ignoring this."
   }
diff --git a/Makefile b/Makefile
index 8e76f0c37..df3f0232b 100644
--- a/Makefile
+++ b/Makefile
@@ -565,7 +565,7 @@ $(s3-load):
 docker-buildx-remove:
 	docker stop registry || echo "no registry"
 	docker rm registry || echo "no registry"
-	docker buildx rm ci-local
+	docker buildx rm ci-local || echo "no buildx cache"
 	docker buildx ls
 	docker context ls