diff --git a/scripts/install_software.sh b/scripts/install_software.sh
index aaf748e..9fe4e2f 100644
--- a/scripts/install_software.sh
+++ b/scripts/install_software.sh
@@ -85,13 +85,12 @@ echo "--- Build PX4"
 cd ~/PX4-Autopilot
 make px4_sitl
 
-echo "--- Building the workspace"
-# sudo -E sh -c 'rm -rf /opt/ros/noetic/include/mavlink'
-ls ~/catkin_ws/src/PX4-Autopilot/build/px4_sitl_default/mavlink
-echo 'include_directories("/home/clover/PX4-Autopilot/build/px4_sitl_default/mavlink")' >> ~/catkin_ws/src/sitl_gazebo/CMakeLists.txt
-sed -i 's|#include <mavlink/mavlink_types.h>|#include <mavlink_types.h>|' ~/catkin_ws/src/PX4-Autopilot/src/modules/mavlink/mavlink_bridge_header.h
+echo "--- Fix issues with finding mavlnk"
 cd ~/catkin_ws
-catkin_make mavlink_c_generate
+mkdir -p build/mavlink
+ln -s "." build/mavlink/mavlink
+
+echo "--- Building the workspace"
 catkin_make
 
 echo "--- Installing Visual Studio Code"