diff --git a/.github/workflows/colcon.yml b/.github/workflows/colcon.yml
index 4984962..ff6fbe8 100644
--- a/.github/workflows/colcon.yml
+++ b/.github/workflows/colcon.yml
@@ -39,9 +39,9 @@ jobs:
         run: |
           apt-get update
           DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y python3
-          # Workaround to wait for upstream PR
-          # https://github.com/ros/rosdistro/pull/39772
-          echo "yaml https://raw.githubusercontent.com/ryanf55/rosdistro/gz-harmonic/rosdep/base.yaml" > /etc/ros/rosdep/sources.list.d/30-ryanf55.list
+          # Rosdep sources for non-standard versions
+          # https://gazebosim.org/docs/garden/ros_installation#using-an-specific-gazebo-version-with-ros-2
+          wget https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/00-gazebo.list -O /etc/ros/rosdep/sources.list.d/00-gazebo.list
           rosdep update
           # Workaround for flake8 attribute error
           # https://github.com/ArduPilot/ardupilot/pull/24277#issuecomment-1632833433