diff --git a/.gitlab/ci/desktop-release.yml b/.gitlab/ci/desktop-release.yml
index 8704f3d..3119a27 100644
--- a/.gitlab/ci/desktop-release.yml
+++ b/.gitlab/ci/desktop-release.yml
@@ -3,7 +3,7 @@ desktop-build-windows:
   tags:
     - saas-windows-medium-amd64
   rules:
-    - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       changes:
         - Overlord-Desktop/package.json
         - Overlord-Desktop/bun.lock
@@ -59,7 +59,7 @@ desktop-release:
     - job: desktop-build-windows
       artifacts: true
   rules:
-    - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       changes:
         - Overlord-Desktop/package.json
         - Overlord-Desktop/bun.lock
diff --git a/.gitlab/ci/tests.yml b/.gitlab/ci/tests.yml
index 2886aa7..05627f1 100644
--- a/.gitlab/ci/tests.yml
+++ b/.gitlab/ci/tests.yml
@@ -1,5 +1,7 @@
 .server-test-rules:
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "web" && $RELEASE_VERSION != ""'
+      when: never
     - changes:
         - Overlord-Server/**/*
         - Overlord-Client/cmd/agent/wire/wire_contract_generated.go
@@ -10,6 +12,8 @@
 
 .client-test-rules:
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "web" && $RELEASE_VERSION != ""'
+      when: never
     - changes:
         - Overlord-Client/**/*
         - protocol/**/*