diff --git a/noetic/distribution.yaml b/noetic/distribution.yaml
index 3c4228e11126c..f753f13c8dd44 100644
--- a/noetic/distribution.yaml
+++ b/noetic/distribution.yaml
@@ -1091,14 +1091,30 @@ repositories:
     doc:
       type: git
       url: https://github.com/4am-robotics/cob_common.git
-      version: kinetic_release_candidate
+      version: noetic-release-candidate
     release:
       packages:
       - cob_actions
       - cob_common
-      - cob_description
       - cob_msgs
       - cob_srvs
+      tags:
+        release: release/noetic/{package}/{version}
+      url: https://github.com/4am-robotics/cob_common-release.git
+      version: 0.7.11-1
+    source:
+      type: git
+      url: https://github.com/4am-robotics/cob_common.git
+      version: noetic-devel
+    status: maintained
+  cob_common_legacy:
+    doc:
+      type: git
+      url: https://github.com/4am-robotics/cob_common.git
+      version: kinetic_release_candidate
+    release:
+      packages:
+      - cob_description
       - raw_description
       tags:
         release: release/noetic/{package}/{version}
@@ -1108,7 +1124,7 @@ repositories:
       type: git
       url: https://github.com/4am-robotics/cob_common.git
       version: kinetic_dev
-    status: maintained
+    status: end-of-life
   cob_control:
     doc:
       type: git