diff --git a/jobs/build/prepare-release/Jenkinsfile b/jobs/build/prepare-release/Jenkinsfile
index bc0cedc937..043c18f8f0 100644
--- a/jobs/build/prepare-release/Jenkinsfile
+++ b/jobs/build/prepare-release/Jenkinsfile
@@ -141,16 +141,10 @@ node {
         } finally {
             commonlib.safeArchiveArtifacts([
                 "artcd_working/email/**",
-                "artcd_working/doozer_working/*.log",
-                "artcd_working/doozer_working/*.yaml",
-                "artcd_working/doozer_working/*.yml"
-                "artcd_working/elliott_working/*.log",
-                "artcd_working/elliott_working/*.yaml",
-                "artcd_working/elliott_working/*.yml"
-                "artcd_working/*.json",
-                "artcd_working/*.log",
-                "artcd_working/*.yaml",
-                "artcd_working/*.yml",
+                "artcd_working/**/*.json",
+                "artcd_working/**/*.log",
+                "artcd_working/**/*.yaml",
+                "artcd_working/**/*.yml",
             ])
             buildlib.cleanWorkspace()
         }
diff --git a/jobs/build/tag-rpms/Jenkinsfile b/jobs/build/tag-rpms/Jenkinsfile
index a0af76f887..3c88911bee 100644
--- a/jobs/build/tag-rpms/Jenkinsfile
+++ b/jobs/build/tag-rpms/Jenkinsfile
@@ -83,9 +83,11 @@ node {
             throw err
         } finally {
             commonlib.safeArchiveArtifacts([
-                "artcd_working/doozer_working/*.log",
-                "artcd_working/doozer_working/*.yaml",
-                "artcd_working/doozer_working/*.yml"
+                "artcd_working/email/**",
+                "artcd_working/**/*.json",
+                "artcd_working/**/*.log",
+                "artcd_working/**/*.yaml",
+                "artcd_working/**/*.yml",
             ])
             buildlib.cleanWorkspace()
         }
diff --git a/pipeline-scripts/buildlib.groovy b/pipeline-scripts/buildlib.groovy
index 6d436cc8c0..57ebf0c00f 100644
--- a/pipeline-scripts/buildlib.groovy
+++ b/pipeline-scripts/buildlib.groovy
@@ -647,8 +647,8 @@ def watch_brew_task_and_retry(name, taskId, brewUrl) {
     }
 }
 
-def cleanWorkspace(cleanWhenFailure=true) {
-    cleanWs(cleanWhenFailure: cleanWhenFailure, notFailBuild: true)
+def cleanWorkspace() {
+    cleanWs(cleanWhenFailure: false, notFailBuild: true)
     dir("${workspace}@tmp") {
         deleteDir()
     }