diff --git a/.cirrus.yml b/.cirrus.yml
index 76f15852c4..20e5f0ad76 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -25,13 +25,3 @@ freebsd_task:
     - sudo -u cirrus gmake unittest
   oldtest_script:
     - sudo -u cirrus gmake oldtest
-
-external_deps_task:
-  container:
-    dockerfile: ci/Dockerfile.external_deps
-  deps_script:
-    - cmake -S cmake.deps --preset external_deps
-    - cmake --build .deps
-  build_script:
-    - cmake --preset ci
-    - cmake --build build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bdec96babb..0a75a9aad9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -301,3 +301,41 @@ jobs:
         run: |
           cd test/old/testdir
           mingw32-make VERBOSE=1
+
+  with-external-deps:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: |
+          sudo add-apt-repository ppa:neovim-ppa/stable
+          ./.github/scripts/install_deps.sh
+          sudo apt-get install -y \
+            libluajit-5.1-dev \
+            libmsgpack-dev \
+            libtermkey-dev \
+            libunibilium-dev \
+            libuv1-dev \
+            lua-filesystem \
+            lua-lpeg \
+            luajit \
+            lua-luv-dev
+            # libtree-sitter-dev \
+            # libvterm-dev
+
+            # Remove comments from packages once we start using these external
+            # dependencies.
+
+      - uses: ./.github/actions/cache
+
+      - name: Build third-party deps
+        run: |
+          cmake -S cmake.deps --preset external_deps
+          cmake --build .deps
+
+      - name: Build
+        run: |
+          cmake --preset ci
+          cmake --build build
diff --git a/ci/Dockerfile.external_deps b/ci/Dockerfile.external_deps
deleted file mode 100644
index 0d2a55dd19..0000000000
--- a/ci/Dockerfile.external_deps
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt-get update && \
-    apt-get install -y software-properties-common && \
-    add-apt-repository ppa:neovim-ppa/stable && \
-    apt-get install -y ninja-build \
-            gettext \
-            cmake \
-            unzip \
-            curl \
-            git \
-            libluajit-5.1-dev \
-            libmsgpack-dev \
-            libtermkey-dev \
-            libunibilium-dev \
-            libuv1-dev \
-            lua-filesystem \
-            lua-lpeg \
-            luajit \
-            lua-luv-dev \
-            libtree-sitter-dev \
-            libvterm-dev