diff --git a/.docker/ci-testing/Dockerfile b/.docker/ci-testing/Dockerfile
index 48f9839757..01b580cace 100644
--- a/.docker/ci-testing/Dockerfile
+++ b/.docker/ci-testing/Dockerfile
@@ -29,7 +29,7 @@ RUN \
         # Some basic requirements
         wget git sudo curl \
         # Preferred build tools
-        clang clang-format-14 clang-tidy clang-tools \
+        clang clang-format-18 clang-tidy clang-tools \
         ccache \
         ros-"$ROS_DISTRO"-ros-base && \
     #
@@ -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 3d1783316c..7d17ecf3ad 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/release/Dockerfile b/.docker/release/Dockerfile
index 5996bc1625..71c90beb5a 100644
--- a/.docker/release/Dockerfile
+++ b/.docker/release/Dockerfile
@@ -11,5 +11,5 @@ ENV RTI_NC_LICENSE_ACCEPTED=yes
 # Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size
 RUN apt-get update -q && \
     apt-get upgrade -q -y && \
-    apt-get install -y "ros-${ROS_DISTRO}-moveit-*" --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
+    apt-get install -y ros-rolling-moveit --no-install-recommends && \
+    rm -Rf /var/lib/apt/lists/*
diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile
index 7aeda93556..59482cd956 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 575bd05aa6..daac9463a2 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 \
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index ceca2af83a..06e0472f10 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -14,14 +14,14 @@ on:
 jobs:
   pre-commit:
     name: Format
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v7
     - uses: actions/setup-python@v7
       with:
         python-version: 3.x
-    - name: Install clang-format-14
-      run: sudo apt-get install clang-format-14
+    - name: Install clang-format-18
+      run: sudo apt-get install clang-format-18
     - uses: pre-commit/action@v3.0.1
       id: precommit
     - name: Upload pre-commit changes
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7a2bb385c0..8e972cea84 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@
 repos:
   # Standard hooks
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -33,18 +33,18 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/psf/black
-    rev: 25.1.0
+    rev: 25.12.0
     hooks:
       - id: black
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v14.0.6
+    rev: v18.1.8
     hooks:
       - id: clang-format
         types_or: [c++, c, cuda]
         args: ["-fallback-style=none"]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
       - id: codespell
         args: ['--write-changes', '--ignore-words=.codespell_words', '--skip="*.eps"']