diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c12efb36811e58940b8fdf351af7f72399bd49b3..c4034dd1d63b9fc8877a8d27d287301d1cbd78dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,10 +13,10 @@ danger-review:
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
   stage: build
   only:
-    - branches@gitlab-org/gitaly
+    - merge_requests
   except:
     - tags
-    - master
+    - branches
   script:
     - git version
     - danger
@@ -26,6 +26,10 @@ danger-review:
     key: gems-ruby-2.6
     paths:
       - ruby/vendor/bundle
+  only:
+    - merge_requests
+    - tags
+    - master
 
 .build_template: &build_definition
   <<: *ruby_definition
@@ -69,6 +73,10 @@ danger-review:
 
 .test_template: &test_definition
   <<: *go_test_definition
+  only:
+    - merge_requests
+    - tags
+    - master
   script:
     - go version
     - git version
@@ -128,7 +136,7 @@ race:
     - make race-go
 
 cover:
-  <<: *ruby_definition
+  <<: *go_test_definition
   stage: test
   script:
     - make cover