diff --git a/.docker/ci-testing/Dockerfile b/.docker/ci-testing/Dockerfile
index 99e89cba4b..260512967c 100644
--- a/.docker/ci-testing/Dockerfile
+++ b/.docker/ci-testing/Dockerfile
@@ -58,9 +58,9 @@ RUN \
     if [ -r src/moveit2/moveit2_"$ROS_DISTRO".repos ] ; then vcs import src < src/moveit2/moveit2_"$ROS_DISTRO".repos ; fi && \
     #
     # Download all dependencies of MoveIt
-    rosdep update && \
     DEBIAN_FRONTEND=noninteractive \
     rosdep install -y --from-paths src --ignore-src --rosdistro "$ROS_DISTRO" --as-root=apt:false && \
+    rosdep update && \
     # Remove the source code from this container
     rm -rf src && \
     #
diff --git a/.docker/ci/Dockerfile b/.docker/ci/Dockerfile
index 2492da642f..239a92bc94 100644
--- a/.docker/ci/Dockerfile
+++ b/.docker/ci/Dockerfile
@@ -37,9 +37,9 @@ RUN \
     if [ -r src/moveit2/moveit2_${ROS_DISTRO}.repos ] ; then vcs import src < src/moveit2/moveit2_${ROS_DISTRO}.repos ; fi && \
     #
     # Download all dependencies of MoveIt
-    rosdep update && \
     DEBIAN_FRONTEND=noninteractive \
     rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
+    rosdep update && \
     # Remove the source code from this container
     rm -rf src && \
     #
diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile
index bf2c845071..e9e0977548 100644
--- a/.docker/source/Dockerfile
+++ b/.docker/source/Dockerfile
@@ -26,9 +26,9 @@ RUN --mount=type=cache,target=/root/.ccache/ \
     . "/opt/ros/${ROS_DISTRO}/setup.sh" &&\
     # Install dependencies from rosdep
     apt-get -q update && \
-    rosdep update && \
     DEBIAN_FRONTEND=noninteractive \
     rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
+    rosdep update && \
     rm -rf /var/lib/apt/lists/* && \
     # Build the workspace
     colcon build \
diff --git a/.docker/tutorial-source/Dockerfile b/.docker/tutorial-source/Dockerfile
index 38d53920c7..6137a37abf 100644
--- a/.docker/tutorial-source/Dockerfile
+++ b/.docker/tutorial-source/Dockerfile
@@ -36,9 +36,9 @@ RUN --mount=type=cache,target=/root/.ccache/,sharing=locked \
         . "/opt/ros/${ROS_DISTRO}/setup.sh" &&\
         # Install dependencies from rosdep
         apt-get -q update && \
-        rosdep update && \
         DEBIAN_FRONTEND=noninteractive \
         rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
+        rosdep update && \
         rm -rf /var/lib/apt/lists/* && \
         # Build the workspace
         colcon build \