diff --git a/sros/kinetic/Dockerfile b/sros/kinetic/Dockerfile
index 451659962..20e7464d7 100644
--- a/sros/kinetic/Dockerfile
+++ b/sros/kinetic/Dockerfile
@@ -65,10 +65,6 @@ RUN apt-get update && \
     pip install --upgrade ../rospkg/ && \
     rm -rf /var/lib/apt/lists/*
 
-# HACK, replacing shell with bash for later docker build commands
-RUN mv /bin/sh /bin/sh-old && \
-    ln -s /bin/bash /bin/sh
-
 # build repo
 WORKDIR $CATKIN_WS
 ENV TERM xterm
@@ -76,6 +72,9 @@ ENV PYTHONIOENCODING UTF-8
 RUN catkin config --install && \
     catkin build --no-status --summarize
 
+# setup demo bashrc
+RUN echo 'source "$CATKIN_WS/install/setup.bash"' >> ~/.bashrc
+
 # setup demo config
 COPY ./config /root/.ros/sros/config/