diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5c25888..2efef0d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,7 +5,7 @@ ENV BASH_ENV="/etc/bash_env"
 
 RUN sudo apt-get update && sudo apt-get upgrade -y
 
-COPY install.sh /root/sas_force_sensor_bota/
+COPY docker/install.sh /root/sas_force_sensor_bota/
 RUN cd /root/sas_force_sensor_bota \
     && chmod +x install.sh \
     && . install.sh
@@ -13,3 +13,4 @@ RUN cd /root/sas_force_sensor_bota \
 RUN python3 -m pip install --upgrade dqrobotics --break-system-packages
 RUN sudo sudo apt-get remove -y ros-jazzy-sas-force-sensor-bota
 RUN mkdir -p /root/sas_force_sensor_bota_devel/src/
+COPY . /root/sas_force_sensor_bota_devel/src/sas_force_sensor_bota
diff --git a/docker/compose.yml b/docker/compose.yml
index 75afaf7..03c03d0 100644
--- a/docker/compose.yml
+++ b/docker/compose.yml
@@ -1,6 +1,8 @@
 services:
   sas_force_sensor_bota_server:
-    build: .
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile
     environment:
       - TIMEOUT=20
       - DISPLAY
@@ -9,20 +11,19 @@ services:
     volumes:
       - ~/.Xauthority:/root/.Xauthority # x server related
       - /tmp/.X11-unix:/tmp/.X11-unix:rw # x server related
-      - ../../sas_force_sensor_bota:/root/sas_force_sensor_bota_devel/src/sas_force_sensor_bota
     command: /bin/bash -c "
       cd /root/sas_force_sensor_bota_devel
       && colcon build
       && source install/setup.bash
       && timeout -s INT $$TIMEOUT ros2 launch sas_force_sensor_bota sas_force_sensor_bota_launch.py"
-      
+
   sas_force_sensor_bota_client:
-    build: .
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile
     environment:
       - TIMEOUT=20
       - ROS_DOMAIN_ID
-    volumes:
-      - ../../sas_force_sensor_bota:/root/sas_force_sensor_bota_devel/src/sas_force_sensor_bota
     command: /bin/bash -c "
       cd /root/sas_force_sensor_bota_devel
       && colcon build