diff --git a/stage3/03-leo-ros/02-run.sh b/stage3/03-leo-ros/02-run.sh
index 35b24ad..fecc100 100755
--- a/stage3/03-leo-ros/02-run.sh
+++ b/stage3/03-leo-ros/02-run.sh
@@ -2,13 +2,3 @@
 
 mkdir -p "${ROOTFS_DIR}/etc/ros/catkin_ws"
 install -m 644 files/leo-erc.repos "${ROOTFS_DIR}/etc/ros/catkin_ws/"
-
-on_chroot <<EOF
-cd /etc/ros/catkin_ws
-vcs import < leo-erc.repos
-rosdep update
-rosdep fix-permissions
-rosdep install --from-paths src -iy
-catkin config --extend /opt/ros/melodic --install -i /opt/ros/leo
-catkin build
-EOF
diff --git a/stage3/03-leo-ros/03-run-chroot.sh b/stage3/03-leo-ros/03-run-chroot.sh
new file mode 100644
index 0000000..c3972f4
--- /dev/null
+++ b/stage3/03-leo-ros/03-run-chroot.sh
@@ -0,0 +1,8 @@
+export ROS_HOME=/var/ros
+cd /etc/ros/catkin_ws
+vcs import < leo-erc.repos
+rosdep update
+chown -R ${FIRST_USER_NAME}:${FIRST_USER_NAME} /var/ros/rosdep
+rosdep install --rosdistro melodic --from-paths src -iy
+catkin config --extend /opt/ros/melodic --install -i /opt/ros/leo
+catkin build --no-status
\ No newline at end of file