diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index cffaec6343..7255cbcadf 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -195,7 +195,14 @@ default:
 .base:
   image: "$CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24"
   rules:
-    - when: 'always'
+    # Always run for detached pipeleines
+    - if: '$CI_MERGE_REQUEST_ID'
+      when: 'always'
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      when: 'always'
+    - if: '$CI_COMMIT_BRANCH == "$GST_UPS_BRANCH"'
+      when: 'always'
+    - when: 'manual'
   variables:
     STORAGE_DRIVER: 'vfs'
     BUILDAH_FORMAT: 'docker'