diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df58990..f117b46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,10 @@ name: CI
 on: [push, pull_request]
 
 jobs:
+  setup-ebtree:
+    uses: sociomantic-tsunami/ocean/.github/workflows/ebtree.yml@v6.x.x
+    with:
+      os: ubuntu-20.04
   main:
     name: Run
     strategy:
@@ -21,10 +25,8 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    needs: setup-ebtree
     steps:
-    - name: "Ensure tools/ exists"
-      run: mkdir -p ${{ github.workspace }}/tools/
-
     - name: 'Restore ebtree from cache'
       id: cache-ebtree
       uses: actions/cache@v1
@@ -32,29 +34,6 @@ jobs:
         path: ${{ github.workspace }}/tools/
         key:  ebtree
 
-    - name: 'Checkout ebtree ${{ matrix.ebtree_version }}'
-      uses: actions/checkout@v2
-      if: steps.cache-ebtree.outputs.cache-hit != 'true'
-      with:
-        repository: sociomantic-tsunami/ebtree
-        ref: ${{ matrix.ebtree_version }}
-        # Relative to Github workspace
-        path: tools/ebtree
-
-    - name: 'Build ebtree ${{ matrix.ebtree_version }}'
-      if: steps.cache-ebtree.outputs.cache-hit != 'true'
-      run: |
-
-        # fpm is used to build the `.deb` and depends on ruby
-        sudo apt-get update
-        sudo apt-get install -y build-essential ruby ruby-dev
-        sudo gem install --no-document fpm
-        # Build the debian package
-        # Package lives in tools/ebtree/deb/libebtree6[-{dbg,dev}]_$VERSION-distro_arch.deb
-        # $VERSION is ${{ matrix.ebtree_version }} without the leading 'v'
-        # E.g. libebtree6[-{dbg,dev}]_6.0.socio10-bionic_amd64.deb
-        make -C '${{ github.workspace }}/tools/ebtree' deb
-
     - name: Install dependencies
       run: |
         sudo apt-get update && \
diff --git a/submodules/ocean b/submodules/ocean
index 377dff7..002cbc6 160000
--- a/submodules/ocean
+++ b/submodules/ocean
@@ -1 +1 @@
-Subproject commit 377dff7ceeecb48693ed416da28c565bb131022d
+Subproject commit 002cbc6870bde9929e039c46432cffcba7d9b7e7
diff --git a/submodules/swarm b/submodules/swarm
index 3cb923c..5804f3e 160000
--- a/submodules/swarm
+++ b/submodules/swarm
@@ -1 +1 @@
-Subproject commit 3cb923cb4efe6468e54368b7a1a69f087d6a05f9
+Subproject commit 5804f3ec3ec4f7b7d26637a766a1bdd3604e4047
diff --git a/submodules/turtle b/submodules/turtle
index ab30dfd..973329e 160000
--- a/submodules/turtle
+++ b/submodules/turtle
@@ -1 +1 @@
-Subproject commit ab30dfd001060247541d12f8606e558a26fd1dfc
+Subproject commit 973329eae8068fd84d3e2c06387bea6fb6c9a945