diff --git a/ros-one.repos b/ros-one.repos
index 416c88e..6bf93db 100644
--- a/ros-one.repos
+++ b/ros-one.repos
@@ -1,11 +1,15 @@
 repositories:
+BehaviorTree.CPP:
+    type: git
+    url: https://github.com/BehaviorTree/BehaviorTree.CPP.git
+    version: master
   PlotJuggler:
     type: git
-    url: https://github.com/facontidavide/PlotJuggler
+    url: https://github.com/facontidavide/PlotJuggler.git
     version: main
   Stage:
     type: git
-    url: https://github.com/ros-o/Stage
+    url: https://github.com/ros-o/Stage.git
     version: obese-devel
   actionlib:
     type: git
@@ -35,6 +39,10 @@ repositories:
     type: git
     url: https://github.com/crigroup/baldor.git
     version: master
+  bio_ik:
+    type: git
+    url: https://github.com/TAMS-Group/bio_ik.git
+    version: master
   boost_sml:
       type: git
       url: https://github.com/ros-o/boost_sml.git
@@ -57,7 +65,7 @@ repositories:
     version: 0.5-devel
   code_coverage:
     type: git
-    url: https://github.com/mikeferguson/code_coverage
+    url: https://github.com/mikeferguson/code_coverage.git
     version: master
   common_msgs:
     type: git
@@ -65,8 +73,8 @@ repositories:
     version: noetic-devel
   common_tutorials:
     type: git
-    url: https://github.com/ros/common_tutorials.git
-    version: noetic-devel
+    url: https://github.com/ros-o/common_tutorials.git
+    version: obese-devel
   control_msgs:
     type: git
     url: https://github.com/ros-controls/control_msgs.git
@@ -75,6 +83,10 @@ repositories:
     type: git
     url: https://github.com/ros-o/control_toolbox
     version: obese-devel
+  convex_decomposition:
+    type: git
+    url: https://github.com/ros/convex_decomposition.git
+    version: melodic-devel
   criutils:
     type: git
     url: https://github.com/crigroup/criutils.git
@@ -83,22 +95,42 @@ repositories:
     type: git
     url: https://github.com/ros-o/diagnostics.git
     version: obese-devel
+  driver_common:
+    type: git
+    url: https://github.com/ros-drivers/driver_common.git
+    version: indigo-devel
   dynamic_reconfigure:
     type: git
     url: https://github.com/ros/dynamic_reconfigure.git
     version: noetic-devel
   eigen_stl_containers:
     type: git
-    url: https://github.com/ros/eigen_stl_containers
+    url: https://github.com/ros/eigen_stl_containers.git
     version: master
   eigenpy:
     type: tar
     url: https://github.com/stack-of-tasks/eigenpy-ros-release/archive/release/noetic/eigenpy/2.9.2-1.tar.gz
     version: eigenpy-ros-release-release-noetic-eigenpy-2.9.2-1
+  eml:
+    type: git
+    url: https://github.com/ros-o/eml
+    version: main
+  ethercat_grant:
+    type: git
+    url: https://github.com/shadow-robot/ethercat_grant.git
+    version: noetic-devel
   executive_smach:
     type: git
     url: https://github.com/ros/executive_smach.git
     version: noetic-devel
+  executive_smach_visualization:
+    type: git
+    url: https://github.com/ros-visualization/executive_smach_visualization.git
+    version: melodic-devel
+  fake_joint:
+    type: git
+    url: https://github.com/ros-o/fake_joint
+    version: obese-devel
   fcl:
     type: git
     url: https://github.com/flexible-collision-library/fcl.git
@@ -153,8 +185,8 @@ repositories:
     version: obese-devel
   geometry2:
     type: git
-    url: https://github.com/ros/geometry2
-    version: noetic-devel
+    url: https://github.com/ros-o/geometry2
+    version: obese-devel
   geometry_tutorials:
     type: git
     url: https://github.com/ros/geometry_tutorials.git
@@ -187,6 +219,10 @@ repositories:
     type: git
     url: https://github.com/ros-o/interactive_markers
     version: obese-devel
+  ivcon:
+    type: git
+    url: https://github.com/ros/ivcon.git
+    version: melodic-devel
   joint_state_publisher:
     type: git
     url: https://github.com/ros/joint_state_publisher
@@ -343,6 +379,10 @@ repositories:
     type: git
     url: https://github.com/ros-o/resource_retriever
     version: obese-devel
+  rgbd_launch:
+    type: git
+    url: https://github.com/ros-drivers/rgbd_launch.git
+    version: noetic-devel
   robot_state_publisher:
     type: git
     url: https://github.com/ros-o/robot_state_publisher
@@ -379,6 +419,10 @@ repositories:
     type: git
     url: https://github.com/ros/rosbag_migration_rule.git
     version: master
+  rosbag_snapshot:
+    type: git
+    url: https://github.com/ros/rosbag_snapshot.git
+    version: main
   rosconsole:
     type: git
     url: https://github.com/ros-o/rosconsole.git
@@ -541,15 +585,15 @@ repositories:
     version: ruckig-release-release-noetic-ruckig-0.9.2-1
   rviz:
     type: git
-    url: https://github.com/ros-visualization/rviz
+    url: https://github.com/ros-visualization/rviz.git
     version: noetic-devel
   rviz_visual_tools:
     type: git
-    url: https://github.com/PickNikRobotics/rviz_visual_tools
-    version: master
+    url: https://github.com/ros-o/rviz_visual_tools.git
+    version: obese-devel
   srdfdom:
     type: git
-    url: https://github.com/ros-planning/srdfdom
+    url: https://github.com/ros-planning/srdfdom.git
     version: noetic-devel
   stage_ros:
     type: git
@@ -593,7 +637,7 @@ repositories:
     version: obese-devel
   warehouse_ros:
     type: git
-    url: https://github.com/rhaschke/warehouse_ros.git
+    url: https://github.com/ros-planning/warehouse_ros.git
     version: kinetic-devel
   webkit_dependency:
     type: git