diff --git a/docker_env/gear/Dockerfile b/docker_env/gear/Dockerfile
index a604dfc..62377b2 100644
--- a/docker_env/gear/Dockerfile
+++ b/docker_env/gear/Dockerfile
@@ -25,14 +25,15 @@ RUN passwd --delete rrrobot
 # add to sudo users
 RUN usermod -aG sudo rrrobot
 # set the entry point
-WORKDIR /home/rrrobot
+WORKDIR /app/rrrobot_ws
+RUN mkdir /home/rrrobot
 RUN chown -R rrrobot:rrrobot /home/rrrobot
 
 # Initialize the environment in .bashrc
 RUN echo "source /opt/ros/melodic/setup.bash" >> /home/rrrobot/.bashrc
 RUN echo "source /usr/share/gazebo/setup.sh" >> /home/rrrobot/.bashrc
-RUN echo "export GAZEBO_MODEL_PATH=/home/rrrobot/rrrobot_ws/src/gazebo_models:\$GAZEBO_MODEL_PATH" >> /home/rrrobot/.bashrc
-RUN echo "export GAZEBO_PLUGIN_PATH=/opt/ros/melodic/lib:/home/rrrobot/rrrobot_ws/lib:\$GAZEBO_PLUGIN_PATH" >> /home/rrrobot/.bashrc
+RUN echo "export GAZEBO_MODEL_PATH=/app/rrrobot_ws/src/gazebo_models:\$GAZEBO_MODEL_PATH" >> /home/rrrobot/.bashrc
+RUN echo "export GAZEBO_PLUGIN_PATH=/opt/ros/melodic/lib:/app/rrrobot_ws/lib:\$GAZEBO_PLUGIN_PATH" >> /home/rrrobot/.bashrc
 
 USER rrrobot
 
diff --git a/rrrobot_ws/setup.sh b/rrrobot_ws/setup.sh
deleted file mode 100755
index 431d4ee..0000000
--- a/rrrobot_ws/setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-sudo cp world/gear.py /opt/ros/melodic/lib/osrf_gear/gear.py
-sudo cp world/gear.world.template /opt/ros/melodic/share/osrf_gear/worlds/gear.world.template
diff --git a/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh b/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh
old mode 100644
new mode 100755
index 41155ec..9297dc7
--- a/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh
+++ b/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
 sudo cp ../launch/rrrobot.launch /opt/ros/melodic/share/osrf_gear/launch
+sudo cp ../../../world/gear.py /opt/ros/melodic/lib/osrf_gear/gear.py
+sudo cp ../../../world/gear.world.template /opt/ros/melodic/share/osrf_gear/worlds/gear.world.template
+
 
 roslaunch osrf_gear rrrobot.launch
diff --git a/rrrobot_ws/world/gear.py b/rrrobot_ws/world/gear.py
index f882605..31a8497 100755
--- a/rrrobot_ws/world/gear.py
+++ b/rrrobot_ws/world/gear.py
@@ -35,7 +35,7 @@ world_dir = os.path.join(rospack.get_path('osrf_gear'), 'worlds')
 launch_dir = os.path.join(rospack.get_path('osrf_gear'), 'launch')
 template_files = [
     #os.path.join(world_dir, 'gear.world.template'),
-    '/home/rrrobot/rrrobot_ws/world/gear.world.template',
+    '/app/rrrobot_ws/world/gear.world.template',
     os.path.join(launch_dir, 'gear.launch.template'),
     os.path.join(launch_dir, 'gear.urdf.xacro.template'),
 ]