diff --git a/.travis.rosinstall.noetic b/.travis.rosinstall.noetic
index e1bee1b6a..7de364b22 100644
--- a/.travis.rosinstall.noetic
+++ b/.travis.rosinstall.noetic
@@ -12,14 +12,6 @@
     local-name: baxter_tools
     uri: https://github.com/RethinkRobotics-release/baxter_tools-release/archive/release/indigo/baxter_tools/1.2.0-0.tar.gz
     version: baxter_tools-release-release-indigo-baxter_tools-1.2.0-0
-- tar:
-    local-name: jsk_planning/pddl_planner
-    uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_planner/0.1.12-1.tar.gz
-    version: jsk_planning-release-release-melodic-pddl_planner-0.1.12-1
-- tar:
-    local-name: jsk_planning/pddl_msgs
-    uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_msgs/0.1.12-1.tar.gz
-    version: jsk_planning-release-release-melodic-pddl_msgs-0.1.12-1
 - tar:
     local-name: jsk_demos/jsk_demo_common
     uri: https://github.com/tork-a/jsk_demos-release/archive/release/indigo/jsk_demo_common/0.0.4-0.tar.gz
@@ -62,15 +54,6 @@
     local-name: dynamixel_motor
     uri: https://github.com/pazeshun/dynamixel_motor.git
     version: gripper-v6-devel
-# waiting for release in noetic
-- git:
-    local-name: openni_camera
-    uri: https://github.com/ros-drivers/openni_camera.git
-    version: indigo-devel
-- git:
-    local-name: pr2_gripper_sensor
-    uri: https://github.com/PR2/pr2_gripper_sensor.git
-    version: hydro-devel
 # https://github.com/locusrobotics/catkin_virtualenv/pull/85
 - git:
     local-name: catkin_virtualenv
diff --git a/fc.rosinstall.noetic b/fc.rosinstall.noetic
index 5dfa4ee91..fdcb94a26 100644
--- a/fc.rosinstall.noetic
+++ b/fc.rosinstall.noetic
@@ -67,37 +67,20 @@
     local-name: turtlebot/create_description
     uri: https://github.com/turtlebot-release/turtlebot_create-release.git
     version: release/kinetic/create_description
-- tar:
-    local-name: jsk_planning/pddl_planner
-    uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_planner/0.1.12-1.tar.gz
-    version: jsk_planning-release-release-melodic-pddl_planner-0.1.12-1
-- tar:
-    local-name: jsk_planning/pddl_msgs
-    uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_msgs/0.1.12-1.tar.gz
-    version: jsk_planning-release-release-melodic-pddl_msgs-0.1.12-1
-# waiting for release in noetic
-- git:
-    local-name: ros-drivers/openni_camera
-    uri: https://github.com/ros-drivers/openni_camera.git
-    version: indigo-devel
-- git:
-    local-name: PR2/pr2_gripper_sensor
-    uri: https://github.com/PR2/pr2_gripper_sensor.git
-    version: hydro-devel
 # https://github.com/astuff/ml_classifiers/pull/6
 - git:
-    local-name: ml_classifiers
+    local-name: astuff/ml_classifiers
     uri: https://github.com/pazeshun/ml_classifiers.git
     version: add-noetic-test
 # find_package(collada_urdf) failed due to wrong collada_urdfConfig.cmake
 # - https://github.com/ros/collada_urdf/issues/43
 # - https://github.com/ros/collada_urdf/pull/44
 - git:
-    local-name: collada_urdf
+    local-name: ros/collada_urdf
     uri: https://github.com/werner291/collada_urdf.git
     version: patch-1
 # https://github.com/jsk-ros-pkg/jsk_visualization/pull/882, https://github.com/jsk-ros-pkg/jsk_visualization/pull/867
 - git:
-    local-name: jsk_visualization
+    local-name: jsk-ros-pkg/jsk_visualization
     uri: https://github.com/pazeshun/jsk_visualization.git
     version: fix-for-noetic