diff --git a/package.xml b/package.xml
index 97722d50..112a679a 100644
--- a/package.xml
+++ b/package.xml
@@ -12,6 +12,8 @@
   <depend>python3-yaml</depend>
   <depend>clang-tidy</depend>
 
+  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_lint_auto</buildtool_depend>
   <build_depend>flex</build_depend>
   <build_depend>bison</build_depend>
   <build_depend>libncurses-dev</build_depend>
diff --git a/scripts/create_firmware_ws.sh b/scripts/create_firmware_ws.sh
index fc3b6665..a2beb6bc 100755
--- a/scripts/create_firmware_ws.sh
+++ b/scripts/create_firmware_ws.sh
@@ -104,6 +104,8 @@ if [ $RTOS != "host" ]; then
     pushd $FW_TARGETDIR/$DEV_WS_DIR >/dev/null
         # Fix failing build by ignoring rmw_test_fixture_implementation.
         touch ros2/ament_cmake_ros/rmw_test_fixture_implementation/COLCON_IGNORE
+        # Fix failing build by ignoring rmw_test_fixture.
+        touch ros2/ament_cmake_ros/rmw_test_fixture/COLCON_IGNORE
         colcon build
         set +o nounset
         # source dev workspace
@@ -116,4 +118,3 @@ rosdep install --os=ubuntu:noble -y --from-paths $PREFIX/config/$RTOS/$TARGET_FO
 
 # Creating specific firmware folder
 . $PREFIX/config/$RTOS/$TARGET_FOLDER/create.sh
-