diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e995d60..5687f51 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,8 +15,8 @@ name: CI l3build test suite
 on: [push, pull_request]
 
 jobs:
-  tests:
-    name: Regression tests
+  setup:
+    name: Common setup
 
     runs-on: ubuntu-latest
     container:
@@ -29,6 +29,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+  tests:
+    name: Regression tests
+    needs: setup
+
+    steps:
       - name: Run tests
         run: l3build check -q --show-log-on-error
 
@@ -41,17 +46,8 @@ jobs:
 
   doc:
     name: Documentation
-
-    runs-on: ubuntu-latest
-    container:
-      image: registry.gitlab.com/islandoftex/images/texlive:latest
+    needs: setup
 
     steps:
-      - name: Update TeX Live
-        run: tlmgr update --self --all
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: Compile documentation
         run: l3build doc -q