diff --git a/jenkins-scripts/dsl/_configs_/OSRFLinuxBackportPkg.groovy b/jenkins-scripts/dsl/_configs_/OSRFLinuxBackportPkg.groovy
index a49e44f67..077e57e56 100644
--- a/jenkins-scripts/dsl/_configs_/OSRFLinuxBackportPkg.groovy
+++ b/jenkins-scripts/dsl/_configs_/OSRFLinuxBackportPkg.groovy
@@ -40,6 +40,7 @@ class OSRFLinuxBackportPkg
 
       logRotator {
         artifactNumToKeep(20)
+        numToKeep(75)
       }
 
       parameters {
diff --git a/jenkins-scripts/dsl/brew_release.dsl b/jenkins-scripts/dsl/brew_release.dsl
index 938959645..704c28e08 100644
--- a/jenkins-scripts/dsl/brew_release.dsl
+++ b/jenkins-scripts/dsl/brew_release.dsl
@@ -145,6 +145,7 @@ bottle_job_builder.with
 
    logRotator {
      artifactNumToKeep(10)
+     numToKeep(75)
    }
 
    axes {
diff --git a/jenkins-scripts/dsl/debian.dsl b/jenkins-scripts/dsl/debian.dsl
index bd87834ab..55160bf25 100644
--- a/jenkins-scripts/dsl/debian.dsl
+++ b/jenkins-scripts/dsl/debian.dsl
@@ -105,6 +105,7 @@ ratt_pkg_job.with
 
   logRotator {
     artifactNumToKeep(10)
+    numToKeep(75)
   }
 
   concurrentBuild(true)
diff --git a/jenkins-scripts/dsl/dsl_checks.bash b/jenkins-scripts/dsl/dsl_checks.bash
index 876750389..6f6932610 100755
--- a/jenkins-scripts/dsl/dsl_checks.bash
+++ b/jenkins-scripts/dsl/dsl_checks.bash
@@ -63,8 +63,6 @@ if [[ -n ${empty_branches_on_github_triggered} ]]; then
   exit 1
 fi
 
-# re-enable after https://github.com/gazebo-tooling/release-tools/issues/1095
-
 # Filter out the previous auto jobs
 filtered_dir=$(mktemp -d)
 cp -- *-abichecker-*.xml "${filtered_dir}"
@@ -76,3 +74,10 @@ if [[ -n ${repeated} ]]; then
    echo "please exclude one of the versions in the yaml file to reduce the server workload"
    exit 1
 fi
+
+avoid_infinite_build_archive=$(grep '<numToKeep>-1</numToKeep>' -- *.xml || true)
+if [[ -n ${avoid_infinite_build_archive} ]]; then
+  echo "Found a job setup to keep infinite number of builds. This is BAD"
+  echo "${avoid_infinite_build_archive}"
+  exit 1
+fi
diff --git a/jenkins-scripts/dsl/extra.dsl b/jenkins-scripts/dsl/extra.dsl
index 59d6feeeb..3731dea48 100644
--- a/jenkins-scripts/dsl/extra.dsl
+++ b/jenkins-scripts/dsl/extra.dsl
@@ -79,6 +79,7 @@ gbp_repo_debbuilds.each { software ->
 
     logRotator {
       artifactNumToKeep(10)
+      numToKeep(75)
     }
 
     concurrentBuild(true)