diff --git a/examples/example_multi_robot/setup.py b/examples/example_multi_robot/setup.py
index 270b5c1b..d4d2203d 100644
--- a/examples/example_multi_robot/setup.py
+++ b/examples/example_multi_robot/setup.py
@@ -27,6 +27,7 @@
     data_files=[
         ('share/ament_index/resource_index/packages',
             ['resource/' + PACKAGE_NAME]),
+        ('share/' + PACKAGE_NAME, ['package.xml']),
         (os.path.join('share', PACKAGE_NAME, 'models'), glob('models/*.sdf')),
         (os.path.join('share', PACKAGE_NAME, 'launch'), glob('launch/*.py')),
     ],
diff --git a/libs/scenario_execution_kubernetes/setup.py b/libs/scenario_execution_kubernetes/setup.py
index 84371d0e..a75043d7 100644
--- a/libs/scenario_execution_kubernetes/setup.py
+++ b/libs/scenario_execution_kubernetes/setup.py
@@ -16,14 +16,14 @@
 
 from glob import glob
 import os
-from setuptools import find_packages, setup
+from setuptools import find_namespace_packages, setup
 
 PACKAGE_NAME = 'scenario_execution_kubernetes'
 
 setup(
     name=PACKAGE_NAME,
     version='1.1.0',
-    packages=find_packages(),
+    packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',
             ['resource/' + PACKAGE_NAME]),
diff --git a/test/scenario_execution_gazebo_test/setup.py b/test/scenario_execution_gazebo_test/setup.py
index 04483aaa..10bd92f9 100644
--- a/test/scenario_execution_gazebo_test/setup.py
+++ b/test/scenario_execution_gazebo_test/setup.py
@@ -17,14 +17,14 @@
 """ Setup python package """
 from glob import glob
 import os
-from setuptools import find_namespace_packages, setup
+from setuptools import find_packages, setup
 
 PACKAGE_NAME = 'scenario_execution_gazebo_test'
 
 setup(
     name=PACKAGE_NAME,
     version='1.2.0',
-    packages=find_namespace_packages(),
+    packages=find_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',
             ['resource/' + PACKAGE_NAME]),
diff --git a/test/scenario_execution_nav2_test/setup.py b/test/scenario_execution_nav2_test/setup.py
index 0bed80a3..3208ed9e 100644
--- a/test/scenario_execution_nav2_test/setup.py
+++ b/test/scenario_execution_nav2_test/setup.py
@@ -17,14 +17,14 @@
 """ Setup python package """
 from glob import glob
 import os
-from setuptools import find_namespace_packages, setup
+from setuptools import find_packages, setup
 
 PACKAGE_NAME = 'scenario_execution_nav2_test'
 
 setup(
     name=PACKAGE_NAME,
     version='1.2.0',
-    packages=find_namespace_packages(),
+    packages=find_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',
             ['resource/' + PACKAGE_NAME]),