diff --git a/.ci/jobs/apm-beats-update.yml b/.ci/jobs/apm-beats-update.yml
index 95ee835fc50..f612aa5a665 100644
--- a/.ci/jobs/apm-beats-update.yml
+++ b/.ci/jobs/apm-beats-update.yml
@@ -44,7 +44,7 @@
                 regex: '8\.\d+'
                 case-sensitive: true
         - change-request:
-            ignore-target-only-changes: false
+            ignore-target-only-changes: true
         clean:
             after: true
             before: true
diff --git a/.ci/jobs/beats-windows-mbp.yml b/.ci/jobs/beats-windows-mbp.yml
index 6c02e059bca..256cde11f6e 100644
--- a/.ci/jobs/beats-windows-mbp.yml
+++ b/.ci/jobs/beats-windows-mbp.yml
@@ -1,7 +1,7 @@
 ---
 - job:
     name: Beats/beats-windows-mbp
-    display-name: Beats Pipeline for Windows 
+    display-name: Beats Pipeline for Windows
     description: Jenkins pipeline for the Beats project running on windows agents.
     view: Beats
     project-type: multibranch
@@ -11,7 +11,7 @@
           branch-discovery: no-pr
           discover-pr-forks-strategy: merge-current
           discover-pr-forks-trust: permission
-          discover-pr-origin: merge-current          
+          discover-pr-origin: merge-current
           discover-tags: false
           # Run MBP for the master branch and PRs
           head-filter-regex: '(master|PR-.*)'
@@ -27,10 +27,10 @@
                 ignore-tags-newer-than: -1
             - regular-branches: true
             - change-request:
-                ignore-target-only-changes: false
+                ignore-target-only-changes: true
           property-strategies:
             # Builds for PRs won't be triggered automatically.
-            # Only the master branch will be triggered automatically. 
+            # Only the master branch will be triggered automatically.
             named-branches:
               defaults:
                 - suppress-scm-triggering: true
diff --git a/.ci/jobs/beats.yml b/.ci/jobs/beats.yml
index 80dab0de54b..076a8a81bbe 100644
--- a/.ci/jobs/beats.yml
+++ b/.ci/jobs/beats.yml
@@ -34,7 +34,7 @@
             ignore-tags-older-than: -1
             ignore-tags-newer-than: -1
         - change-request:
-            ignore-target-only-changes: false
+            ignore-target-only-changes: true
         - named-branches:
             - exact-name:
                 name: 'master'
diff --git a/.ci/jobs/golang-crossbuild-mbp.yml b/.ci/jobs/golang-crossbuild-mbp.yml
index e66b6be82e1..46303790610 100644
--- a/.ci/jobs/golang-crossbuild-mbp.yml
+++ b/.ci/jobs/golang-crossbuild-mbp.yml
@@ -11,7 +11,7 @@
           branch-discovery: no-pr
           discover-pr-forks-strategy: merge-current
           discover-pr-forks-trust: permission
-          discover-pr-origin: merge-current          
+          discover-pr-origin: merge-current
           discover-tags: true
           notification-context: 'beats-ci'
           repo: golang-crossbuild
@@ -25,7 +25,7 @@
                 ignore-tags-newer-than: -1
             - regular-branches: true
             - change-request:
-                ignore-target-only-changes: false
+                ignore-target-only-changes: true
           clean:
             after: true
             before: true
diff --git a/.ci/jobs/packaging.yml b/.ci/jobs/packaging.yml
index cbd015ee045..cb2b41c9d69 100644
--- a/.ci/jobs/packaging.yml
+++ b/.ci/jobs/packaging.yml
@@ -23,7 +23,7 @@
             credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
           build-strategies:
           - tags:
-              ignore-tags-older-than: -1
+              ignore-tags-older-than: 30
               ignore-tags-newer-than: -1
           - named-branches:
               - exact-name:
@@ -36,7 +36,7 @@
                   regex: '8\.\d+'
                   case-sensitive: true
           - change-request:
-              ignore-target-only-changes: false
+              ignore-target-only-changes: true
           clean:
               after: true
               before: true