diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f2ffae3..3109016c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,9 +17,9 @@ include:
   - local: .gitlab-ci/run_checks.yml
   - local: .gitlab-ci/build.yml
   - local: .gitlab-ci/test.yml
-  - local: .gitlab-ci/publish_docs.yml
-    rules:
-      - if: $CI_COMMIT_BRANCH == "main"
+  - component: "gitlab.gnome.org/GNOME/citemplates/basic-deploy-docs@master"
+    inputs:
+      docs-job-name: "build-docs"
   - local: .gitlab-ci/publish_nightly.yml
     rules:
       - if: $CI_COMMIT_BRANCH == "main"
diff --git a/.gitlab-ci/docs.yml b/.gitlab-ci/docs.yml
deleted file mode 100644
index 4b2b0bad..00000000
--- a/.gitlab-ci/docs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-.docs:
-  image: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master'
-  tags:
-    - flatpak
-  script:
-    - flatpak install --user --noninteractive org.freedesktop.Sdk.Extension.rust-nightly//24.08
-    # We want to use rust-nightly to build the app.
-    - sed -i 's|"org.freedesktop.Sdk.Extension.rust-stable"|"org.freedesktop.Sdk.Extension.rust-nightly"|g' ${MANIFEST_PATH}
-    - sed -i 's|/rust-stable/bin|/rust-nightly/extra/sdk/rust-nightly/bin|g' ${MANIFEST_PATH}
-    - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH}
-    - echo "ninja src/doc" | flatpak-builder --disable-rofiles-fuse --build-shell=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}
-    - mv .flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/src/doc ${DOCS_FOLDER}
-    - chmod -R a=rwx ${DOCS_FOLDER}
-  dependencies: []
-  artifacts:
-    paths:
-      - $DOCS_FOLDER
diff --git a/.gitlab-ci/publish_docs.yml b/.gitlab-ci/publish_docs.yml
deleted file mode 100644
index f3eb85fc..00000000
--- a/.gitlab-ci/publish_docs.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build and publish the docs
-
-include: '.gitlab-ci/docs.yml'
-
-pages:
-  extends:
-    - .docs
-  stage: deploy
-  variables:
-    DOCS_FOLDER: "public"
-  rules:
-    - changes:
-        - src/**/*
-        - Cargo.lock
-        - Cargo.toml
-      when: always
-    - when: manual
-      allow_failure: true
diff --git a/.gitlab-ci/test.yml b/.gitlab-ci/test.yml
index eceec91b..2f87447b 100644
--- a/.gitlab-ci/test.yml
+++ b/.gitlab-ci/test.yml
@@ -1,7 +1,5 @@
 # Tests after the app is built.
 
-include: '.gitlab-ci/docs.yml'
-
 # Validate the metainfo with Flathub's tool.
 lint-metainfo:
   stage: test
@@ -37,10 +35,19 @@ rust-tests:
 
 # Test that there are no errors in the docs.
 build-docs:
-  extends:
-    - .docs
   stage: test
-  variables:
-    DOCS_FOLDER: "doc"
-  rules:
-    - if: $CI_COMMIT_BRANCH != "main"
+  image: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master'
+  tags:
+    - flatpak
+  script:
+    - flatpak install --user --noninteractive org.freedesktop.Sdk.Extension.rust-nightly//24.08
+    # We want to use the nightly toolchain inside the build terminal.
+    - sed -i 's|"org.freedesktop.Sdk.Extension.rust-stable"|"org.freedesktop.Sdk.Extension.rust-nightly"|g' ${MANIFEST_PATH}
+    - sed -i 's|/rust-stable/bin|/rust-nightly/extra/sdk/rust-nightly/bin|g' ${MANIFEST_PATH}
+    - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH}
+    - echo "ninja src/doc" | flatpak-builder --disable-rofiles-fuse --build-shell=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}
+    - tar --auto-compress --create --file "${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-docs.tar.gz" --directory ".flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/src/doc" .
+  dependencies: []
+  artifacts:
+    paths:
+      - ${CI_PROJECT_NAME}-docs.tar.gz