diff --git a/docker/Dockerfile.ros1 b/docker/Dockerfile.ros1
index b5f6d2c..0aaf0ce 100644
--- a/docker/Dockerfile.ros1
+++ b/docker/Dockerfile.ros1
@@ -24,7 +24,7 @@ ENV PYTHON_VERSION="3.8"
 ARG ROS_ARCHITECTURE_VERSION_GIT_BRANCH=main
 ARG ROS_ARCHITECTURE_VERSION_GIT_COMMIT=HEAD
 
-ARG ROS_VERSION=noetic
+ENV ROS_VERSION=noetic
 ENV CATKIN_WS=/root/catkin_ws
 
 LABEL maintainer=ronaldsonbellande@gmail.com
@@ -71,7 +71,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends <requirements/r
 
 # Create local catkin workspace
 RUN mkdir -p $CATKIN_WS/src
-WORKDIR $CATKIN_WS/src
+
+# Copy Every Package
+COPY ../ ${CATKIN_WS}/src
+
+# Set the working directory for Catkin
+WORKDIR $CATKIN_WS
 
 # Initialize local catkin workspace, install dependencies and build workpsace
 RUN echo "source /opt/ros/${ROS_VERSION}/setup.bash" >> ~/.bashrc
@@ -90,4 +95,4 @@ 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"]
+CMD ["/bin/bash"]
diff --git a/scripts/catkin_setup.sh b/scripts/catkin_setup.sh
index 579bc20..12def21 100755
--- a/scripts/catkin_setup.sh
+++ b/scripts/catkin_setup.sh
@@ -16,6 +16,5 @@
 # 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"
+catkin build
+source "/root/catkin_ws/devel/setup.bash"
diff --git a/scripts/colcon_setup.sh b/scripts/colcon_setup.sh
index 8d6c4ac..d17146a 100755
--- a/scripts/colcon_setup.sh
+++ b/scripts/colcon_setup.sh
@@ -17,5 +17,4 @@
 
 
 colcon build 
-source "/opt/ros/foxy/setup.bash"
-source "$CATKIN_WS/install/setup.bash"
+source "./install/setup.bash"