diff --git a/.travis.yml b/.travis.yml
index 0b371724408415878830dc16ab5e0bb5bd94bb7c..13da30625f16d95892fc7d7da40dcb8ff3194168 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,25 @@
-sudo: required
-dist: trusty
 language: generic
-compiler:
-  - gcc
+services:
+  - docker
+
 notifications:
   email:
     on_success: always
     on_failure: always
 env:
   matrix:
-    - USE_DEB=true  ROS_DISTRO="kinetic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - USE_DEB=true  ROS_DISTRO="kinetic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
-    - USE_DEB=true  ROS_DISTRO="kinetic"   PRERELEASE=true
-    - USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
-    - USE_DEB=true  ROS_DISTRO="melodic"   PRERELEASE=true
+    - ROS_DISTRO="kinetic"   ROS_REPO=ros
+    - ROS_DISTRO="kinetic"   ROS_REPO=ros-shadow-fixed
+    - ROS_DISTRO="kinetic"   PRERELEASE=true
+    - ROS_DISTRO="melodic"   ROS_REPO=ros
+    - ROS_DISTRO="melodic"   ROS_REPO=ros-shadow-fixed
+    - ROS_DISTRO="melodic"   PRERELEASE=true
 matrix:
   allow_failures:
-    - env: USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - env: USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
-    - env: USE_DEB=true  ROS_DISTRO="melodic"   PRERELEASE=true
+    - env: ROS_DISTRO="melodic"   ROS_REPO=ros
+    - env: ROS_DISTRO="melodic"   ROS_REPO=ros-shadow-fixed
+    - env: ROS_DISTRO="melodic"   PRERELEASE=true
 install:
-  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+  - git clone --quiet --depth=1 https://github.com/ros-industrial/industrial_ci.git .ci_config
 script:
   - source .ci_config/travis.sh