diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f39abf86e..87c935432 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -216,6 +216,10 @@ stages:
       # CDash files.
       - build/DartConfiguration.tcl
 
+      # Users guide
+      - build/docs/users-guide/html
+      - build/docs/users-guide/latex
+
 .cmake_test_artifacts: &cmake_test_artifacts
   artifacts:
     expire_in: 24 hours
diff --git a/.gitlab/ci/doxygen.yml b/.gitlab/ci/doxygen.yml
index 5e8c259e5..44bf385e9 100644
--- a/.gitlab/ci/doxygen.yml
+++ b/.gitlab/ci/doxygen.yml
@@ -39,9 +39,10 @@ build:docs-continuous:
   script:
     - *build_doxygen_script
   extends:
+    - .build_docs
+    - .cmake_build_artifacts
     - .run_automatically
     - .ubuntu2004_doxygen
-    - .build_docs
 
 build:docs-master:
   script:
@@ -55,8 +56,9 @@ build:docs-master:
       when: on_success
     - when: never
   extends:
-    - .ubuntu2004_doxygen
     - .build_docs
+    - .cmake_build_artifacts
+    - .ubuntu2004_doxygen
   variables:
     DOXYGEN_UPLOAD_REMOTE_PATH: "nightly"
 
@@ -72,7 +74,8 @@ build:docs-latest:
       when: on_success
     - when: never
   extends:
-    - .ubuntu2004_doxygen
     - .build_docs
+    - .cmake_build_artifacts
+    - .ubuntu2004_doxygen
   variables:
     DOXYGEN_UPLOAD_REMOTE_PATH: "latest"