diff --git a/base/Dockerfile b/base/Dockerfile
index e6e1f60..995894f 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -9,4 +9,8 @@ RUN git clone --depth 1 -branch -b $ROS_DISTRO https://github.com/micro-ROS/micr
 &&  rosdep install --from-paths src --ignore-src -y \
 &&  colcon build \
 &&  rm -rf log/ build/ src/* \
-&&  rm -rf /var/lib/apt/list/*
\ No newline at end of file
+&&  rm -rf /var/lib/apt/list/*
+
+COPY ./micro-ros_entrypoint.sh /micro-ros_entrypoint.sh
+ENTRYPOINT ["/micro-ros_entrypoint.sh"]
+CMD ["bash"]
diff --git a/base/micro-ros_entrypoint.sh b/base/micro-ros_entrypoint.sh
new file mode 100755
index 0000000..0b4e08c
--- /dev/null
+++ b/base/micro-ros_entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+source "/opt/ros/$ROS_DISTRO/setup.bash"
+source "/uros_ws/install/setup.bash"
+
+exec "$@"
\ No newline at end of file