diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fb6ddc0..b3d2adcd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1413,15 +1413,12 @@ build rpm:
 wayland-web:
   stage: deploy
   trigger: wayland/wayland.freedesktop.org
-  except:
-    refs:
-      - schedules
   variables:
     MESON_ARGS: '-Ddocumentation=true -Ddebug-gui=false -Dlibwacom=false -Dtests=false'
     MESON_BUILDDIR: 'builddir'
-  only:
-    refs:
-      - main
-    variables:
-      - $GITLAB_USER_LOGIN != "marge-bot"
-      - $CI_PROJECT_PATH == "libinput/libinput"
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: never
+    - if: '$CI_COMMIT_BRANCH == "main" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO'
+      when: on_success
+    - when: never
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 007bc1c6..50752081 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -813,15 +813,12 @@ build rpm:
 wayland-web:
   stage: deploy
   trigger: wayland/wayland.freedesktop.org
-  except:
-    refs:
-      - schedules
   variables:
     MESON_ARGS: '-Ddocumentation=true -Ddebug-gui=false -Dlibwacom=false -Dtests=false'
     MESON_BUILDDIR: 'builddir'
-  only:
-    refs:
-      - main
-    variables:
-      - $GITLAB_USER_LOGIN != "marge-bot"
-      - $CI_PROJECT_PATH == "libinput/libinput"
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: never
+    - if: '$CI_COMMIT_BRANCH == "main" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO'
+      when: on_success
+    - when: never