diff --git a/clearpath_generator_robot/clearpath_generator_robot/launch/generator.py b/clearpath_generator_robot/clearpath_generator_robot/launch/generator.py
index 0c1c176e..4e097feb 100644
--- a/clearpath_generator_robot/clearpath_generator_robot/launch/generator.py
+++ b/clearpath_generator_robot/clearpath_generator_robot/launch/generator.py
@@ -359,6 +359,23 @@ def __init__(self, setup_path: str = '/etc/clearpath/') -> None:
           namespace=self.namespace,
         )
 
+        # ROS Bag Recorder
+        self.recorder_params = LaunchFile.LaunchArg(
+            'recorder_params',
+            default_value=os.path.join(self.platform_params_path, 'recorder.yaml'),
+        )
+
+        self.recorder_args = [
+            ('parameters', LaunchFile.Variable('recorder_params')),
+            ('namespace', self.namespace),
+            ('enable_recorder', str(self.clearpath_config.platform.enable_recorder).lower())
+        ]
+
+        self.recorder_launch = LaunchFile(
+            'recorder',
+            package=clearpath_diagnostics_package,
+            args=self.recorder_args)
+
         # Components required for each platform
         common_platform_components = [
             self.wireless_watcher_node,
@@ -366,6 +383,8 @@ def __init__(self, setup_path: str = '/etc/clearpath/') -> None:
             self.diag_aggregator_params,
             self.diagnostics_launch,
             self.battery_state_control,
+            self.recorder_params,
+            self.recorder_launch,
         ]
 
         # Only add estimator when no BMS is present