diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2aa3e07..990ca15 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -215,12 +215,17 @@ ARG RMW_IMPLEMENTATION="rmw_cyclonedds_cpp"
 ENV RMW_IMPLEMENTATION=${RMW_IMPLEMENTATION}
 RUN source /opt/ros/$ROS_DISTRO/setup.bash && \
     if [[ "$RMW_IMPLEMENTATION" == "rmw_zenoh_cpp" ]]; then \
-        git clone https://github.com/ros2/rmw_zenoh.git $WORKSPACE/src/upstream/rmw_zenoh && \
+        mkdir -p /opt/ws_rmw_zenoh/src && \
+        git clone https://github.com/ros2/rmw_zenoh.git /opt/ws_rmw_zenoh/src/rmw_zenoh && \
         rosdep init || true && \
         rosdep update --rosdistro $ROS_DISTRO && \
         apt-get update && \
-        rosdep install -y --from-paths $WORKSPACE/src/upstream/rmw_zenoh --ignore-src --rosdistro $ROS_DISTRO && \
-        rm -rf /var/lib/apt/lists/* ; \
+        cd /opt/ws_rmw_zenoh && \
+        rosdep install -y --from-paths src --ignore-src --rosdistro $ROS_DISTRO && \
+        rm -rf /var/lib/apt/lists/* && \
+        source /opt/ros/${ROS_DISTRO}/setup.bash && \
+        colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release && \
+        echo "source /opt/ws_rmw_zenoh/install/setup.bash" >> ~/.bashrc ; \
     elif [[ "$ROS_VERSION" == "2" ]]; then \
         apt-get update && \
         RMW_PACKAGE=ros-$ROS_DISTRO-$(echo $RMW_IMPLEMENTATION | tr '_' '-') && \