diff --git a/.travis.rosinstall.jade b/.travis.rosinstall.jade
deleted file mode 120000
index 88265f9..0000000
--- a/.travis.rosinstall.jade
+++ /dev/null
@@ -1 +0,0 @@
-.travis.rosinstall.kinetic
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index e06eacf..e868a3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,16 +7,17 @@ notifications:
     on_failure: always
 env:
   global:
-    - UPSTREAM_WORKSPACE=file
+    - ROS_REPO=ros
     - ROS_PARALLEL_JOBS=-j4
   matrix:
-    - ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
+    - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file
+    - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian
+    - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file
+    - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian
 matrix:
   allow_failures:
-    - env: ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - env: ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
+    - env: ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian
+    - env: ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian
 install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script:
diff --git a/cob_object_categorization/CATKIN_IGNORE b/cob_object_categorization/CATKIN_IGNORE
new file mode 100644
index 0000000..e69de29