diff --git a/clearpath_config/sample/a200/a200_default.yaml b/clearpath_config/sample/a200/a200_default.yaml
index e5bb4ee..dfe7898 100644
--- a/clearpath_config/sample/a200/a200_default.yaml
+++ b/clearpath_config/sample/a200/a200_default.yaml
@@ -1,6 +1,7 @@
 serial_number: a200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-a200-0000
     platform:
@@ -8,7 +9,6 @@ system:
     onboard: {}
     remote: {}
   ros2:
-    username: administrator
     namespace: a200_0000
     domain_id: 0
     rmw_implementation: rmw_fastrtps_cpp
diff --git a/clearpath_config/sample/a200/a200_dual_laser.yaml b/clearpath_config/sample/a200/a200_dual_laser.yaml
index 843063a..38af9ad 100644
--- a/clearpath_config/sample/a200/a200_dual_laser.yaml
+++ b/clearpath_config/sample/a200/a200_dual_laser.yaml
@@ -1,6 +1,7 @@
 serial_number: a200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-a200-0000
     platform:
@@ -8,7 +9,6 @@ system:
     onboard: {}
     remote: {}
   ros2:
-    username: administrator
     namespace: a200_0000
     domain_id: 0
     rmw_implementation: rmw_fastrtps_cpp
diff --git a/clearpath_config/sample/a200/a200_sample.yaml b/clearpath_config/sample/a200/a200_sample.yaml
index 48d5576..c2a78a5 100644
--- a/clearpath_config/sample/a200/a200_sample.yaml
+++ b/clearpath_config/sample/a200/a200_sample.yaml
@@ -1,6 +1,7 @@
 serial_number: a200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-a200-0000
     platform:
@@ -8,7 +9,6 @@ system:
     onboard: {}
     remote: {}
   ros2:
-    username: administrator
     namespace: a200_0000
     domain_id: 0
     rmw_implementation: rmw_fastrtps_cpp
diff --git a/clearpath_config/sample/a200/a200_velodyne.yaml b/clearpath_config/sample/a200/a200_velodyne.yaml
index 5baeb66..5e2306f 100644
--- a/clearpath_config/sample/a200/a200_velodyne.yaml
+++ b/clearpath_config/sample/a200/a200_velodyne.yaml
@@ -1,6 +1,7 @@
 serial_number: a200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-a200-0000
     platform:
@@ -8,7 +9,6 @@ system:
     onboard: {}
     remote: {}
   ros2:
-    username: administrator
     namespace: a200_0000
     domain_id: 0
     rmw_implementation: rmw_fastrtps_cpp
diff --git a/clearpath_config/sample/j100/j100_default.yaml b/clearpath_config/sample/j100/j100_default.yaml
index 07c5bdb..b0071fb 100644
--- a/clearpath_config/sample/j100/j100_default.yaml
+++ b/clearpath_config/sample/j100/j100_default.yaml
@@ -1,6 +1,7 @@
 serial_number: j100-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-j100-0000
     platform:
@@ -8,7 +9,6 @@ system:
     onboard: {}
     remote: {}
   ros2:
-    username: administrator
     namespace: j100_0000
     domain_id: 0
     rmw_implementation: rmw_fastrtps_cpp
diff --git a/clearpath_config/sample/j100/j100_dual_laser.yaml b/clearpath_config/sample/j100/j100_dual_laser.yaml
index e811177..d55490c 100644
--- a/clearpath_config/sample/j100/j100_dual_laser.yaml
+++ b/clearpath_config/sample/j100/j100_dual_laser.yaml
@@ -1,6 +1,7 @@
 serial_number: j100-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-j100-0000
     platform:
@@ -8,7 +9,6 @@ system:
     onboard: {}
     remote: {}
   ros2:
-    username: administrator
     namespace: j100_0000
     domain_id: 0
     rmw_implementation: rmw_fastrtps_cpp
diff --git a/clearpath_config/sample/j100/j100_sample.yaml b/clearpath_config/sample/j100/j100_sample.yaml
index 2762668..25e9a97 100644
--- a/clearpath_config/sample/j100/j100_sample.yaml
+++ b/clearpath_config/sample/j100/j100_sample.yaml
@@ -1,6 +1,7 @@
 serial_number: j100-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-j100-0000
     platform:
@@ -8,7 +9,6 @@ system:
     onboard: {}
     remote: {}
   ros2:
-    username: administrator
     namespace: j100_0000
     domain_id: 0
     rmw_implementation: rmw_fastrtps_cpp
diff --git a/clearpath_config/sample/j100/j100_velodyne.yaml b/clearpath_config/sample/j100/j100_velodyne.yaml
index 9d008a7..7cdb7b1 100644
--- a/clearpath_config/sample/j100/j100_velodyne.yaml
+++ b/clearpath_config/sample/j100/j100_velodyne.yaml
@@ -1,6 +1,7 @@
 serial_number: j100-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-j100-0000
     platform:
@@ -8,7 +9,6 @@ system:
     onboard: {}
     remote: {}
   ros2:
-    username: administrator
     namespace: j100_0000
     domain_id: 0
     rmw_implementation: rmw_fastrtps_cpp
diff --git a/clearpath_config/sample/w200/w200_default.yaml b/clearpath_config/sample/w200/w200_default.yaml
index d87d977..e257e9c 100644
--- a/clearpath_config/sample/w200/w200_default.yaml
+++ b/clearpath_config/sample/w200/w200_default.yaml
@@ -1,6 +1,7 @@
 serial_number: w200-0000
 version: 0
 system:
+  username: administrator
   hosts:
     self: cpr-w200-0000
     platform:
@@ -8,7 +9,6 @@ system:
     onboard: {}
     remote: {}
   ros2:
-    username: administrator
     namespace: w200_0000
     domain_id: 0
     rmw_implementation: rmw_fastrtps_cpp
diff --git a/clearpath_config/system/system.py b/clearpath_config/system/system.py
index 9a726da..efffece 100644
--- a/clearpath_config/system/system.py
+++ b/clearpath_config/system/system.py
@@ -50,8 +50,8 @@ class SystemConfig(BaseConfig):
         SYSTEM: {
             SELF: SELF,
             HOSTS: HOSTS,
+            USERNAME: USERNAME,
             ROS2: {
-                USERNAME: USERNAME,
                 NAMESPACE: NAMESPACE,
                 DOMAIN_ID: DOMAIN_ID,
                 RMW: RMW,