diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8b8a2d8383609d5b46b4f5bb029dbd4b5ac1c9a..5dc36fc1d3a3ad3ca3c8327db7e105448f9f89bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,10 @@ stages:
     # Once again to make the job fail if an error occurs.
     - ctest .
 
+    # Generate documentation.
+    - cd "$PROJECT_PATH_IN_WORKSPACE/build"
+    - make doc
+
 
 build-and-test-bionic:
   stage: build-and-test
@@ -73,23 +77,14 @@ build-and-test-bionic:
 
   image: git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-bionic
 
+  artifacts:
+    name: "Simox-Documentation-$CI_COMMIT_REF_NAME"
+    paths:
+      - build/doc/html/
+
 
 build-and-test-jammy:
   stage: build-and-test
   extends: .build-and-test
 
   image: git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-jammy
-
-
-generate-documentation:
-  stage: documentation
-  image: git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-bionic
-
-  script:
-    - cd build
-    - make doc
-
-  artifacts:
-    name: "Simox-Documentation-$CI_COMMIT_REF_NAME"
-    paths:
-      - build/doc/html/