diff --git a/.travis.yml b/.travis.yml
index 32f9ebb15b..b694c6e52c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ script:
     elif [[ "${BUILD_TARGET}" = "px4_metadata" ]]; then
       ./Tools/docker_run.sh 'make px4_metadata';
     elif [[ "${BUILD_TARGET}" = "clang-tidy" ]]; then
-      PX4_DOCKER_REPO=px4io/px4-dev-clang:2017-04-22 ./Tools/docker_run.sh 'make clang-tidy-parallel';
+      ./Tools/docker_run.sh 'make clang-tidy-parallel';
     fi
 
 after_success:
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 78c41b00ad..2ec1da8021 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -1,28 +1,56 @@
 #! /bin/bash
 
-if [ -z "$PX4_DOCKER_REPO" ]; then
-	PX4_DOCKER_REPO=px4io/px4-dev-nuttx:2017-04-22
+if [[ $@ =~ .*px4fmu.* ]]; then
+	# nuttx-px4fmu-v{1,2,3,4,5}
+	PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-04-22"
+elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then
+	# posix_rpi_cross, posix_bebop_default
+	PX4_DOCKER_REPO="px4io/px4-dev-raspi:2017-04-22"
+elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
+	# eagle, excelsior
+	PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-01-14"
+elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
+	# clang tools
+	PX4_DOCKER_REPO="px4io/px4-dev-clang:2017-04-22"
+elif [[ $@ =~ .*tests* ]]; then
+	# run all tests with simulation
+	PX4_DOCKER_REPO="px4io/px4-dev-simulation:2017-04-22"
 fi
 
+# otherwise default to nuttx
+if [ -z "$PX4_DOCKER_REPO" ]; then
+	PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-04-22"
+fi
+
+# docker hygiene
+
+#Delete all stopped containers (including data-only containers)
+#docker rm $(docker ps -a -q)
+
+#Delete all 'untagged/dangling' (<none>) images
+#docker rmi $(docker images -q -f dangling=true)
+
+echo "PX4_DOCKER_REPO: $PX4_DOCKER_REPO";
+
 PWD=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 SRC_DIR=$PWD/../
 
 CCACHE_DIR=${HOME}/.ccache
-mkdir -p ${CCACHE_DIR}
+mkdir -p "${CCACHE_DIR}"
 
 X11_TMP=/tmp/.X11-unix
 
-docker run -it --rm -w ${SRC_DIR} \
-	-e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-	-e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-	-e BRANCH_NAME=${BRANCH_NAME} \
-	-e CCACHE_DIR=${CCACHE_DIR} \
-	-e CI=${CI} \
-	-e DISPLAY=$DISPLAY \
+docker run -it --rm -w "${SRC_DIR}" \
+	-e AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}" \
+	-e AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}" \
+	-e BRANCH_NAME="${BRANCH_NAME}" \
+	-e CCACHE_DIR="${CCACHE_DIR}" \
+	-e CI="${CI}" \
+	-e DISPLAY="${DISPLAY}" \
 	-e GIT_SUBMODULES_ARE_EVIL=1 \
-	-e LOCAL_USER_ID=`id -u` \
-	-e TRAVIS_BRANCH=${TRAVIS_BRANCH} \
-	-e TRAVIS_BUILD_ID=${TRAVIS_BUILD_ID} \
+	-e LOCAL_USER_ID="$(id -u)" \
+	-e TRAVIS_BRANCH="${TRAVIS_BRANCH}" \
+	-e TRAVIS_BUILD_ID="${TRAVIS_BUILD_ID}" \
 	-v ${CCACHE_DIR}:${CCACHE_DIR}:rw \
 	-v ${SRC_DIR}:${SRC_DIR}:rw \
 	-v ${X11_TMP}:${X11_TMP}:ro \