diff --git a/images/dovecot/.gitlab-ci.yaml b/images/dovecot/.gitlab-ci.yaml
index 4f53751bbac05a3136b866dd470a98ee9f5945da..3035ad642805d5bfe90003c7455e44179caed144 100644
--- a/images/dovecot/.gitlab-ci.yaml
+++ b/images/dovecot/.gitlab-ci.yaml
@@ -17,7 +17,9 @@ dovecot-container-build:
       .
     - podman push "quay.io/shivering-isles/dovecot:${release}"
   rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+      changes:
+        - images/dovecot/.release
 
 dovecot-container-build-dev:
   stage: build
@@ -38,4 +40,6 @@ dovecot-container-build-dev:
       .
     - podman push "quay.io/shivering-isles/dovecot:${CI_COMMIT_SHORT_SHA}"
   rules:
-    - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+      changes:
+        - images/dovecot/
diff --git a/images/postfix/.gitlab-ci.yaml b/images/postfix/.gitlab-ci.yaml
index 4704343b8c731d3a18404c60e65dc4ca839be7c1..19fa03737e0bebabfd42bbee7a7a5843c511a73d 100644
--- a/images/postfix/.gitlab-ci.yaml
+++ b/images/postfix/.gitlab-ci.yaml
@@ -17,7 +17,9 @@ postfix-container-build:
       .
     - podman push "quay.io/shivering-isles/postfix:${release}"
   rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+      changes:
+        - images/postfix/.release
 
 postfix-container-build-dev:
   stage: build
@@ -38,4 +40,6 @@ postfix-container-build-dev:
       .
     - podman push "quay.io/shivering-isles/postfix:${CI_COMMIT_SHORT_SHA}"
   rules:
-    - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+      changes:
+        - images/postfix/