diff --git a/Jenkinsfile b/Jenkinsfile
index 62aaac81e2..25fc2c4024 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
 
     stage('Style Check') {
       agent {
-        docker { image 'px4io/px4-dev-base:2017-12-30' }
+        docker { image 'px4io/px4-dev-base:2018-03-30' }
       }
 
       steps {
@@ -26,7 +26,7 @@ pipeline {
             builds["${node_name}"] = {
               node {
                 stage("Build Test ${node_name}") {
-                  docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
+                  docker.image('px4io/px4-dev-nuttx:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
                     stage("${node_name}") {
                       checkout scm
                       sh "export"
@@ -56,7 +56,7 @@ pipeline {
           builds["px4fmu-v2"] = {
             node {
               stage("Build Test ${node_name}") {
-                docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
+                docker.image('px4io/px4-dev-nuttx:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
                   stage("${node_name}") {
                     checkout scm
                     sh "export"
@@ -91,7 +91,7 @@ pipeline {
             builds["${node_name}"] = {
               node {
                 stage("Build Test ${node_name}") {
-                  docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
+                  docker.image('px4io/px4-dev-nuttx:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
                     stage("${node_name}") {
                       checkout scm
                       sh "export"
@@ -118,7 +118,7 @@ pipeline {
             builds["${node_name}"] = {
               node {
                 stage("Build Test ${node_name}") {
-                  docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
+                  docker.image('px4io/px4-dev-nuttx:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
                     stage("${node_name}") {
                       checkout scm
                       sh "export"
@@ -142,7 +142,7 @@ pipeline {
             builds["${node_name}"] = {
               node {
                 stage("Build Test ${node_name}") {
-                  docker.image('px4io/px4-dev-base:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
+                  docker.image('px4io/px4-dev-base:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
                     stage("${node_name}") {
                       checkout scm
                       sh "export"
@@ -165,7 +165,7 @@ pipeline {
             builds["${node_name}"] = {
               node {
                 stage("Build Test ${node_name}") {
-                  docker.image('px4io/px4-dev-raspi:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
+                  docker.image('px4io/px4-dev-raspi:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
                     stage("${node_name}") {
                       checkout scm
                       sh "export"
@@ -236,7 +236,7 @@ pipeline {
             builds["${node_name} (GCC7)"] = {
               node {
                 stage("Build Test ${node_name} (GCC7)") {
-                  docker.image('px4io/px4-dev-base-archlinux:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
+                  docker.image('px4io/px4-dev-base-archlinux:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
                     stage("${node_name}") {
                       checkout scm
                       sh "export"
@@ -262,7 +262,7 @@ pipeline {
         stage('clang analyzer') {
           agent {
             docker {
-              image 'px4io/px4-dev-clang:2017-12-30'
+              image 'px4io/px4-dev-clang:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -293,7 +293,7 @@ pipeline {
         stage('clang tidy') {
           agent {
             docker {
-              image 'px4io/px4-dev-clang:2017-12-30'
+              image 'px4io/px4-dev-clang:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -338,7 +338,7 @@ pipeline {
         stage('tests') {
           agent {
             docker {
-              image 'px4io/px4-dev-base:2017-12-30'
+              image 'px4io/px4-dev-base:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -353,7 +353,7 @@ pipeline {
         stage('ROS vtol mission new 1') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros:2017-12-31'
+              image 'px4io/px4-dev-ros:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -380,7 +380,7 @@ pipeline {
         stage('ROS vtol mission new 2') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros:2017-12-31'
+              image 'px4io/px4-dev-ros:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -407,7 +407,7 @@ pipeline {
         stage('ROS vtol mission old 1') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros:2017-12-31'
+              image 'px4io/px4-dev-ros:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -434,7 +434,7 @@ pipeline {
         stage('ROS vtol mission old 2') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros:2017-12-31'
+              image 'px4io/px4-dev-ros:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -461,7 +461,7 @@ pipeline {
         stage('ROS vtol mission old 3') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros:2017-12-31'
+              image 'px4io/px4-dev-ros:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -488,7 +488,7 @@ pipeline {
         stage('ROS MC mission box') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros:2017-12-31'
+              image 'px4io/px4-dev-ros:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -515,7 +515,7 @@ pipeline {
         stage('ROS offboard att') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros:2017-12-31'
+              image 'px4io/px4-dev-ros:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -542,7 +542,7 @@ pipeline {
         stage('ROS offboard pos') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros:2017-12-31'
+              image 'px4io/px4-dev-ros:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -575,7 +575,7 @@ pipeline {
 
         stage('airframe') {
           agent {
-            docker { image 'px4io/px4-dev-base:2017-12-30' }
+            docker { image 'px4io/px4-dev-base:2018-03-30' }
           }
           steps {
             sh 'make distclean'
@@ -586,7 +586,7 @@ pipeline {
 
         stage('parameter') {
           agent {
-            docker { image 'px4io/px4-dev-base:2017-12-30' }
+            docker { image 'px4io/px4-dev-base:2018-03-30' }
           }
           steps {
             sh 'make distclean'
@@ -597,7 +597,7 @@ pipeline {
 
         stage('module') {
           agent {
-            docker { image 'px4io/px4-dev-base:2017-12-30' }
+            docker { image 'px4io/px4-dev-base:2018-03-30' }
           }
           steps {
             sh 'make distclean'
@@ -609,7 +609,7 @@ pipeline {
         stage('uorb graphs') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx:2017-12-30'
+              image 'px4io/px4-dev-nuttx:2018-03-30'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -625,7 +625,7 @@ pipeline {
 
     stage('S3 Upload') {
       agent {
-        docker { image 'px4io/px4-dev-base:2017-12-30' }
+        docker { image 'px4io/px4-dev-base:2018-03-30' }
       }
 
       when {
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 76a5cc4f51..403125a7b8 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -4,10 +4,10 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
 	echo "guessing PX4_DOCKER_REPO based on input";
 	if [[ $@ =~ .*px4fmu.* ]]; then
 		# nuttx-px4fmu-v{1,2,3,4,5}
-		PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-12-30"
+		PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-03-30"
 	elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then
 		# posix_rpi_cross, posix_bebop_default
-		PX4_DOCKER_REPO="px4io/px4-dev-raspi:2017-12-30"
+		PX4_DOCKER_REPO="px4io/px4-dev-raspi:2018-03-30"
 	elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
 		# eagle, excelsior
 		PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-12-29"
@@ -16,13 +16,13 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
 		PX4_DOCKER_REPO="px4io/px4-dev-armhf:2017-12-30"
 	elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then	
 		# clang tools
-		PX4_DOCKER_REPO="px4io/px4-dev-clang:2017-12-30"
+		PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-03-30"
 	elif [[ $@ =~ .*cppcheck.* ]]; then
 		# TODO: remove this once px4io/px4-dev-base updates
 		PX4_DOCKER_REPO="px4io/px4-dev-base:ubuntu17.10"
 	elif [[ $@ =~ .*tests* ]]; then
 		# run all tests with simulation
-		PX4_DOCKER_REPO="px4io/px4-dev-simulation:2017-12-30"
+		PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-03-30"
 	fi
 else
 	echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@@ -30,7 +30,7 @@ fi
 
 # otherwise default to nuttx
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
-	PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-12-30"
+	PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-03-30"
 fi
 
 # docker hygiene