diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index b697b73..c81b093 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -10,8 +10,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: 30
-          artifact-num-to-keep: 15
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
 
 - job-template:
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 48174ad..4956258 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -34,6 +34,10 @@
     build-days-to-keep: 60
     artifact-num-to-keep: 30
 
+    # How long to keep builds and artifacts for jobs that generate a lot of artifacts
+    big-build-days-to-keep: 5
+    big-artifact-num-to-keep: 5
+
     # list of artifacts to archive
     archive-artifacts: ''
 
diff --git a/jjb/siab.yaml b/jjb/siab.yaml
index 727a975..bbecf55 100644
--- a/jjb/siab.yaml
+++ b/jjb/siab.yaml
@@ -23,8 +23,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: 30
-          artifact-num-to-keep: 15
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -73,8 +73,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: 30
-          artifact-num-to-keep: 15
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -123,8 +123,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: 30
-          artifact-num-to-keep: 15
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -174,8 +174,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: 30
-          artifact-num-to-keep: 15
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -226,4 +226,3 @@
           branch-regexp: 'master'
           dependency-jobs: '{dependency-jobs}'
           file-include-regexp: '{siab-projects-regexp}'
-
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 0f2bfdd..7341754 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -159,8 +159,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
     wrappers:
       - lf-infra-wrappers:
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 7ac47c0..adf2758 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -538,8 +538,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: 30
-          artifact-num-to-keep: 15
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -638,8 +638,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
     wrappers:
       - lf-infra-wrappers:
@@ -728,8 +728,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
     wrappers:
       - lf-infra-wrappers:
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 2ce091d..7963155 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -134,8 +134,8 @@
 
     properties:
       - cord-infra-properties:
-          build-days-to-keep: 30
-          artifact-num-to-keep: 15
+          build-days-to-keep: '{big-build-days-to-keep}'
+          artifact-num-to-keep: '{big-artifact-num-to-keep}'
 
 # VOLTHA Build Jobs
 - job-template: