diff --git a/Dockerfile b/Dockerfile
index 7f32dc5..1b8a8e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -172,17 +172,16 @@
     rosdep install -i --from-paths . --ignore-src --rosdistro kinetic -y ./pepper-ros-navigation && \
     cd /home/ubuntu/catkin_ws && \
     catkin build  && \
-    apt-get autoremove -y && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN cd /home/ubuntu/catkin_ws/src && \
+    cd /home/ubuntu/catkin_ws/src && \
     catkin_create_pkg create_speech rospy std_msgs --rosdistro kinetic && \
     cd create_speech && \
     curl -o create_speech.py https://raw.githubusercontent.com/ykoga-kyutech/pepper_ros_handson/master/scripts/create_speech_template.py && \
     chmod +x create_speech.py && \
     cd /home/ubuntu/catkin_ws && \
-    catkin build
+    catkin build && \
+    apt-get autoremove -y && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 # Install pynaoqi 2.5.5 library
 COPY ./scripts/pynaoqi-python2.7-2.5.5.5-linux64.tar.gz /home/ubuntu/pynaoqi-python2.7-2.5.5.5-linux64.tar.gz