diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6ab80ddc1..4cc07ce9a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -194,10 +194,8 @@ fdroid build:
 pages:
   image: registry.gitlab.com/fdroid/ci-images-client:latest
   only:
-    - triggers
-    - web
-  except:
-    - master@fdroid/fdroiddata
+    variables:
+      - $FROM_CI_MERGE_REQUEST_IID && $CI_PROJECT_PATH != "fdroid/fdroiddata" && $CI_COMMIT_BRANCH != "master"
   artifacts:
     paths:
       - metadata/