diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6cb5e22933f0d40cad27d9b2265cc4af363dbea4..2fd8a9cfcf456107de2db15ed2d513108f833c94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,15 +92,17 @@ build-testenv:
     - docker push $CI_REGISTRY_IMAGE
 
 # Build the sphinx documentation and make it ready for deployment by Gitlab Pages
-# documentation:
-#   stage: deploy
-
 # Special job for serving a static website. See https://docs.gitlab.com/ee/ci/yaml/README.html#pages
 pages:
   stage: deploy
   only:
-      # TODO this should be for master only, once releases are more regularly
-    - dev
+    refs:
+      - dev
+      - master
+      - /^release-.*$/i
+    variables:
+      # run pages only on gitlab.com
+      - $CI_SERVER_HOST == "gitlab.com"
   script:
     - echo "Deploying"
     - make doc