diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a845b746dbeaf718233b9eb6e03e315d277df34f..c7e2315c1feb955876e173b7d2288688527c8df4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,6 +70,9 @@ deploy preview:
   stage: deploy
   rules:
     - if: $CI_PROJECT_NAMESPACE == 'cmsgemonline/gem-ops' && $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: always
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: manual
   environment:
     name: preview-$CI_MERGE_REQUEST_IID
     url: https://cmsgemonline.web.cern.ch/doc/preview-$CI_MERGE_REQUEST_IID
@@ -83,7 +86,7 @@ deploy preview:stop:
   extends: .deploy eos:stop
   stage: deploy
   rules:
-    - if: $CI_PROJECT_NAMESPACE == 'cmsgemonline/gem-ops' && $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: manual
       allow_failure: true
   environment: