diff --git a/.github/workflows/linux-arm64-build-and-test.yml b/.github/workflows/linux-arm64-build-and-test.yml
index ade00a39..a6fe1853 100644
--- a/.github/workflows/linux-arm64-build-and-test.yml
+++ b/.github/workflows/linux-arm64-build-and-test.yml
@@ -51,7 +51,7 @@ jobs:
 
     - name: Install test-msgs on Linux
       run: |
-        sudo apt install ros-${{ matrix.ros_distribution }}-test-msgs
+        sudo apt install ros-${{ matrix.ros_distribution }}-test-msgs ros-${{ matrix.ros_distribution }}-mrpt-msgs
         # Adjust dependencies based on Ubuntu version
         LIBASOUND_PKG="libasound2"
         if grep -q "24.04" /etc/os-release; then
diff --git a/rosidl_gen/packages.js b/rosidl_gen/packages.js
index 02dc9c65..138c65f8 100644
--- a/rosidl_gen/packages.js
+++ b/rosidl_gen/packages.js
@@ -33,7 +33,7 @@ function getPackageName(filePath, amentExecuted) {
   }
 
   if (amentExecuted) {
-    return filePath.match(/\w+\/share\/(\w+)\//)[1];
+    return filePath.match(/[^/]+\/share\/([^/]+)\//)[1];
   }
 
   let folders = path.parse(filePath).dir.split('/');
@@ -52,7 +52,7 @@ function getSubFolder(filePath, amentExecuted) {
   }
 
   if (amentExecuted) {
-    return filePath.match(/\w+\/share\/\w+\/(\w+)\//)[1];
+    return filePath.match(/[^/]+\/share\/[^/]+\/([^/]+)\//)[1];
   }
   // If the |amentExecuted| equals to false, the file's extension will be assigned as
   // the name of sub folder.