diff --git a/builder/image-software.sh b/builder/image-software.sh
index 6916c68..cc21aea 100755
--- a/builder/image-software.sh
+++ b/builder/image-software.sh
@@ -49,9 +49,6 @@ my_travis_retry() {
   return $result
 }
 
-echo_stamp "Change repo owner to pi"
-chown -Rf pi:pi /home/pi/clever-show/
-
 echo_stamp "Update apt cache"
 apt-get update -qq
 
@@ -73,4 +70,8 @@ source devel/setup.bash
 catkin_make --pkg clever_flight_routines
 source devel/setup.bash
 
+echo_stamp "Change clever-show and catkin_ws owner to pi"
+chown -Rf pi:pi /home/pi/clever-show/
+chown -Rf pi:pi /home/pi/catkin_ws/
+
 echo_stamp "End of software installation"