diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile
index 734afcc447..6ec95281ab 100644
--- a/.ci/Jenkinsfile-compile
+++ b/.ci/Jenkinsfile-compile
@@ -12,12 +12,11 @@ pipeline {
             armhf: "px4io/px4-dev-armhf:2019-10-24",
             base: "px4io/px4-dev-base-bionic:2019-10-24",
             nuttx: "px4io/px4-dev-nuttx:2019-10-24",
-            rpi: "px4io/px4-dev-raspi:2019-10-24",
             snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
           ]
 
           def armhf_builds = [
-            target: ["aerotenna_ocpoc_ubuntu"],
+            target: ["aerotenna_ocpoc_ubuntu", "emlid_navio2_cross", "parrot_bebop_default"],
             image: docker_images.armhf,
             archive: false
           ]
@@ -49,12 +48,6 @@ pipeline {
             archive: false
           ]
 
-          def rpi_builds = [
-            target: ["emlid_navio2_cross", "parrot_bebop_default"],
-            image: docker_images.rpi,
-            archive: false
-          ]
-
           def snapdragon_builds = [
             target: ["atlflight_eagle_qurt-default", "atlflight_eagle_default"],
             image: docker_images.snapdragon,
@@ -62,7 +55,7 @@ pipeline {
           ]
 
           def docker_builds = [
-            armhf_builds, base_builds, nuttx_builds_archive, nuttx_builds_other, rpi_builds, snapdragon_builds
+            armhf_builds, base_builds, nuttx_builds_archive, nuttx_builds_other, snapdragon_builds
           ]
 
           for (def build_type = 0; build_type < docker_builds.size(); build_type++) {
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index e31073d130..fa316f6f44 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -5,14 +5,11 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
 	if [[ $@ =~ .*px4_fmu.* ]]; then
 		# nuttx-px4fmu-v{1,2,3,4,5}
 		PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-10-24"
-	elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
-		# posix_rpi_cross, posix_bebop_default
-		PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-10-24"
 	elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
 		# eagle, excelsior
 		PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12"
-	elif [[ $@ =~ .*ocpoc.* ]]; then
-		# aerotennaocpoc_ubuntu
+	elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
+		# aerotennaocpoc_ubuntu, posix_rpi_cross, posix_bebop_default
 		PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-10-24"
 	elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
 		# clang tools