diff --git a/.github/workflows/ci-jazzy.yml b/.github/workflows/ci-jazzy.yml
index 89edc10..1b7c2fa 100644
--- a/.github/workflows/ci-jazzy.yml
+++ b/.github/workflows/ci-jazzy.yml
@@ -11,15 +11,13 @@ on:
 
 jobs:
   harmonic_ci:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
+    container:
+      image: ros:jazzy
     strategy:
       matrix:
         ROS_REPO: [testing, main]
     steps:
-      - name: Setup ROS environment
-        uses: ros-tooling/setup-ros@v0.7
-        with:
-          use-ros2-testing: ${{ matrix.ROS_REPO == 'testing' }}
       - name: Run ROS CI
         uses: ros-tooling/action-ros-ci@v0.3
         with:
diff --git a/.github/workflows/ci-rolling.yml b/.github/workflows/ci-rolling.yml
index d381e12..a44ba1d 100644
--- a/.github/workflows/ci-rolling.yml
+++ b/.github/workflows/ci-rolling.yml
@@ -11,15 +11,13 @@ on:
 
 jobs:
   harmonic_ci:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
+    container:
+      image: ros:rolling
     strategy:
       matrix:
         ROS_REPO: [testing, main]
     steps:
-      - name: Setup ROS environment
-        uses: ros-tooling/setup-ros@v0.7
-        with:
-          use-ros2-testing: ${{ matrix.ROS_REPO == 'testing' }}
       - name: Run ROS CI
         uses: ros-tooling/action-ros-ci@v0.3
         with: