diff --git a/Jenkinsfile.new b/Jenkinsfile.new
index aee6a1d..0b2e6da 100644
--- a/Jenkinsfile.new
+++ b/Jenkinsfile.new
@@ -13,7 +13,6 @@
   limitations under the License.
 */
 
-def ciHelper
 def DEFAULT_MODULE_NAME = 'mon'
 
 pipeline {
@@ -126,17 +125,22 @@
       }
     }
 
-    stage('Unit Tests') {
+    stage('Tests') {
       steps {
         script {
-          if (!ciHelper) {
-            ciHelper = load 'devops/jenkins/ci-pipelines/ci_helper.groovy'
-          }
           def UID = sh(returnStdout: true, script: 'id -u').trim()
           def GID = sh(returnStdout: true, script: 'id -g').trim()
           def common = "-v ${env.WORKSPACE}:/tests -e UID=${UID} -e GID=${GID} " + (params.DOCKER_ARGS ?: '')
 
-          stage('Test') {
+          stage('Linting Tests') {
+            sh """
+              docker run --rm ${common} \
+                ${env.TEST_IMAGE} \
+                /tests/devops-stages/stage-lint.sh
+            """
+          }
+
+          stage('Unit Tests') {
             sh """
               docker run --rm ${common} \
                 ${env.TEST_IMAGE} \
@@ -253,9 +257,11 @@
     Promotion should be done in a separate downstream job after E2E success to avoid
     */
   }
+
   post {
     always {
-      cleanWs()
+      // cleanWs()
+      deleteDir()
     }
   }
 }