diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 501c4c1ce32ce..f47cbaefa88c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1190,11 +1190,15 @@ workflow:
     when: never
   - <<: *if_auto_e2e
 
-.on_omnibus_change:
+.on_packaging_change:
   - !reference [.except_mergequeue] # The prerequisites are not run in the mergequeue pipeline so we need to skip this rule
   - changes:
       paths:
         - omnibus/**/*
+        - .gitlab-ci.yml
+        - .gitlab/package_build.yml
+        - release.json
+        - .gitlab/package_build/**/*
       compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
 
 .on_go-version_change:
diff --git a/.gitlab/binary_build/linux.yml b/.gitlab/binary_build/linux.yml
index 46e43c0ad0637..f51ca2fddd38e 100644
--- a/.gitlab/binary_build/linux.yml
+++ b/.gitlab/binary_build/linux.yml
@@ -48,7 +48,7 @@ build_dogstatsd-binary_x64:
 build_dogstatsd-binary_arm64:
   rules:
     - !reference [.on_all_builds_a7]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: binary_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
diff --git a/.gitlab/package_build/deb.yml b/.gitlab/package_build/deb.yml
index 7a018043f234a..91b9106983b59 100644
--- a/.gitlab/package_build/deb.yml
+++ b/.gitlab/package_build/deb.yml
@@ -109,7 +109,7 @@ agent_deb-arm64-a6:
   extends: .agent_build_common_deb
   rules:
     - !reference [.on_all_builds_a6]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
@@ -198,7 +198,7 @@ iot_agent_deb-arm64:
   extends: .iot_agent_build_common_deb
   rules:
     - !reference [.on_all_builds_a7]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
@@ -212,7 +212,7 @@ iot_agent_deb-armhf:
   extends: .iot_agent_build_common_deb
   rules:
     - !reference [.on_all_builds_a7]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_armhf$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
@@ -254,7 +254,7 @@ dogstatsd_deb-x64:
 dogstatsd_deb-arm64:
   rules:
     - !reference [.on_all_builds_a7]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
diff --git a/.gitlab/package_build/dmg.yml b/.gitlab/package_build/dmg.yml
index 1f3ea8257be36..47fa27b38bc6d 100644
--- a/.gitlab/package_build/dmg.yml
+++ b/.gitlab/package_build/dmg.yml
@@ -23,7 +23,9 @@
 agent_dmg-x64-a7:
   extends: .agent_build_common_dmg
   rules:
-    - !reference [.on_a7]
+    - !reference [.on_packaging_change]
+    - !reference [.on_main_or_release_branch]
+    - !reference [.on_all_builds]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
diff --git a/.gitlab/package_build/rpm.yml b/.gitlab/package_build/rpm.yml
index 68b787f853976..238886a80b33e 100644
--- a/.gitlab/package_build/rpm.yml
+++ b/.gitlab/package_build/rpm.yml
@@ -83,7 +83,7 @@ agent_rpm-arm64-a6:
   extends: .agent_build_common_rpm
   rules:
     - !reference [.on_all_builds_a6]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
@@ -108,7 +108,7 @@ agent_rpm-arm64-a7:
   extends: .agent_build_common_rpm
   rules:
     - !reference [.on_all_builds_a7]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
@@ -173,7 +173,7 @@ iot_agent_rpm-arm64:
   extends: .iot_agent_build_common_rpm
   rules:
     - !reference [.on_all_builds_a7]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
@@ -184,7 +184,7 @@ iot_agent_rpm-armhf:
   extends: .iot_agent_build_common_rpm
   rules:
     - !reference [.on_all_builds_a7]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_armhf$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
diff --git a/.gitlab/package_build/suse_rpm.yml b/.gitlab/package_build/suse_rpm.yml
index 164c79d1810ad..0ee52358c9830 100644
--- a/.gitlab/package_build/suse_rpm.yml
+++ b/.gitlab/package_build/suse_rpm.yml
@@ -87,7 +87,7 @@ agent_suse-arm64-a7:
   extends: .agent_build_common_suse_rpm
   rules:
     - !reference [.on_all_builds_a7]
-    - !reference [.on_omnibus_change]
+    - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: package_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES