diff --git a/builder/image-software.sh b/builder/image-software.sh
index aea52ae..6916c68 100755
--- a/builder/image-software.sh
+++ b/builder/image-software.sh
@@ -67,8 +67,9 @@ my_travis_retry pip install selectors2
 
 echo_stamp "Install catkin packages"
 cd /home/pi/catkin_ws/src
-source ../devel/setup.bash
 git clone https://github.com/CopterExpress/clever_tools.git
+cd ..
+source devel/setup.bash
 catkin_make --pkg clever_flight_routines
 source devel/setup.bash