diff --git a/.docker/ci/Dockerfile b/.docker/ci/Dockerfile
index 827bae17d9..2492da642f 100644
--- a/.docker/ci/Dockerfile
+++ b/.docker/ci/Dockerfile
@@ -18,7 +18,7 @@ COPY . src/moveit2
 RUN \
     # Update apt package list as previous containers clear the cache
     apt-get -q update && \
-    apt-get -q -y upgrade --with-new-pkgs && \
+    apt-get -q -y upgrade && \
     #
     # Install some base dependencies
     apt-get -q install --no-install-recommends -y \
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fd1dc1a4c6..5ac8d6b4f8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -26,10 +26,10 @@ jobs:
             CLANG_TIDY: pedantic
           - IMAGE: humble-ci
             ROS_DISTRO: humble
-          - IMAGE: humble-ci-testing
-            ROS_DISTRO: humble
           - IMAGE: jazzy-ci
             ROS_DISTRO: jazzy
+          - IMAGE: jazzy-ci-testing
+            ROS_DISTRO: jazzy
     env:
       # TODO(andyz): When this clang-tidy issue is fixed, remove -Wno-unknown-warning-option
       # https://stackoverflow.com/a/41673702
diff --git a/moveit2_humble.repos b/moveit2_humble.repos
deleted file mode 100644
index 71a9316f22..0000000000
--- a/moveit2_humble.repos
+++ /dev/null
@@ -1,5 +0,0 @@
-repositories:
-  generate_parameter_library:
-    type: git
-    url: https://github.com/PickNikRobotics/generate_parameter_library.git
-    version: 0.3.7
diff --git a/moveit2_iron.repos b/moveit2_iron.repos
deleted file mode 100644
index 71a9316f22..0000000000
--- a/moveit2_iron.repos
+++ /dev/null
@@ -1,5 +0,0 @@
-repositories:
-  generate_parameter_library:
-    type: git
-    url: https://github.com/PickNikRobotics/generate_parameter_library.git
-    version: 0.3.7