diff --git a/src/examples/hardware/install/linux/bin/tool/pb_joint_command_tool.sh b/src/examples/hardware/install/linux/bin/tools/pb_joint_command_tool.sh
similarity index 100%
rename from src/examples/hardware/install/linux/bin/tool/pb_joint_command_tool.sh
rename to src/examples/hardware/install/linux/bin/tools/pb_joint_command_tool.sh
diff --git a/src/examples/hardware/install/linux/bin/tool/ros2_joint_command_tool.sh b/src/examples/hardware/install/linux/bin/tools/ros2_joint_command_tool.sh
similarity index 100%
rename from src/examples/hardware/install/linux/bin/tool/ros2_joint_command_tool.sh
rename to src/examples/hardware/install/linux/bin/tools/ros2_joint_command_tool.sh
diff --git a/src/pkg/mujoco_sim_pkg/CMakeLists.txt b/src/pkg/mujoco_sim_pkg/CMakeLists.txt
index 9cf5e5f..93e150f 100644
--- a/src/pkg/mujoco_sim_pkg/CMakeLists.txt
+++ b/src/pkg/mujoco_sim_pkg/CMakeLists.txt
@@ -30,7 +30,9 @@ target_link_libraries(
 
 # Set installation of target
 if(AIMRT_MUJOCO_SIM_INSTALL)
-  set_property(TARGET ${CUR_TARGET_NAME} PROPERTY EXPORT_NAME ${CUR_TARGET_ALIAS_NAME})
+  set_target_properties(${CUR_TARGET_NAME} PROPERTIES 
+    EXPORT_NAME ${CUR_TARGET_ALIAS_NAME}
+    INSTALL_RPATH "$ORIGIN")
   install(
     TARGETS ${CUR_TARGET_NAME}
     EXPORT ${INSTALL_CONFIG_NAME}