diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f29298e..9d1d54c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ xenial-cpp-build:
   stage: build
   image: rduweston/ubuntu-ci:16.04
   script:
-    - git submodule update --init --recursive
     - mkdir build && cd build
     - cmake -DCMAKE_BUILD_TYPE=Release ..
     - cmake --build . && cpack
@@ -12,7 +11,6 @@ bionic-cpp-build:
   stage: build
   image: rduweston/ubuntu-ci:18.04
   script:
-    - git submodule update --init --recursive
     - mkdir build && cd build
     - cmake -DCMAKE_BUILD_TYPE=Release ..
     - cmake --build . && cpack
@@ -21,21 +19,20 @@ focal-cpp-build:
   stage: build
   image: rduweston/ubuntu-ci:20.04
   script:
-    - git submodule update --init --recursive
     - mkdir build && cd build
     - cmake -DCMAKE_BUILD_TYPE=Release ..
     - cmake --build . && cpack
 
 ## Build and test as catkin package
-# kinetic-catkin-build:
-#   stage: build
-#   image: rduweston/ubuntu-ci:kinetic
-#   script:
-#     - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
-#     - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
-#     - cd /catkin_ws/src/wrp_sdk && git submodule update --init --recursive
-#     - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git
-#     - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make"
+kinetic-catkin-build:
+  stage: build
+  image: rduweston/ubuntu-ci:kinetic
+  script:
+    - mkdir -p /catkin_ws/src/ugv_sdk && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
+    - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/ugv_sdk
+    - cd /catkin_ws/src/ugv_sdk
+    - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/public/async_port.git
+    - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make"
 
 # kinetic-catkin-isolated-build:
 #   stage: build