diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 424d0a2ec0..11d04acddd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -832,29 +832,10 @@ valgrind ges:
 
 # ---- Integration ----- #
 
-documentation:
+.documentation:
   image: $FEDORA_DOCS_IMAGE
   extends:
     - '.build_ccache_vars'
-  needs:
-    - "gst indent"
-  rules:
-    - changes:
-      - "*"
-      - subprojects/*.wrap
-      - subprojects/gst-docs/**/*
-      - subprojects/gst-devtools/**/*
-      - subprojects/gst-editing-services/**/*
-      - subprojects/gst-libav/**/*
-      - subprojects/gst-omx/**/*
-      - subprojects/gst-plugins-bad/**/*
-      - subprojects/gst-plugins-base/**/*
-      - subprojects/gst-plugins-good/**/*
-      - subprojects/gst-plugins-ugly/**/*
-      - subprojects/gstreamer/**/*
-      - subprojects/gstreamer-vaapi/**/*
-      - subprojects/gst-rtsp-server/**/*
-  stage: integrate
   variables:
     MESON_ARGS: *simple_build
     MESON_BUILDTYPE_ARGS: "-Ddoc=enabled"
@@ -869,10 +850,45 @@ documentation:
 
   artifacts:
     when: always
+    expire_in: "7 days"
     paths:
     - documentation/
     - plugins-cache-diffs/
 
+documentation:
+  stage: integrate
+  extends:
+    - '.documentation'
+  needs: []
+  rules:
+    - if: '$CI_PROJECT_NAMESPACE == "gstreamer" && $CI_COMMIT_BRANCH == "main"'
+
+build documentation:
+  extends:
+    - '.documentation'
+  stage: build
+  needs:
+    - "gst indent"
+
+  stage: build
+  rules:
+    - changes:
+      - .gitlab-ci.yml
+      - ci/gitlab/freedesktop_doc_importer.sh
+      - subprojects/*.wrap
+      - subprojects/gst-docs/**/*
+      - subprojects/gst-devtools/**/*
+      - subprojects/gst-editing-services/**/*
+      - subprojects/gst-libav/**/*
+      - subprojects/gst-omx/**/*
+      - subprojects/gst-plugins-bad/**/*
+      - subprojects/gst-plugins-base/**/*
+      - subprojects/gst-plugins-good/**/*
+      - subprojects/gst-plugins-ugly/**/*
+      - subprojects/gstreamer/**/*
+      - subprojects/gstreamer-vaapi/**/*
+      - subprojects/gst-rtsp-server/**/*
+
 # FIXME: Using trigger: causes permission issues, workaround using old REST API.
 # https://gitlab.com/gitlab-org/gitlab/-/issues/341737
 cerbero trigger:
diff --git a/ci/gitlab/freedesktop_doc_importer.sh b/ci/gitlab/freedesktop_doc_importer.sh
index be68222d0f..bbebaf5ee8 100755
--- a/ci/gitlab/freedesktop_doc_importer.sh
+++ b/ci/gitlab/freedesktop_doc_importer.sh
@@ -2,14 +2,14 @@
 
 set -e
 
-BRANCH=master
+BRANCH=main
 NAMESPACE=gstreamer
 JOB=documentation
 
-WORK_DIR=`mktemp -d -p "$DIR"`
+WORK_DIR=$(mktemp -d -p "$DIR")
 
 # deletes the temp directory
-function cleanup {
+cleanup() {
   rm -rf "$WORK_DIR"
   echo "Deleted temp working directory $WORK_DIR"
 }
@@ -19,12 +19,12 @@ trap cleanup EXIT
 
 echo ""
 echo "============================================================================================================================"
-echo "Updating documentation from: https://gitlab.freedesktop.org/$NAMESPACE/gst-docs/-/jobs/artifacts/$BRANCH/download?job=$JOB"
+echo "Updating documentation from: https://gitlab.freedesktop.org/$NAMESPACE/gstreamer/-/jobs/artifacts/$BRANCH/download?job=$JOB"
 
 date
 
 cd $WORK_DIR
-wget https://gitlab.freedesktop.org/$NAMESPACE/gst-docs/-/jobs/artifacts/$BRANCH/download?job=$JOB -O gstdocs.zip
+wget https://gitlab.freedesktop.org/$NAMESPACE/gstreamer/-/jobs/artifacts/$BRANCH/download?job=$JOB -O gstdocs.zip
 
 unzip gstdocs.zip
 
@@ -32,6 +32,5 @@ DOC_BASE="/srv/gstreamer.freedesktop.org/public_html/documentation"
 
 rsync -rvaz --links --delete documentation/ $DOC_BASE  || /bin/true
 chmod -R g+w $DOC_BASE; chgrp -R gstreamer $DOC_BASE
-
 echo "Done updating documentation"
 echo ""
\ No newline at end of file