diff --git a/.ci/gitlab/ci.yml b/.ci/gitlab/ci.yml
index 369280c26266a9e7d27d534eaaf879991184fcad..26ac9a05e3e81478a945c8e572c8af5ebdb5a2f3 100644
--- a/.ci/gitlab/ci.yml
+++ b/.ci/gitlab/ci.yml
@@ -892,8 +892,27 @@ check_wheel 3:
     image: pymor/deploy_checks:devpi_debian_bullseye
     script: devpi install pymor[full]
 
+docs build 3 6:
+    extends: .test_base
+    tags: [mike]
+    rules:
+        - if: $CI_PIPELINE_SOURCE == "schedule"
+          when: never
+        - when: on_success
+    services:
+        - name: zivgitlab.wwu.io/pymor/docker/pymor/pypi-mirror_stable_py3.6:f6acb8bdf750d965c15f7f90b01fac4b745b58bd
+          alias: pypi_mirror
+    image: zivgitlab.wwu.io/pymor/docker/pymor/jupyter_py3.6:f6acb8bdf750d965c15f7f90b01fac4b745b58bd
+    script:
+        - ${CI_PROJECT_DIR}/.ci/gitlab/test_docs.bash
+    stage: build
+    needs: ["ci setup"]
+    artifacts:
+        paths:
+            - docs/_build/html
+            - docs/error.log
 
-docs build:
+docs build 3 7:
     extends: .test_base
     tags: [mike]
     rules:
@@ -913,6 +932,27 @@ docs build:
             - docs/_build/html
             - docs/error.log
 
+docs build 3 8:
+    extends: .test_base
+    tags: [mike]
+    rules:
+        - if: $CI_PIPELINE_SOURCE == "schedule"
+          when: never
+        - when: on_success
+    services:
+        - name: zivgitlab.wwu.io/pymor/docker/pymor/pypi-mirror_stable_py3.8:f6acb8bdf750d965c15f7f90b01fac4b745b58bd
+          alias: pypi_mirror
+    image: zivgitlab.wwu.io/pymor/docker/pymor/jupyter_py3.8:f6acb8bdf750d965c15f7f90b01fac4b745b58bd
+    script:
+        - ${CI_PROJECT_DIR}/.ci/gitlab/test_docs.bash
+    stage: build
+    needs: ["ci setup"]
+    artifacts:
+        paths:
+            - docs/_build/html
+            - docs/error.log
+
+
 docs:
     extends: .test_base
     # makes sure this doesn't land on the test runner
@@ -921,8 +961,8 @@ docs:
     stage: deploy
     resource_group: docs_deploy
     dependencies:
-        - docs build
-    needs: ["docs build"]
+        - "docs build 3 7"
+    needs: ["docs build 3 7"]
     before_script:
         - apk --update add make python3 bash
         - pip3 install jinja2 pathlib
diff --git a/.ci/gitlab/template.ci.py b/.ci/gitlab/template.ci.py
index 589589aff62744b3e6922000a2aa7eceb53d276d..ad008c65447c1d9fc7a57d7024dd234648ceb779 100755
--- a/.ci/gitlab/template.ci.py
+++ b/.ci/gitlab/template.ci.py
@@ -366,7 +366,8 @@ check_wheel {{loop.index}}:
     script: devpi install pymor[full]
 {% endfor %}
 
-docs build:
+{%- for py in pythons %}
+docs build {{py[0]}} {{py[2]}}:
     extends: .test_base
     tags: [mike]
     rules:
@@ -374,9 +375,9 @@ docs build:
           when: never
         - when: on_success
     services:
-        - name: {{registry}}/pymor/pypi-mirror_stable_py3.7:{{pypi_mirror_tag}}
+        - name: {{registry}}/pymor/pypi-mirror_stable_py{{py}}:{{pypi_mirror_tag}}
           alias: pypi_mirror
-    image: {{registry}}/pymor/jupyter_py3.7:{{ci_image_tag}}
+    image: {{registry}}/pymor/jupyter_py{{py}}:{{ci_image_tag}}
     script:
         - ${CI_PROJECT_DIR}/.ci/gitlab/test_docs.bash
     stage: build
@@ -385,6 +386,7 @@ docs build:
         paths:
             - docs/_build/html
             - docs/error.log
+{% endfor %}
 
 docs:
     extends: .test_base
@@ -394,8 +396,8 @@ docs:
     stage: deploy
     resource_group: docs_deploy
     dependencies:
-        - docs build
-    needs: ["docs build"]
+        - "docs build 3 7"
+    needs: ["docs build 3 7"]
     before_script:
         - apk --update add make python3 bash
         - pip3 install jinja2 pathlib