diff --git a/docker-compose.yaml b/docker-compose.yaml
index dab3f516..7c5ab22b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -42,8 +42,7 @@ services:
       restart_policy:
         condition: any
         delay: 2s
-    # TODO: replace this tee here and in common_aliases with some integrated logger
-    command: bash -c "ros2 launch moveit_studio_agent studio_agent_bridge.launch.py 2>&1 | tee -a ~/.ros/log/agent_bridge_0_0.log"
+    command: agent_bridge.app
 
   # Starts the frontend-agent
   frontend_agent:
@@ -57,8 +56,7 @@ services:
       test: "curl -f http://localhost:3200/objectives"
       interval: 5s
       timeout: 1m
-    # TODO: replace this tee here and in common_aliases with some integrated logger
-    command: bash -c "ros2 launch moveit_studio_rest_api rest_api.launch.py 2>&1 | tee -a ~/.ros/log/rest_api_0_0.log"
+    command: rest_api.app
 
   # Starts the robot drivers
   drivers:
@@ -69,8 +67,7 @@ services:
       rtprio: 99
     devices:
       - "/dev/ttyUSB0:/dev/ttyUSB0"  # Allow access to the gripper.
-    # TODO: replace this tee here and in common_aliases with some integrated logger
-    command: bash -c "ros2 launch moveit_studio_agent robot_drivers.launch.py 2>&1 | tee -a ~/.ros/log/robot_0_0.log"
+    command: robot.app
 
   web_ui:
     image: picknikciuser/moveit-studio-frontend:${STUDIO_DOCKER_TAG:-main}