diff --git a/builder/image-ros.sh b/builder/image-ros.sh
index e98934db..48f9fa94 100755
--- a/builder/image-ros.sh
+++ b/builder/image-ros.sh
@@ -111,10 +111,14 @@ my_travis_retry rosdep install -y --from-paths src --ignore-src --rosdistro ${RO
 my_travis_retry pip3 install wheel
 my_travis_retry pip3 install -r /home/pi/catkin_ws/src/clover/clover/requirements.txt
 source /opt/ros/${ROS_DISTRO}/setup.bash
-# Don't build simulation plugins for actual drone
-catkin_make -j2 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+# At first whitelist nothing to initialize the workspace:
+catkin_make -DCATKIN_WHITELIST_PACKAGES="<nothing>"
 source devel/setup.bash
 
+# Build everything:
+catkin_make -j2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_WHITELIST_PACKAGES=""
+
 echo_stamp "Install clever package (for backwards compatibility)"
 cd /home/pi/catkin_ws/src/clover/builder/assets/clever
 ./setup.py install