diff --git a/ros2_control_demo_robot/config/diffbot_diff_drive_controller.yaml b/ros2_control_demo_robot/config/diffbot_diff_drive_controller.yaml
index 1ab715264..8a861016f 100644
--- a/ros2_control_demo_robot/config/diffbot_diff_drive_controller.yaml
+++ b/ros2_control_demo_robot/config/diffbot_diff_drive_controller.yaml
@@ -2,8 +2,8 @@ controller_manager:
   ros__parameters:
     update_rate: 2  # Hz
 
-    joint_state_controller:
-      type: joint_state_controller/JointStateController
+    joint_state_broadcaster:
+      type: joint_state_broadcaster/JointStateBroadcaster
 
     diffbot_base_controller:
       type: diff_drive_controller/DiffDriveController
diff --git a/ros2_control_demo_robot/launch/diffbot_system.launch.py b/ros2_control_demo_robot/launch/diffbot_system.launch.py
index a6065a5b4..3ad966f8b 100644
--- a/ros2_control_demo_robot/launch/diffbot_system.launch.py
+++ b/ros2_control_demo_robot/launch/diffbot_system.launch.py
@@ -39,29 +39,34 @@ def generate_launch_description():
         "diffbot_diff_drive_controller.yaml",
     )
 
+    node_robot_state_publisher = Node(
+        package="robot_state_publisher",
+        executable="robot_state_publisher",
+        output="screen",
+        parameters=[robot_description],
+    )
+
+    controller_manager_node = Node(
+        package="controller_manager",
+        executable="ros2_control_node",
+        parameters=[robot_description, diffbot_diff_drive_controller],
+        output={
+            "stdout": "screen",
+            "stderr": "screen",
+        },
+    )
+
+    spawn_controller = Node(
+        package="controller_manager",
+        executable="spawner.py",
+        arguments=["joint_state_broadcaster"],
+        output="screen",
+    )
+
     return LaunchDescription(
         [
-            Node(
-                package="robot_state_publisher",
-                executable="robot_state_publisher",
-                name="robot_state_publisher",
-                output="screen",
-                parameters=[robot_description],
-            ),
-            Node(
-                package="controller_manager",
-                executable="ros2_control_node",
-                parameters=[robot_description, diffbot_diff_drive_controller],
-                output={
-                    "stdout": "screen",
-                    "stderr": "screen",
-                },
-            ),
-            Node(
-                package="controller_manager",
-                executable="spawner.py",
-                parameter=["joint_state_controller"],
-                output="screen",
-            ),
+            node_robot_state_publisher,
+            controller_manager_node,
+            spawn_controller,
         ]
     )