diff --git a/demos/moveit_pick_place/Dockerfile b/demos/moveit_pick_place/Dockerfile
index 3e36402..6d8afcc 100644
--- a/demos/moveit_pick_place/Dockerfile
+++ b/demos/moveit_pick_place/Dockerfile
@@ -46,8 +46,8 @@ RUN git clone --depth 1 --branch ${ROS2_MEDKIT_REF} https://github.com/selfpatch
        ros2_medkit/src/ros2_medkit_serialization \
        ros2_medkit/src/ros2_medkit_fault_manager \
        ros2_medkit/src/ros2_medkit_fault_reporter \
-       ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \
-    cp -r ros2_medkit/cmake ${COLCON_WS}/ && \
+       ros2_medkit/src/ros2_medkit_diagnostic_bridge \
+       ros2_medkit/src/ros2_medkit_cmake . && \
     rm -rf ros2_medkit
 
 # Copy demo package from local context
diff --git a/demos/sensor_diagnostics/Dockerfile b/demos/sensor_diagnostics/Dockerfile
index 516b43e..0966fbd 100644
--- a/demos/sensor_diagnostics/Dockerfile
+++ b/demos/sensor_diagnostics/Dockerfile
@@ -32,7 +32,7 @@ RUN git clone --depth 1 https://github.com/selfpatch/ros2_medkit.git && \
     mv ros2_medkit/src/ros2_medkit_fault_manager . && \
     mv ros2_medkit/src/ros2_medkit_fault_reporter . && \
     mv ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \
-    cp -r ros2_medkit/cmake ${COLCON_WS}/ && \
+    mv ros2_medkit/src/ros2_medkit_cmake . && \
     rm -rf ros2_medkit
 
 # Copy demo package
diff --git a/demos/turtlebot3_integration/Dockerfile b/demos/turtlebot3_integration/Dockerfile
index af182f3..dd5e752 100644
--- a/demos/turtlebot3_integration/Dockerfile
+++ b/demos/turtlebot3_integration/Dockerfile
@@ -52,7 +52,7 @@ RUN git clone --depth 1 https://github.com/selfpatch/ros2_medkit.git && \
     mv ros2_medkit/src/ros2_medkit_fault_manager . && \
     mv ros2_medkit/src/ros2_medkit_fault_reporter . && \
     mv ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \
-    cp -r ros2_medkit/cmake ${COLCON_WS}/ && \
+    mv ros2_medkit/src/ros2_medkit_cmake . && \
     rm -rf ros2_medkit
 
 # Copy demo package from local context (this repo)