diff --git a/Jenkinsfile b/Jenkinsfile
index 9e9f5787c8..fb092cd83d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -235,9 +235,9 @@ pipeline {
               sh('rm -f px4_msgs/srv/*.srv')
               sh('rm -f px4_msgs/srv/versioned/*.srv')
               sh('cp msg/*.msg px4_msgs/msg/')
-              sh('mkdir -p px4_msgs/msg/versioned && cp msg/versioned/*.msg px4_msgs/msg/versioned/')
+              sh('cp msg/versioned/*.msg px4_msgs/msg/ || true')
               sh('cp srv/*.srv px4_msgs/srv/')
-              sh('mkdir -p px4_msgs/srv/versioned && cp srv/versioned/*.srv px4_msgs/srv/versioned/')
+              sh('cp srv/versioned/*.srv px4_msgs/srv/ || true')
               sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
               sh('cd px4_msgs; git push origin main || true')
               sh('rm -rf px4_msgs')