diff --git a/moveit_setup_assistant/moveit_setup_app_plugins/templates/launch/generic.launch.py.template b/moveit_setup_assistant/moveit_setup_app_plugins/templates/launch/generic.launch.py.template
index 469e1d139e..444aabdd83 100644
--- a/moveit_setup_assistant/moveit_setup_app_plugins/templates/launch/generic.launch.py.template
+++ b/moveit_setup_assistant/moveit_setup_app_plugins/templates/launch/generic.launch.py.template
@@ -3,5 +3,5 @@ from moveit_configs_utils.launches import [FUNCTION_NAME]
 
 
 def generate_launch_description():
-    moveit_config = MoveItConfigsBuilder("[GENERATED_PACKAGE_NAME]").to_moveit_configs()
+    moveit_config = MoveItConfigsBuilder("[ROBOT_NAME]", package_name="[GENERATED_PACKAGE_NAME]").to_moveit_configs()
     return [FUNCTION_NAME](moveit_config)
diff --git a/moveit_setup_assistant/moveit_setup_assistant/launch/setup_assistant.launch b/moveit_setup_assistant/moveit_setup_assistant/launch/setup_assistant.launch
deleted file mode 100644
index 104dc655da..0000000000
--- a/moveit_setup_assistant/moveit_setup_assistant/launch/setup_assistant.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- Launch the MoveIt Setup Assistant, or just use rosrun -->
-<launch>
-
-  <!-- Debug Info -->
-  <arg name="debug" default="false" />
-  <arg unless="$(arg debug)" name="launch_prefix" value="" />
-  <arg     if="$(arg debug)" name="launch_prefix" value="gdb --ex run --args" />
-
-  <!-- Run -->
-  <node pkg="moveit_setup_assistant" type="moveit_setup_assistant" name="moveit_setup_assistant"
-        launch-prefix="$(arg launch_prefix)"
-        output="screen"  required="true" />
-
-</launch>
diff --git a/moveit_setup_assistant/moveit_setup_assistant/launch/setup_assistant.launch.py b/moveit_setup_assistant/moveit_setup_assistant/launch/setup_assistant.launch.py
new file mode 100644
index 0000000000..e16f9dc6d6
--- /dev/null
+++ b/moveit_setup_assistant/moveit_setup_assistant/launch/setup_assistant.launch.py
@@ -0,0 +1,18 @@
+from launch import LaunchDescription
+from moveit_configs_utils.launch_utils import (
+    add_debuggable_node,
+    DeclareBooleanLaunchArg,
+)
+
+
+def generate_launch_description():
+    ld = LaunchDescription()
+
+    ld.add_action(DeclareBooleanLaunchArg("debug", default_value=False))
+    add_debuggable_node(
+        ld,
+        package="moveit_setup_assistant",
+        executable="moveit_setup_assistant",
+    )
+
+    return ld