diff --git a/.docker/jazzy.amd64.dockerfile b/.docker/jazzy.amd64.dockerfile
index 3c90b79e..81e04d74 100644
--- a/.docker/jazzy.amd64.dockerfile
+++ b/.docker/jazzy.amd64.dockerfile
@@ -40,19 +40,17 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN adduser --shell /bin/bash --disabled-password --gecos '' $USER \
     && echo "$USER:$USER" | chpasswd && adduser $USER sudo \
     && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-# Set User as user
-USER $USER
 
 # RUN adduser --shell /bin/bash --disabled-password --gecos "" user \
 #     && echo 'user:user' | chpasswd && adduser user sudo \
 #     && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
-ENV ROS_UNDERLAY ~/home/$USER/ws_dave/install
+ENV ROS_UNDERLAY /home/$USER/ws_dave/install
 WORKDIR $ROS_UNDERLAY/../src
 
 ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
-extras/repos/dave.$ROS_DISTRO.repos dave.repos
-RUN vcs import < dave.repos
+extras/repos/dave.$ROS_DISTRO.repos /home/$USER/ws_dave/dave.repos
+RUN vcs import --shallow --input /home/$USER/ws_dave/dave.repos
 
 RUN apt-get update && rosdep update && \
     rosdep install -iy --from-paths . && \
@@ -65,3 +63,6 @@ RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" && \
 # source entrypoint setup
 RUN sed --in-place --expression \
     '$i source "$ROS_UNDERLAY/setup.bash"' /ros_entrypoint.sh
+
+# Set User as user
+USER $USER
diff --git a/.docker/jazzy.arm64v8.dockerfile b/.docker/jazzy.arm64v8.dockerfile
index 46fa2ba3..b98a44af 100644
--- a/.docker/jazzy.arm64v8.dockerfile
+++ b/.docker/jazzy.arm64v8.dockerfile
@@ -100,8 +100,8 @@ ENV ROS_UNDERLAY /home/$USER/dave_ws/install
 WORKDIR $ROS_UNDERLAY/../src
 
 ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
-extras/repos/dave.jazzy.repos dave.repos
-RUN vcs import < dave.repos
+extras/repos/dave.$ROS_DISTRO.repos /home/$USER/ws_dave/dave.repos
+RUN vcs import --shallow --input /home/$USER/ws_dave/dave.repos
 
 RUN rosdep init && \
   rosdep update --rosdistro $ROS_DISTRO