diff --git a/circle.yml b/circle.yml
index 492719d00b3dc8d367cd0165029e80944a13b3bc..4fb497d9fa4de580184c6367b1181670054c6425 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,17 +4,22 @@ machine:
 
 checkout:
   post:
+    # workaround for known git bug where attempting to fetch a missing commit fails early on the first try
+    - git submodule update --init || true
     - git submodule sync --recursive
     - git submodule update --init --recursive
 
-## Customize dependencies
 dependencies:
-  cache_directories:
-    - "~/.ccache"
   pre:
     - docker pull px4io/px4-dev-nuttx-gcc4.9
 
 test:
   override:
-    - docker run --rm -v `pwd`:`pwd`:rw -w=`pwd` -v $HOME/.ccache:$HOME/.ccache:rw -e CCACHE_DIR=$HOME/.ccache --user=$UID -it px4io/px4-dev-nuttx-gcc4.9 /bin/bash -c "ccache -z; make px4fmu-v4_default; ccache -s"
+    - docker run --rm -v `pwd`:`pwd`:rw -w=`pwd` --user=$UID -it px4io/px4-dev-nuttx-gcc4.9 /bin/bash -c "make quick_check"
+
+general:
+  artifacts:
+    - "build_px4fmu-v2_default/parameters.xml"
+    - "build_px4fmu-v2_default/airframes.xml"
+    - "build_.*/src/firmware/nuttx/.*.px4"