diff --git a/docker/generic/Dockerfile.indigo b/docker/generic/Dockerfile.indigo
index 351de25c31e..54f220b0ebc 100644
--- a/docker/generic/Dockerfile.indigo
+++ b/docker/generic/Dockerfile.indigo
@@ -8,16 +8,11 @@ RUN apt-get update && apt-get install -y \
 # Install ROS
 RUN wget http://packages.ros.org/ros.key -O - | apt-key add -
 RUN echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list
-RUN apt-get update && apt-get install -y \
-        ros-indigo-desktop-full ros-indigo-nmea-msgs \
-        ros-indigo-nmea-navsat-driver ros-indigo-sound-play \
-        ros-indigo-jsk-visualization ros-indigo-grid-map ros-indigo-gps-common \
-        ros-indigo-controller-manager ros-indigo-ros-control \
-        ros-indigo-ros-controllers ros-indigo-gazebo-ros-control \
-        ros-indigo-sicktoolbox ros-indigo-sicktoolbox-wrapper \
-        ros-indigo-joystick-drivers ros-indigo-novatel-span-driver \
-        libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev \
-        libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev
+RUN apt-get update && apt-get install -y ros-indigo-desktop-full ros-indigo-nmea-msgs ros-indigo-nmea-navsat-driver ros-indigo-sound-play ros-indigo-jsk-visualization ros-indigo-grid-map ros-indigo-gps-common
+RUN apt-get update && apt-get install -y ros-indigo-controller-manager ros-indigo-ros-control ros-indigo-ros-controllers ros-indigo-gazebo-ros-control ros-indigo-sicktoolbox ros-indigo-sicktoolbox-wrapper ros-indigo-joystick-drivers ros-indigo-novatel-span-driver
+RUN apt-get update && apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev software-properties-common libyaml-cpp-dev python-flask python-requests
+RUN add-apt-repository ppa:mosquitto-dev/mosquitto-ppa
+RUN apt-get update && apt-get install -y libmosquitto-dev
 
 RUN rosdep init \
         && rosdep update \
@@ -96,6 +91,11 @@ RUN groupadd -f pgrimaging && \
 # Change user
 USER autoware
 
+# YOLO_V2
+RUN cd && git clone https://github.com/pjreddie/darknet.git
+RUN cd ~/darknet && git checkout 56d69e73aba37283ea7b9726b81afd2f79cd1134
+RUN cd ~/darknet/data && wget https://pjreddie.com/media/files/yolo.weights
+
 # Install Autoware
 RUN git clone https://github.com/CPFL/Autoware.git /home/$USERNAME/Autoware
 RUN /bin/bash -c 'source /opt/ros/indigo/setup.bash; cd /home/$USERNAME/Autoware/ros/src; catkin_init_workspace; cd ../; ./catkin_make_release'
diff --git a/docker/generic/Dockerfile.kinetic b/docker/generic/Dockerfile.kinetic
index 5f347d21a63..1521859f362 100644
--- a/docker/generic/Dockerfile.kinetic
+++ b/docker/generic/Dockerfile.kinetic
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
         libeigen3-dev
 
 # Intall some basic GUI and sound libs
-RUN apt-get install -y \
+RUN apt-get update && apt-get install -y \
         xz-utils file locales dbus-x11 pulseaudio dmz-cursor-theme \
         fonts-dejavu fonts-liberation hicolor-icon-theme \
         libcanberra-gtk3-0 libcanberra-gtk-module libcanberra-gtk3-module \
@@ -21,22 +21,16 @@ RUN apt-get install -y \
         && update-locale LANG=en_US.UTF-8 LC_MESSAGES=POSIX
 
 # Intall some basic GUI tools
-RUN apt-get install -y \
+RUN apt-get update && apt-get install -y \
         cmake-qt-gui \
         gnome-terminal
 
 # Intall ROS
 RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
 RUN apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
-RUN apt-get update && apt-get install -y \
-        ros-kinetic-desktop-full ros-kinetic-nmea-msgs \
-        ros-kinetic-nmea-navsat-driver ros-kinetic-sound-play \
-        ros-kinetic-jsk-visualization ros-kinetic-grid-map \
-        ros-kinetic-gps-common ros-kinetic-controller-manager \
-        ros-kinetic-ros-control ros-kinetic-ros-controllers \
-        ros-kinetic-gazebo-ros-control ros-kinetic-joystick-drivers \
-        libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev \
-        libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev python-wxgtk3.0
+RUN apt-get update && apt-get install -y ros-kinetic-desktop-full ros-kinetic-nmea-msgs ros-kinetic-nmea-navsat-driver ros-kinetic-sound-play ros-kinetic-jsk-visualization ros-kinetic-grid-map ros-kinetic-gps-common
+RUN apt-get update && apt-get install -y ros-kinetic-controller-manager ros-kinetic-ros-control ros-kinetic-ros-controllers ros-kinetic-gazebo-ros-control ros-kinetic-joystick-drivers
+RUN apt-get update && apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev python-wxgtk3.0 software-properties-common libmosquitto-dev libyaml-cpp-dev python-flask python-requests
 
 # Add basic user
 ENV USERNAME autoware
@@ -65,8 +59,13 @@ RUN sudo rosdep init \
         && rosdep update \
         && echo "source /opt/ros/kinetic/setup.bash" >> ~/.bashrc
 
+# YOLO_V2
+RUN cd && git clone https://github.com/pjreddie/darknet.git
+RUN cd ~/darknet && git checkout 56d69e73aba37283ea7b9726b81afd2f79cd1134
+RUN cd ~/darknet/data && wget https://pjreddie.com/media/files/yolo.weights
+
 # Install Autoware
-RUN git clone https://github.com/CPFL/Autoware.git /home/$USERNAME/Autoware
+RUN cd && git clone https://github.com/CPFL/Autoware.git /home/$USERNAME/Autoware
 RUN /bin/bash -c 'source /opt/ros/kinetic/setup.bash; cd /home/$USERNAME/Autoware/ros/src; catkin_init_workspace; cd ../; ./catkin_make_release'
 RUN echo "source /home/$USERNAME/Autoware/ros/devel/setup.bash" >> /home/$USERNAME/.bashrc
 
diff --git a/docker/generic/build.sh b/docker/generic/build.sh
index 48b22426c42..ba276323fda 100755
--- a/docker/generic/build.sh
+++ b/docker/generic/build.sh
@@ -4,7 +4,7 @@
 if [ "$1" = "kinetic" ] || [ "$1" = "indigo" ]
 then
     echo "Use $1"
-    nvidia-docker build -t autoware-$1 -f Dockerfile.$1 .
+    nvidia-docker build -t autoware-$1 -f Dockerfile.$1 . --no-cache
 else
     echo "Select distribution, kinetic|indigo"
 fi
diff --git a/docker/generic/run.sh b/docker/generic/run.sh
index e03b7bfd0e6..9d83abc72b1 100755
--- a/docker/generic/run.sh
+++ b/docker/generic/run.sh
@@ -2,7 +2,7 @@
 
 XSOCK=/tmp/.X11-unix
 XAUTH=/home/$USER/.Xauthority
-SHARED_DIR=/home/$USER/shared_dir
+SHARED_DIR=/home/autoware/shared_dir
 HOST_DIR=/home/$USER/shared_dir
 
 if [ "$1" = "kinetic" ] || [ "$1" = "indigo" ]
@@ -16,7 +16,7 @@ fi
 if [ "$2" = "" ]
 then
     # Create Shared Folder
-    mkdir -p $SHARED_DIR
+    mkdir -p $HOST_DIR
 else
     HOST_DIR=$2
 fi