diff --git a/rolling/distribution.yaml b/rolling/distribution.yaml
index 37477afefdcf5..2b41457c0cd0c 100644
--- a/rolling/distribution.yaml
+++ b/rolling/distribution.yaml
@@ -453,7 +453,7 @@ repositories:
     doc:
       type: git
       url: https://github.com/ros/diagnostics.git
-      version: foxy
+      version: ros2-devel
     release:
       packages:
       - diagnostic_aggregator
@@ -467,7 +467,7 @@ repositories:
       test_pull_requests: true
       type: git
       url: https://github.com/ros/diagnostics.git
-      version: foxy
+      version: ros2-devel
     status: maintained
   eigen3_cmake_module:
     doc: