diff --git a/docker-compose.yaml b/docker-compose.yaml
index c0aca94..30e22e9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -89,8 +89,6 @@ services:
   controller:
     extends: base 
     command: >
-      source /opt/ros/humble/setup.bash &&
-      source /rmp_ws/install/setup.bash &&
       ros2 run segwayrmp SmartCar --ros-args -r cmd_vel:=cmd_vel_out -p serial_full_name:=/dev/ttyUSB0
     devices:
       - /dev/ttyUSB0:/dev/ttyUSB0
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 604c0d5..f43dc9c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -61,6 +61,8 @@ ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
 
 ENV UNDERLAY_WS=${UNDERLAY_WS}
 
+RUN echo "update Entrypoint 18.08.2023"
+
 # Set up the entrypoint
 COPY ./docker/entrypoint.sh /
 RUN chmod +x /entrypoint.sh
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 3702682..e7dfa07 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 # Basic entrypoint for ROS / Colcon Docker containers
 
+UNDERLAY_WS=/rmp_ws
+
 # Source ROS 2
 source /opt/ros/${ROS_DISTRO}/setup.bash
 echo "Sourced ROS 2 ${ROS_DISTRO}"