diff --git a/groovy/distribution.yaml b/groovy/distribution.yaml
index 55791f53e51a6..27f05dabac682 100644
--- a/groovy/distribution.yaml
+++ b/groovy/distribution.yaml
@@ -304,7 +304,7 @@ repositories:
     doc:
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
     release:
       packages:
       - bond
@@ -319,7 +319,7 @@ repositories:
     source:
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
   bosch_3rdparty:
     doc:
       type: svn
diff --git a/hydro/distribution.yaml b/hydro/distribution.yaml
index 4dfcd02cc24ae..1f334ff657951 100644
--- a/hydro/distribution.yaml
+++ b/hydro/distribution.yaml
@@ -491,7 +491,7 @@ repositories:
     doc:
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
     release:
       packages:
       - bond
@@ -506,7 +506,7 @@ repositories:
     source:
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
     status: maintained
   boost_numpy:
     doc:
diff --git a/indigo/distribution.yaml b/indigo/distribution.yaml
index 17d7dc4e7f709..170a0c79e73d7 100644
--- a/indigo/distribution.yaml
+++ b/indigo/distribution.yaml
@@ -1005,7 +1005,7 @@ repositories:
     doc:
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
     release:
       packages:
       - bond
@@ -1021,7 +1021,7 @@ repositories:
       test_pull_requests: true
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
     status: maintained
   bowpmap_ros:
     source:
diff --git a/jade/distribution.yaml b/jade/distribution.yaml
index 2b9e1e9f54c84..13381bac5f7eb 100644
--- a/jade/distribution.yaml
+++ b/jade/distribution.yaml
@@ -310,7 +310,7 @@ repositories:
     doc:
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
     release:
       packages:
       - bond
@@ -326,7 +326,7 @@ repositories:
       test_pull_requests: true
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
     status: maintained
   bta_ros:
     doc:
diff --git a/kinetic/distribution.yaml b/kinetic/distribution.yaml
index 93133a225cc1a..580dd390824a5 100644
--- a/kinetic/distribution.yaml
+++ b/kinetic/distribution.yaml
@@ -597,7 +597,7 @@ repositories:
     doc:
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
     release:
       packages:
       - bond
@@ -613,7 +613,7 @@ repositories:
       test_pull_requests: true
       type: git
       url: https://github.com/ros/bond_core.git
-      version: master
+      version: groovy-devel
     status: maintained
   brunel_hand_ros:
     doc: