diff --git a/jjb/pipeline/voltha-scale-measurements.groovy b/jjb/pipeline/voltha-scale-measurements.groovy
index 0c59b53..082703c 100644
--- a/jjb/pipeline/voltha-scale-measurements.groovy
+++ b/jjb/pipeline/voltha-scale-measurements.groovy
@@ -32,7 +32,11 @@
     stage('cleanup') {
       steps {
         sh '''
-          helm del --purge onos voltha openolt openonu bbsim radius
+          for hchart in \$(helm list -q | grep -E -v 'docker-registry|cord-kafka|etcd-operator');
+          do
+              echo "Purging chart: \${hchart}"
+              helm delete --purge "\${hchart}"
+          done
           bash /home/cord/voltha-scale/wait_for_pods.sh
           bash /home/cord/voltha-scale/stop_port_forward.sh
         '''
@@ -189,4 +193,4 @@
       '''
     }
   }
-}
\ No newline at end of file
+}