diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml
index 1805930429..4bbc6389a8 100644
--- a/.github/workflows/sitl_tests.yml
+++ b/.github/workflows/sitl_tests.yml
@@ -44,7 +44,7 @@ jobs:
     - name: Core dump settings
       run: |
           ulimit -c unlimited
-          echo '/tmp/core.%e.%t' > /proc/sys/kernel/core_pattern
+          echo '/tmp/%e.core' > /proc/sys/kernel/core_pattern
     - name: Run SITL tests
       run:  test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 --abort-early test/mavsdk_tests/configs/sitl.json
     - name: Run SITL tests in Southern hemisphere
@@ -53,12 +53,21 @@ jobs:
     - name: Run SITL tests far in the West
       run: PX4_HOME_LAT=59.6176928 PX4_HOME_LON=-151.1453163 PX4_HOME_ALT=48 |
         test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 --abort-early test/mavsdk_tests/configs/sitl.json
-    - name: Show core files
-      if: always()
-      run: find /tmp -name "core*"
-    - name: Look for core files
-      if: always()
-      run: find /tmp -name "core.px4.*" | xargs -I '{}' gdb build/px4_sitl_default/bin/px4 '{}' -ex "thread apply all bt" -ex "quit"
+    - name: Look at core files
+      if: failure()
+      run: gdb build/px4_sitl_default/bin/px4 /tmp/px4.core -ex "thread apply all bt" -ex "quit"
+    - name: Upload px4 coredump
+      if: failure()
+      uses: actions/upload-artifact@v1
+      with:
+        name: coredump
+        path: /tmp/px4.core
+    - name: Upload px4 binary
+      if: failure()
+      uses: actions/upload-artifact@v1
+      with:
+        name: binary
+        path: build/px4_sitl_default/bin/px4
 
     # Report test coverage
     - name: disable the keychain credential helper