diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests
index 2ae7022e90aa..26e9cb5fd92e 100644
--- a/.ci/Jenkinsfile-SITL_tests
+++ b/.ci/Jenkinsfile-SITL_tests
@@ -8,7 +8,7 @@ pipeline {
     stage('Build') {
       agent {
         docker {
-          image 'px4io/px4-dev-ros-melodic:2020-04-01'
+          image 'px4io/px4-dev-ros-melodic:2020-05-28'
           args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
         }
       }
@@ -136,7 +136,7 @@ def createTestNode(Map test_def) {
   return {
     node {
       cleanWs()
-      docker.image("px4io/px4-dev-ros-melodic:2020-04-01").inside('-e HOME=${WORKSPACE}') {
+      docker.image("px4io/px4-dev-ros-melodic:2020-05-28").inside('-e HOME=${WORKSPACE}') {
         stage(test_def.name) {
           def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
           def test_ok = true
diff --git a/.ci/Jenkinsfile-SITL_tests_ASan b/.ci/Jenkinsfile-SITL_tests_ASan
index 8dc8b733b331..dcb616c827a1 100644
--- a/.ci/Jenkinsfile-SITL_tests_ASan
+++ b/.ci/Jenkinsfile-SITL_tests_ASan
@@ -8,7 +8,7 @@ pipeline {
     stage('Build') {
       agent {
         docker {
-          image 'px4io/px4-dev-ros-melodic:2020-04-01'
+          image 'px4io/px4-dev-ros-melodic:2020-05-28'
           args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
         }
       }
@@ -137,7 +137,7 @@ def createTestNode(Map test_def) {
   return {
     node {
       cleanWs()
-      docker.image("px4io/px4-dev-ros-melodic:2020-04-01").inside('-e HOME=${WORKSPACE}') {
+      docker.image("px4io/px4-dev-ros-melodic:2020-05-28").inside('-e HOME=${WORKSPACE}') {
         stage(test_def.name) {
           def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
           def test_ok = true
diff --git a/.ci/Jenkinsfile-SITL_tests_coverage b/.ci/Jenkinsfile-SITL_tests_coverage
index e22ab1d3d83e..03936fc86ec9 100644
--- a/.ci/Jenkinsfile-SITL_tests_coverage
+++ b/.ci/Jenkinsfile-SITL_tests_coverage
@@ -85,7 +85,7 @@ pipeline {
         stage('code coverage (python)') {
           agent {
             docker {
-              image 'px4io/px4-dev-base-bionic:2020-04-01'
+              image 'px4io/px4-dev-base-bionic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -105,7 +105,7 @@ pipeline {
         stage('unit tests') {
           agent {
             docker {
-              image 'px4io/px4-dev-base-bionic:2020-04-01'
+              image 'px4io/px4-dev-base-bionic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -143,7 +143,7 @@ def createTestNode(Map test_def) {
   return {
     node {
       cleanWs()
-      docker.image("px4io/px4-dev-ros-melodic:2020-04-01").inside('-e HOME=${WORKSPACE}') {
+      docker.image("px4io/px4-dev-ros-melodic:2020-05-28").inside('-e HOME=${WORKSPACE}') {
         stage(test_def.name) {
           def test_ok = true
           sh('export')
diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile
index 54d184e6a19c..51204870ba30 100644
--- a/.ci/Jenkinsfile-compile
+++ b/.ci/Jenkinsfile-compile
@@ -9,10 +9,10 @@ pipeline {
         script {
           def build_nodes = [:]
           def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2020-04-01",
-            base: "px4io/px4-dev-base-bionic:2020-04-01",
-            nuttx: "px4io/px4-dev-nuttx-bionic:2020-04-01",
-            snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01"
+            armhf: "px4io/px4-dev-armhf:2020-05-28",
+            base: "px4io/px4-dev-base-bionic:2020-05-28",
+            nuttx: "px4io/px4-dev-nuttx-bionic:2020-05-28",
+            snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-05-28"
           ]
 
           def armhf_builds = [
@@ -101,7 +101,7 @@ pipeline {
     // TODO: actually upload artifacts to S3
     // stage('S3 Upload') {
     //   agent {
-    //     docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+    //     docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
     //   }
     //   options {
     //         skipDefaultCheckout()
@@ -135,7 +135,7 @@ def createBuildNode(Boolean archive, String docker_image, String target) {
 
     // TODO: fix the snapdragon image
     bypass_entrypoint = ''
-    if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-04-01') {
+    if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-05-28') {
       bypass_entrypoint = ' --entrypoint=""'
     }
 
diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware
index ec5dac06bd8c..e1189b637481 100644
--- a/.ci/Jenkinsfile-hardware
+++ b/.ci/Jenkinsfile-hardware
@@ -12,7 +12,7 @@ pipeline {
             stage("build px4_fmu-v2_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -80,7 +80,7 @@ pipeline {
             stage("build px4_fmu-v3_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -154,7 +154,7 @@ pipeline {
             stage("build px4_fmu-v4_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -227,7 +227,7 @@ pipeline {
             stage("build px4_fmu-v4pro_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -301,7 +301,7 @@ pipeline {
             stage("build px4_fmu-v5_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -375,7 +375,7 @@ pipeline {
             stage("build px4_fmu-v5_optimized") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -448,7 +448,7 @@ pipeline {
             stage("build px4_fmu-v5_stackcheck") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -523,7 +523,7 @@ pipeline {
             stage("build modalai_fc-v1_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -596,7 +596,7 @@ pipeline {
             stage("build holybro_durandal-v1_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -671,7 +671,7 @@ pipeline {
             stage("build nxp_fmuk66-v3_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+                  image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 071a66a1f781..db27b5985f4f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: px4io/px4-dev-nuttx-bionic:2020-04-01
+      - image: px4io/px4-dev-nuttx-bionic:2020-05-28
     steps:
       - checkout
       - run:
diff --git a/.github/workflows/bloaty.yml b/.github/workflows/bloaty.yml
index 273a1ba014a8..60898f92acf6 100644
--- a/.github/workflows/bloaty.yml
+++ b/.github/workflows/bloaty.yml
@@ -26,7 +26,7 @@ jobs:
           px4_fmu-v5x_default,
           px4_io-v2_default,
           ]
-    container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-04-01
+    container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-05-28
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml
index 453e461155c8..138c8433f6c0 100644
--- a/.github/workflows/build_tests.yml
+++ b/.github/workflows/build_tests.yml
@@ -17,7 +17,7 @@ jobs:
           bionic,
           focal
           ]
-    container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-01
+    container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-05-28
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index ade62c10dd84..501ab097b924 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -17,7 +17,7 @@ jobs:
           bionic,
           focal
           ]
-    container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-01
+    container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-05-28
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/.github/workflows/compile_linux.yml b/.github/workflows/compile_linux.yml
index 2172ca833af8..75c88f60ea14 100644
--- a/.github/workflows/compile_linux.yml
+++ b/.github/workflows/compile_linux.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-armhf:2020-04-01
+    container: px4io/px4-dev-armhf:2020-05-28
     strategy:
       matrix:
         config: [
diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml
index 7755762bd4cc..cce091a2097f 100644
--- a/.github/workflows/compile_nuttx.yml
+++ b/.github/workflows/compile_nuttx.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-bionic:2020-04-01
+    container: px4io/px4-dev-nuttx-bionic:2020-05-28
     strategy:
       matrix:
         config: [
diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml
index 3fef85d145d0..a04aedd5bb23 100644
--- a/.github/workflows/sitl_tests.yml
+++ b/.github/workflows/sitl_tests.yml
@@ -18,7 +18,7 @@ jobs:
           focal
           ]
     container:
-      image: px4io/px4-dev-simulation-${{ matrix.ubuntu_release }}:2020-04-01
+      image: px4io/px4-dev-simulation-${{ matrix.ubuntu_release }}:2020-05-28
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1
diff --git a/Jenkinsfile b/Jenkinsfile
index e2db6a05983e..5be8991dccef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
         stage('Catkin build on ROS workspace') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros-melodic:2020-04-01'
+              image 'px4io/px4-dev-ros-melodic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -52,7 +52,7 @@ pipeline {
         stage('Colcon build on ROS2 workspace') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros2-dashing:2020-04-01'
+              image 'px4io/px4-dev-ros2-dashing:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -83,7 +83,7 @@ pipeline {
 
         stage('Style check') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh 'make check_format'
@@ -98,7 +98,7 @@ pipeline {
         stage('px4_fmu-v5 (no ninja)') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+              image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -124,7 +124,7 @@ pipeline {
         stage('px4_sitl (no ninja)') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+              image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -150,7 +150,7 @@ pipeline {
         stage('SITL unit tests') {
           agent {
             docker {
-              image 'px4io/px4-dev-base-bionic:2020-04-01'
+              image 'px4io/px4-dev-base-bionic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -190,7 +190,7 @@ pipeline {
         stage('Clang analyzer') {
           agent {
             docker {
-              image 'px4io/px4-dev-clang:2020-04-01'
+              image 'px4io/px4-dev-clang:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -228,7 +228,7 @@ pipeline {
         stage('Clang tidy') {
           agent {
             docker {
-              image 'px4io/px4-dev-clang:2020-04-01'
+              image 'px4io/px4-dev-clang:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -250,7 +250,7 @@ pipeline {
         stage('Cppcheck') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros-melodic:2020-04-01'
+              image 'px4io/px4-dev-ros-melodic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -288,7 +288,7 @@ pipeline {
         stage('Check stack') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+              image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -308,7 +308,7 @@ pipeline {
         stage('ShellCheck') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+              image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -327,7 +327,7 @@ pipeline {
         stage('Module config validation') {
           agent {
             docker {
-              image 'px4io/px4-dev-base-bionic:2020-04-01'
+              image 'px4io/px4-dev-base-bionic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -352,7 +352,7 @@ pipeline {
 
         stage('Airframe') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh 'make distclean'
@@ -371,7 +371,7 @@ pipeline {
 
         stage('Parameter') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh 'make distclean'
@@ -390,7 +390,7 @@ pipeline {
 
         stage('Module') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh 'make distclean'
@@ -410,7 +410,7 @@ pipeline {
         stage('uORB graphs') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
+              image 'px4io/px4-dev-nuttx-bionic:2020-05-28'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -439,7 +439,7 @@ pipeline {
 
         stage('Devguide') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh('export')
@@ -469,7 +469,7 @@ pipeline {
 
         stage('Userguide') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh('export')
@@ -497,7 +497,7 @@ pipeline {
 
         stage('QGroundControl') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh('export')
@@ -525,7 +525,7 @@ pipeline {
 
         stage('PX4 ROS msgs') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh('export')
@@ -554,7 +554,7 @@ pipeline {
 
         stage('PX4 ROS2 bridge') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh('export')
@@ -597,7 +597,7 @@ pipeline {
 
         stage('S3') {
           agent {
-            docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
+            docker { image 'px4io/px4-dev-base-bionic:2020-05-28' }
           }
           steps {
             sh('export')
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 6a0a7bb9e8c7..abdfb728d26b 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -4,22 +4,22 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
 	echo "guessing PX4_DOCKER_REPO based on input";
 	if [[ $@ =~ .*px4_fmu.* ]]; then
 		# nuttx-px4fmu-v{1,2,3,4,5}
-		PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-04-01"
+		PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-05-28"
 	elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]]; then
 		# aerotenna_ocpoc_default, beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default
-		PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01"
+		PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-05-28"
 	elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
 		# eagle, excelsior
-		PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-04-01"
+		PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-05-28"
 	elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
 		# aerotenna_ocpoc_default, posix_rpi_cross, posix_bebop_default
-		PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01"
+		PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-05-28"
 	elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
 		# clang tools
-		PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-04-01"
+		PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-05-28"
 	elif [[ $@ =~ .*tests* ]]; then
 		# run all tests with simulation
-		PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-04-01"
+		PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-05-28"
 	fi
 else
 	echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@@ -27,7 +27,7 @@ fi
 
 # otherwise default to nuttx
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
-	PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-04-01"
+	PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-05-28"
 fi
 
 # docker hygiene