diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ca6b4ef5..8bb68e82 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,18 +16,20 @@ jobs:
              OS_CODE_NAME: bionic,
              ROS_DISTRO: eloquent,
              ROS_REPO: main,
-             ROSDEP_SKIP_KEYS: "bullet3 fcl ompl",
+             ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu ompl",
              CLANG_FORMAT_CHECK: file,
              CLANG_FORMAT_VERSION: 8,
              DOCKER_IMAGE: "mpowelson/tesseract:eloquent",
+             AFTER_INIT: "apt-get upgrade -y",
              BADGE: clang-format}
           - {OS_NAME: ubuntu,
              OS_CODE_NAME: bionic,
              ROS_DISTRO: eloquent,
              ROS_REPO: main,
              UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
-             ROSDEP_SKIP_KEYS: "bullet3 fcl ompl",
+             ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu ompl",
              DOCKER_IMAGE: "mpowelson/tesseract:eloquent",
+             AFTER_INIT: "apt-get upgrade -y",
              BADGE: clang-tidy,
              NOT_TEST_BUILD: true,
              UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug",
@@ -35,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: 'ipa-mdl/industrial_ci@revert-revert-colcon-chain'
+      - uses: 'ros-industrial/industrial_ci@master'
         env: ${{matrix.env}}
   test:
     strategy:
@@ -47,13 +49,14 @@ jobs:
              ROS_DISTRO: eloquent,
              ROS_REPO: main,
              UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
-             ROSDEP_SKIP_KEYS: "bullet3 fcl ompl",
+             ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu ompl",
              DOCKER_IMAGE: "mpowelson/tesseract:eloquent",
+             AFTER_INIT: "apt-get upgrade -y",
              BADGE: bionic,
              UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug",
              TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON"}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: 'ipa-mdl/industrial_ci@revert-revert-colcon-chain'
+      - uses: 'ros-industrial/industrial_ci@master'
         env: ${{matrix.env}}
diff --git a/dependencies.rosinstall b/dependencies.rosinstall
index bf32d935..291c9669 100644
--- a/dependencies.rosinstall
+++ b/dependencies.rosinstall
@@ -1,3 +1,7 @@
+- git:
+    local-name: cmake_common_scripts
+    uri: https://github.com/ros-industrial/cmake_common_scripts.git
+    version: master
 - git:
     local-name: tesseract
     uri: https://github.com/ros-industrial-consortium/tesseract.git