INFRA-16749, INFRA-16768
 - Followup
diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index a4a39d9..38f031d 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -145,6 +145,8 @@
             checkout scm
           }
         } catch (Throwable e) {
+          // First step to keep the workspace clean and safe disk space
+          cleanWs()
           if (!taskContext.failFast) {
             throw e
           } else if (taskContext.failingFast == null) {
diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy
index 32e26b9..77294d9 100644
--- a/vars/asfMavenTlpStdBuild.groovy
+++ b/vars/asfMavenTlpStdBuild.groovy
@@ -81,6 +81,8 @@
                   checkout scm
                 }
               } catch (Throwable e) {
+                // First step to keep the workspace clean and safe disk space
+                cleanWs()
                 if (!failFast) {
                   throw e
                 } else if (failingFast == null) {