diff --git a/docker/Dockerfile.ros1 b/docker/Dockerfile.ros1
index 8b1a10e..b5f6d2c 100644
--- a/docker/Dockerfile.ros1
+++ b/docker/Dockerfile.ros1
@@ -84,5 +84,10 @@ RUN cd $CATKIN_WS \
   && rosdep fix-permissions \
   && rosdep install -y --from-paths . --ignore-src --rosdistro ${ROS_VERSION}
 
+# Always source catkin_setup.sh when launching bash 
+COPY ../scripts/catkin_setup.sh /usr/local/bin/catkin_setup.sh
+RUN echo "source /usr/local/bin/catkin_setup.sh" >> /root/.bashrc
+RUN chmod +x /usr/local/bin/catkin_setup.sh
+
 ENTRYPOINT ["/usr/local/bin/catkin_setup.sh"]
 CMD ["bash"]
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 8054fff..03f05ba 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,3 +1,4 @@
 push.sh
 fix_errors.sh
 repository_recal.sh
+test.sh
diff --git a/scripts/colcon_setup.sh b/scripts/colcon_setup.sh
index 579bc20..8d6c4ac 100755
--- a/scripts/colcon_setup.sh
+++ b/scripts/colcon_setup.sh
@@ -16,6 +16,6 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-catkin build 
-source "/opt/ros/noetic/setup.bash"
-source "$CATKIN_WS/devel/setup.bash"
+colcon build 
+source "/opt/ros/foxy/setup.bash"
+source "$CATKIN_WS/install/setup.bash"