diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a770ff5..2b84c52 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,33 +4,24 @@ on:
   workflow_dispatch:
   pull_request:
   push:
+    branches: [main]
 
 jobs:
-  build-and-test:
-    runs-on: ubuntu-22.04
-    container: ghcr.io/picknikrobotics/pick_ik:ci
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/.ccache
+  industrial_ci:
+    strategy:
+      fail-fast: false
+      matrix:
+        env:
+          - {ROS_DISTRO: humble, ROS_REPO: main}
+          - {ROS_DISTRO: jazzy, ROS_REPO: main}
+          - {ROS_DISTRO: kilted, ROS_REPO: main}
+          # Rolling has migrated to Ubuntu Resolute. Packages land in
+          # ros2-testing first; the ros2 (main) repo lags during the base-OS
+          # transition. Point at testing + resolute so we exercise real
+          # rolling instead of the frozen Noble fossil.
+          - {ROS_DISTRO: rolling, ROS_REPO: testing, OS_CODE_NAME: resolute}
+    runs-on: ubuntu-latest
     steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-      - name: Cache ccache
-        uses: pat-s/always-upload-cache@v3.0.11
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ccache-${{ github.sha }}-${{ github.run_id }}
-          restore-keys: |
-            ccache-${{ github.sha }}
-            ccache
-      - name: Source ROS Workspaces
-        run: |
-          . /opt/ros/rolling/setup.sh
-          echo "$(env)" >> $GITHUB_ENV
-      - name: Configure
-        run: cmake --preset relwithdebinfo
-      - name: Build
-        working-directory: ./build/relwithdebinfo
-        run: ninja
-      - name: Test
-        working-directory: ./build/relwithdebinfo
-        run: ctest . --rerun-failed --output-on-failure
+      - uses: actions/checkout@v4
+      - uses: ros-industrial/industrial_ci@master
+        env: ${{ matrix.env }}
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
deleted file mode 100644
index f7bd113..0000000
--- a/.github/workflows/docker.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: docker
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * 0'
-  push:
-    paths:
-      - '.devcontainer/Dockerfile'
-      - '.github/workflows/docker.yaml'
-      - 'package.xml'
-
-jobs:
-  ci-docker:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Github Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: .devcontainer/Dockerfile
-          push: true
-          target: ci
-          tags: ghcr.io/picknikrobotics/pick_ik:ci
diff --git a/package.xml b/package.xml
index 45e538f..7c2e6b9 100644
--- a/package.xml
+++ b/package.xml
@@ -21,6 +21,7 @@
   <depend>tf2_kdl</depend>
   <depend>tl_expected</depend>
 
+  <test_depend>git</test_depend>
   <test_depend>moveit_resources_panda_moveit_config</test_depend>
 
   <export>