diff --git a/oasis_control/config/systemd/oasis_control.service b/oasis_control/config/systemd/oasis_control.service
index 011defae..59828935 100644
--- a/oasis_control/config/systemd/oasis_control.service
+++ b/oasis_control/config/systemd/oasis_control.service
@@ -11,7 +11,7 @@ After=network.target
 # TODO: Better way to define this
 #
 
-User=garrett
+User=ubuntu
 
 #
 # ROS 2 configuration
diff --git a/oasis_drivers_cpp/src/ros/CecServerNode.cpp b/oasis_drivers_cpp/src/ros/CecServerNode.cpp
index 6751661e..46b76e25 100644
--- a/oasis_drivers_cpp/src/ros/CecServerNode.cpp
+++ b/oasis_drivers_cpp/src/ros/CecServerNode.cpp
@@ -21,7 +21,7 @@ namespace
 {
 constexpr const char* NODE_NAME = "cec_server";
 
-constexpr const char* MACHINE_NAME = "zotac"; // TODO
+constexpr const char* MACHINE_NAME = "patio"; // TODO
 
 constexpr const char* POWER_EVENT_TOPIC = "power_event";
 constexpr const char* POWER_CONTROL_SERVICE = "power_control";
diff --git a/oasis_drivers_py/config/systemd/oasis_drivers.service b/oasis_drivers_py/config/systemd/oasis_drivers.service
index 1364c94d..4830a6a9 100644
--- a/oasis_drivers_py/config/systemd/oasis_drivers.service
+++ b/oasis_drivers_py/config/systemd/oasis_drivers.service
@@ -24,7 +24,7 @@ Environment=RMW_IMPLEMENTATION=rmw_fastrtps_dynamic_cpp
 # Path configuration
 #
 
-Environment=OASIS_ENV=/opt/ros/${ROS2_DISTRO}/setup.bash
+Environment=OASIS_ENV=/home/${USER}/Documents/ros-ws/src/oasis/ros-ws/oasis-${ROS2_DISTRO}/install/setup.bash
 
 #
 # Service definition
diff --git a/oasis_perception/config/systemd/oasis_perception.service b/oasis_perception/config/systemd/oasis_perception.service
index f1c1558b..9cc58375 100644
--- a/oasis_perception/config/systemd/oasis_perception.service
+++ b/oasis_perception/config/systemd/oasis_perception.service
@@ -11,7 +11,7 @@ After=network.target
 # TODO: Better way to define this
 #
 
-User=garrett
+User=ubuntu
 
 #
 # ROS 2 configuration
diff --git a/oasis_visualization/config/systemd/kodi_visualizer.service b/oasis_visualization/config/systemd/kodi_visualizer.service
index cc2e41a9..81e82720 100644
--- a/oasis_visualization/config/systemd/kodi_visualizer.service
+++ b/oasis_visualization/config/systemd/kodi_visualizer.service
@@ -12,7 +12,7 @@ Wants=network-online.target
 # TODO: Better way to define this
 #
 
-User=garrett
+User=ubuntu
 Environment=XDG_RUNTIME_DIR=/run/user/1000
 
 #