diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d06e7dcd..c0d562e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@ include:
 stages:
   - container_prep
   - build
+  - pages
 
 
 container_prep:
@@ -41,7 +42,7 @@ container_prep:
   - make install
   - cd ../../
   - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-  - export BUILD_ID="weston-$CI_JOB_NAME_$CI_COMMIT_SHA-$CI_JOB_ID"
+  - export BUILD_ID="weston-$CI_JOB_NAME"
   - export PREFIX="$(pwd)/prefix-$BUILD_ID"
   - export BUILDDIR="$(pwd)/build-$BUILD_ID"
   - mkdir "$BUILDDIR" "$PREFIX"
@@ -57,8 +58,22 @@ build-native-meson:
   - ninja test
   - ninja clean
   artifacts:
-    name: weston-$CI_COMMIT_SHA-$CI_JOB_ID
+    name: weston-$CI_COMMIT_SHA
     when: always
     paths:
     - build-*/meson-logs
     - prefix-*
+
+pages:
+  stage: pages
+  dependencies:
+    - build-native-meson
+  script:
+  - export PREFIX=$(pwd)/prefix-weston-build-native-meson
+  - mkdir public
+  - cp -R $PREFIX/share/weston-doc/* public/
+  artifacts:
+    paths:
+    - public
+  only:
+    - master