diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 975f37b1c7c0210904a8a9c63153c22e9cce7da4..cae86fa0c829b7b5ac8d496bc4d165fed2179aa6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,9 @@ cleanup_tests:
 
 build:
   stage: build
-  when: manual
+  only:
+    - master
+    - tags
   tags:
     - bots-deployer
   script:
@@ -54,6 +56,7 @@ deploy:
   only:
     - master
     - tags
+  when: manual
   environment:
     name: production
     url: https://${BOT_HOST}/