diff --git a/builder/image-build.sh b/builder/image-build.sh
index 24ba1a1..fb40a10 100755
--- a/builder/image-build.sh
+++ b/builder/image-build.sh
@@ -99,6 +99,10 @@ img-chroot ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-software.sh'
 # Configure image
 img-chroot ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-configure.sh'
 
+# Reconfiguring clever show repository for simplier unshallowing
+cd ${REPO_DIR}
+git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+
 # Copy service file for clever show client
 img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever-show.service' '/lib/systemd/system/'
 
diff --git a/builder/image-configure.sh b/builder/image-configure.sh
index 88353b0..1274256 100755
--- a/builder/image-configure.sh
+++ b/builder/image-configure.sh
@@ -38,13 +38,13 @@ Defaults        env_keep += "ROS_HOME"
 Defaults        env_keep += "ROS_LOG_DIR"
 EOT
 
-# configure aruco.launch and clever.launch (for positioning with aruco map and optical flow)
+# configure aruco.launch and clever.launch (for positioning with aruco map)
 sed -i '/<arg name="aruco_map"/c \    <arg name="aruco_map" default="true"/>' /home/pi/catkin_ws/src/clever/clever/launch/aruco.launch
 sed -i '/<arg name="aruco_vpe"/c \    <arg name="aruco_vpe" default="true"/>' /home/pi/catkin_ws/src/clever/clever/launch/aruco.launch
 sed -i '/<param name="map"/c \        <param name="map" value="\$\(find aruco_pose\)/map/animation_map.txt"/>' /home/pi/catkin_ws/src/clever/clever/launch/aruco.launch
 sed -i '/<arg name="aruco"/c \    <arg name="aruco" default="true"/>' /home/pi/catkin_ws/src/clever/clever/launch/clever.launch
 sed -i '/<arg name="rangefinder_vl53l1x"/c \    <arg name="rangefinder_vl53l1x" default="true"/>' /home/pi/catkin_ws/src/clever/clever/launch/clever.launch
-sed -i '/<arg name="optical_flow"/c \    <arg name="optical_flow" default="true"/>' /home/pi/catkin_ws/src/clever/clever/launch/clever.launch
+#sed -i '/<arg name="optical_flow"/c \    <arg name="optical_flow" default="true"/>' /home/pi/catkin_ws/src/clever/clever/launch/clever.launch
 
 # copy office map to animation map if there is no animation map file
 if ! [ -f "/home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt" ] ; then