diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd06d4d..54dead9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,26 @@
 ## Build and test as catkin package
+kinetic-catkin-build:
+  stage: build
+  image: rduweston/ubuntu-ci:kinetic-xenial
+  before_script:
+    - apt update && apt -y install ros-$ROS_DISTRO-teleop-twist-keyboard
+  script:
+    - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
+    - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/core/wrp_sdk.git
+    - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/scout_base
+    - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make"
+
+kinetic-catkin-isolated-build:
+  stage: build
+  image: rduweston/ubuntu-ci:kinetic-xenial
+  before_script:
+    - apt update && apt -y install ros-$ROS_DISTRO-teleop-twist-keyboard
+  script:
+    - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
+    - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/core/wrp_sdk.git
+    - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/scout_base
+    - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make_isolated --install"
+
 melodic-catkin-build:
   stage: build
   image: rduweston/ubuntu-ci:melodic-bionic