diff --git a/.github/workflows/basic-build-ci.yaml b/.github/workflows/basic-build-ci.yaml
index 759927eef..dee47c813 100644
--- a/.github/workflows/basic-build-ci.yaml
+++ b/.github/workflows/basic-build-ci.yaml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
     container:
-      image: osrf/ros2:testing
+      image: osrf/ros2:devel
     steps:
     - name: Checkout repo
       uses: actions/checkout@v4
@@ -23,16 +23,16 @@ jobs:
         mv src_tmp/ src/
     - name: Install Prerequisites
       run: |
-        bash -c 'source /opt/ros/$ROS_DISTRO/setup.bash; \
+        bash -c 'source /opt/ros/rolling/setup.bash; \
         apt-get update && apt-get upgrade -y && rosdep update; \
-        rosdep install --from-paths src --ignore-src -y'
+        rosdep install --from-paths src --ignore-src --rosdistro=rolling -y'
     - name: Build Workspace
       run: |
-        bash -c 'source /opt/ros/$ROS_DISTRO/setup.bash; \
+        bash -c 'source /opt/ros/rolling/setup.bash; \
         colcon build'
     - name: Run Tests
       run: |
-        bash -c 'source /opt/ros/$ROS_DISTRO/setup.bash; \
+        bash -c 'source /opt/ros/rolling/setup.bash; \
         colcon test; \
         colcon test-result --verbose'
   build-rolling-testing: