diff --git a/Jenkinsfile b/Jenkinsfile
index 28c360b587..6a0f610b3c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -364,6 +364,10 @@ pipeline {
               archiveArtifacts '**/*.ulg'
               sh './Tools/upload_log.py -q --description "${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg'
             }
+            failure {
+              archiveArtifacts '.ros/*/px4/**.xml'
+              archiveArtifacts '.ros/log/**.log'
+            }
           }
         }
 
@@ -385,6 +389,10 @@ pipeline {
               archiveArtifacts '**/*.ulg'
               sh './Tools/upload_log.py -q --description "${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg'
             }
+            failure {
+              archiveArtifacts '.ros/*/px4/**.xml'
+              archiveArtifacts '.ros/log/**.log'
+            }
           }
         }
 
@@ -406,6 +414,10 @@ pipeline {
               archiveArtifacts '**/*.ulg'
               sh './Tools/upload_log.py -q --description "${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg'
             }
+            failure {
+              archiveArtifacts '.ros/*/px4/**.xml'
+              archiveArtifacts '.ros/log/**.log'
+            }
           }
         }
 
@@ -427,6 +439,10 @@ pipeline {
               archiveArtifacts '**/*.ulg'
               sh './Tools/upload_log.py -q --description "${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg'
             }
+            failure {
+              archiveArtifacts '.ros/*/px4/**.xml'
+              archiveArtifacts '.ros/log/**.log'
+            }
           }
         }
 
@@ -448,6 +464,10 @@ pipeline {
               archiveArtifacts '**/*.ulg'
               sh './Tools/upload_log.py -q --description "${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg'
             }
+            failure {
+              archiveArtifacts '.ros/*/px4/**.xml'
+              archiveArtifacts '.ros/log/**.log'
+            }
           }
         }
 
@@ -469,6 +489,10 @@ pipeline {
               archiveArtifacts '**/*.ulg'
               sh './Tools/upload_log.py -q --description "${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg'
             }
+            failure {
+              archiveArtifacts '.ros/*/px4/**.xml'
+              archiveArtifacts '.ros/log/**.log'
+            }
           }
         }
 
@@ -490,6 +514,10 @@ pipeline {
               archiveArtifacts '**/*.ulg'
               sh './Tools/upload_log.py -q --description "${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg'
             }
+            failure {
+              archiveArtifacts '.ros/*/px4/**.xml'
+              archiveArtifacts '.ros/log/**.log'
+            }
           }
         }
 
@@ -511,6 +539,10 @@ pipeline {
               archiveArtifacts '**/*.ulg'
               sh './Tools/upload_log.py -q --description "${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg'
             }
+            failure {
+              archiveArtifacts '.ros/*/px4/**.xml'
+              archiveArtifacts '.ros/log/**.log'
+            }
           }
         }