diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index c9ad668..bf62a7f 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -43,22 +43,35 @@
             stage('Clean up') {
                 timeout(15) {
                     sh returnStdout: true, script: """
+                    echo "cleaning up"
                     export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                    for hchart in \$(helm list -q | grep -E -v 'docker-registry|mavenrepo|ponnet');
+                    HELM_MAJOR=\$(helm version --client --short | sed -E -e 's/^.*v([0-9]+)\\.[0-9]+\\.[0-9]+.*\$/\\1/')
+                    for hchart in \$(helm list -q | grep -E -v 'docker-registry|mavenrepo|ponnet|local-path-storage');
                     do
                         echo "Purging chart: \${hchart}"
-                        if [ "$HELM_MAJOR" -le 2 ]; then
+                        if [ \$HELM_MAJOR -le 2 ]; then
                             helm delete --purge "\${hchart}"
                         else
                             helm uninstall "\${hchart}"
                         fi
                     done
+                    if [ \$HELM_MAJOR -gt 2 ]; then
+                        for hchart in \$(helm list -q -n voltha | grep -E -v 'docker-registry|mavenrepo|ponnet|local-path-storage');
+                        do
+                            echo "Purging chart: \${hchart}"
+                            if [ \$HELM_MAJOR -le 2 ]; then
+                                helm delete --purge "\${hchart}"
+                            else
+                                helm uninstall -n voltha "\${hchart}"
+                            fi
+                        done
+                    fi
                     """
                     timeout(5) {
                         waitUntil {
                             helm_deleted = sh returnStdout: true, script: """
                             export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
-                            helm ls -q | grep -E -v 'docker-registry|mavenrepo|ponnet' | wc -l
+                            helm ls -q --all-namespaces | grep -E -v 'docker-registry|mavenrepo|ponnet|local-path-storage' | wc -l
                             """
                             return helm_deleted.toInteger() == 0
                         }
@@ -67,7 +80,7 @@
                         waitUntil {
                             kubectl_deleted = sh returnStdout: true, script: """
                             export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
-                            kubectl get pods --all-namespaces --no-headers | grep -E -v 'kube-system|docker-registry|mavenrepo|ponnet' | wc -l
+                            kubectl get pods --all-namespaces --no-headers | grep -E -v 'kube-system|docker-registry|mavenrepo|ponnet|local-path-storage' | wc -l
                             """
                             return kubectl_deleted.toInteger() == 0
                         }