diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 50cf5c4557b..fcd3009a2cf 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -5,8 +5,40 @@ on:
     branches: master
 
 jobs:
-  ocaml:
-    name: Docs
+  xapi-hugo:
+    name: xapi (Hugo)
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@v3
+        with:
+          hugo-version: '0.127.0'
+
+      - name: Build
+        run: |
+          cd doc
+          hugo --minify
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        if: ${{ github.repository == 'xapi-project/xen-api' }}
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DOCS_DEPLOY_KEY }}
+          publish_dir: ./doc/public
+          user_name: 'Github action on xapi-project/xen-api'
+          user_email: 'github-actions-xapi-project-xen-api[bot]@users.noreply.github.com'
+          external_repository: xapi-project/xapi-project.github.io
+          publish_branch: master
+          destination_dir: new-docs # temporary staging branch
+          allow_empty_commit: false
+          enable_jekyll: true # do not create .nojekyll file
+
+  xapi-storage:
+    name: xapi-storage
     runs-on: ubuntu-22.04
     env:
       XAPI_VERSION: "v0.0.0-${{ github.sha }}"
diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml
deleted file mode 100644
index e3c32f9c53d..00000000000
--- a/.github/workflows/hugo.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Generate and upload Hugo docs
-
-on:
-  push:
-    branches: master
-
-jobs:
-  ocaml:
-    name: Docs
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v3
-        with:
-          hugo-version: '0.127.0'
-
-      - name: Build
-        run: |
-          cd doc
-          hugo --minify
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v4
-        if: ${{ github.repository == 'xapi-project/xen-api' }}
-        with:
-          deploy_key: ${{ secrets.ACTIONS_DOCS_DEPLOY_KEY }}
-          publish_dir: ./doc/public
-          user_name: 'Github action on xapi-project/xen-api'
-          user_email: 'github-actions-xapi-project-xen-api[bot]@users.noreply.github.com'
-          external_repository: xapi-project/xapi-project.github.io
-          publish_branch: master
-          destination_dir: new-docs # temporary staging branch
-          allow_empty_commit: false
-          enable_jekyll: true # do not create .nojekyll file