diff --git a/indigo/distribution.yaml b/indigo/distribution.yaml
index 2786f2069ee07..147f9231d3d2f 100644
--- a/indigo/distribution.yaml
+++ b/indigo/distribution.yaml
@@ -8639,30 +8639,18 @@ repositories:
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     release:
+      packages:
+      - openni_camera
+      - openni_launch
       tags:
         release: release/indigo/{package}/{version}
       url: https://github.com/ros-gbp/openni_camera-release.git
-      version: 1.9.5-0
+      version: 1.10.0-0
     source:
       type: git
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     status: maintained
-  openni_launch:
-    doc:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    release:
-      tags:
-        release: release/indigo/{package}/{version}
-      url: https://github.com/ros-gbp/openni_launch-release.git
-      version: 1.9.8-0
-    source:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    status: maintained
   openrave_planning:
     release:
       packages:
diff --git a/kinetic/distribution.yaml b/kinetic/distribution.yaml
index 0e994e060e1f5..52ebde20e0e46 100644
--- a/kinetic/distribution.yaml
+++ b/kinetic/distribution.yaml
@@ -5939,30 +5939,18 @@ repositories:
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     release:
+      packages:
+      - openni_camera
+      - openni_launch
       tags:
         release: release/kinetic/{package}/{version}
       url: https://github.com/ros-gbp/openni_camera-release.git
-      version: 1.9.5-0
+      version: 1.10.0-0
     source:
       type: git
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     status: maintained
-  openni_launch:
-    doc:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    release:
-      tags:
-        release: release/kinetic/{package}/{version}
-      url: https://github.com/ros-gbp/openni_launch-release.git
-      version: 1.9.8-0
-    source:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    status: maintained
   openrtm_aist:
     doc:
       type: git
diff --git a/lunar/distribution.yaml b/lunar/distribution.yaml
index 40966a6298c59..91ddaefce5f6f 100644
--- a/lunar/distribution.yaml
+++ b/lunar/distribution.yaml
@@ -2138,32 +2138,18 @@ repositories:
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     release:
+      packages:
+      - openni_camera
+      - openni_launch
       tags:
         release: release/lunar/{package}/{version}
       url: https://github.com/ros-gbp/openni_camera-release.git
-      version: 1.9.5-0
+      version: 1.10.0-0
     source:
-      test_pull_requests: true
       type: git
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     status: maintained
-  openni_launch:
-    doc:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    release:
-      tags:
-        release: release/lunar/{package}/{version}
-      url: https://github.com/ros-gbp/openni_launch-release.git
-      version: 1.9.8-0
-    source:
-      test_pull_requests: true
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    status: maintained
   openslam_gmapping:
     release:
       tags: