diff --git a/launch/stomp_planning_pipeline.launch.xml b/launch/stomp_planning_pipeline.launch.xml
index cbff8df91f8595c47a9f1b9eb92f9ad4c43eff99..754d755eade462d88f1e06b7fcd72b8b695e5f4c 100644
--- a/launch/stomp_planning_pipeline.launch.xml
+++ b/launch/stomp_planning_pipeline.launch.xml
@@ -22,13 +22,15 @@
   <!-- <param name="capabilities" value="" /> -->
 
   <!-- Load parameters for both groups, panda_arm and manipulator -->
-  <group ns="$(arg arm_id)_arm">
-    <rosparam command="load" file="$(find panda_moveit_config)/config/stomp_planning.yaml" />
-    <param name="group_name" value="$(arg arm_id)_arm" />
-  </group>
-  <group ns="manipulator">
-    <rosparam command="load" file="$(find panda_moveit_config)/config/stomp_planning.yaml" />
-    <param name="group_name" value="manipulator" />
+  <group ns="stomp">
+    <group ns="$(arg arm_id)_arm">
+      <rosparam command="load" file="$(find panda_moveit_config)/config/stomp_planning.yaml"/>
+      <param name="group_name" value="$(arg arm_id)_arm"/>
+    </group>
+    <group ns="$(arg arm_id)_manipulator">
+      <rosparam command="load" file="$(find panda_moveit_config)/config/stomp_planning.yaml"/>
+      <param name="group_name" value="$(arg arm_id)_manipulator"/>
+    </group>
   </group>
 
 </launch>