diff --git a/Jenkinsfile-attworkflow b/Jenkinsfile-attworkflow
index d40026b..5731fcb 100644
--- a/Jenkinsfile-attworkflow
+++ b/Jenkinsfile-attworkflow
@@ -26,7 +26,7 @@
                     rm -rf helm-charts cord-tester
                     git clone -b ${branch} ${cordRepoUrl}/helm-charts
                     export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                    for hchart in \$(helm list -q);
+                    for hchart in \$(helm list -q | grep -E -v 'docker-registry|mavenrepo|ponnet');
                     do
                         echo "Purging chart: \${hchart}"
                         helm delete --purge "\${hchart}"
@@ -111,7 +111,7 @@
                     timeout(10) {
                         sh returnStdout: true, script: """
                         export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                        helm install -n onos -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml -f configs/onos.yaml onos
+                        helm install -n onos -f configs/onos.yaml -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml onos
                         """
                     }
                     timeout(10) {
diff --git a/Jenkinsfile-rcordlite-topdown b/Jenkinsfile-rcordlite-topdown
index e1cba21..7c87aba 100644
--- a/Jenkinsfile-rcordlite-topdown
+++ b/Jenkinsfile-rcordlite-topdown
@@ -26,7 +26,7 @@
                     rm -rf helm-charts cord-tester
                     git clone -b ${branch} ${cordRepoUrl}/helm-charts
                     export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                    for hchart in \$(helm list -q);
+                    for hchart in \$(helm list -q | grep -E -v 'docker-registry|mavenrepo|ponnet');
                     do
                         echo "Purging chart: \${hchart}"
                         helm delete --purge "\${hchart}"
@@ -90,37 +90,20 @@
                         }
                     }
                 }
-                stage('Install ONOS-Voltha') {
+                stage('Install ONOS') {
                     timeout(10) {
                         sh returnStdout: true, script: """
                         export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                        helm install -n onos-voltha -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml -f configs/onos-voltha.yaml onos
+                        helm install -n onos -f configs/onos.yaml -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml onos
                         """
                     }
                     timeout(10) {
                         waitUntil {
-                            onos_voltha_completed = sh returnStdout: true, script: """
+                            onos_completed = sh returnStdout: true, script: """
                             export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
-                            kubectl get pods -n voltha | grep -i onos-voltha | grep -i running | grep 1/1 | wc -l
+                            kubectl get pods | grep -i onos | grep -i running | grep 1/1 | wc -l
                             """
-                            return onos_voltha_completed.toInteger() == 1
-                        }
-                    }
-                }
-                stage('Install ONOS-Fabric') {
-                    timeout(10) {
-                        sh returnStdout: true, script: """
-                        export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                        helm install -n onos-fabric -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml -f configs/onos-fabric.yaml onos
-                        """
-                    }
-                    timeout(10) {
-                        waitUntil {
-                            onos_fabric_completed = sh returnStdout: true, script: """
-                            export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
-                            kubectl get pods | grep -i onos-fabric | grep -i running | grep 1/1 | wc -l
-                            """
-                            return onos_fabric_completed.toInteger() == 1
+                            return onos_completed.toInteger() == 1
                         }
                     }
                 }
diff --git a/Jenkinsfile-rcordlite-zerotouch b/Jenkinsfile-rcordlite-zerotouch
index ac2eec2..c0243d6 100644
--- a/Jenkinsfile-rcordlite-zerotouch
+++ b/Jenkinsfile-rcordlite-zerotouch
@@ -26,7 +26,7 @@
                     rm -rf helm-charts cord-tester
                     git clone -b ${branch} ${cordRepoUrl}/helm-charts
                     export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                    for hchart in \$(helm list -q);
+                    for hchart in \$(helm list -q | grep -E -v 'docker-registry|mavenrepo|ponnet');
                     do
                         echo "Purging chart: \${hchart}"
                         helm delete --purge "\${hchart}"
@@ -107,37 +107,20 @@
                         }
                     }
                 }
-                stage('Install ONOS-Voltha') {
+                stage('Install ONOS') {
                     timeout(10) {
                         sh returnStdout: true, script: """
                         export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                        helm install -n onos-voltha -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml -f configs/onos-voltha.yaml onos
+                        helm install -n onos -f configs/onos.yaml -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml onos
                         """
                     }
                     timeout(10) {
                         waitUntil {
-                            onos_voltha_completed = sh returnStdout: true, script: """
+                            onos_completed = sh returnStdout: true, script: """
                             export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
-                            kubectl get pods -n voltha | grep -i onos-voltha | grep -i running | grep 1/1 | wc -l
+                            kubectl get pods | grep -i onos | grep -i running | grep 1/1 | wc -l
                             """
-                            return onos_voltha_completed.toInteger() == 1
-                        }
-                    }
-                }
-                stage('Install ONOS-Fabric') {
-                    timeout(10) {
-                        sh returnStdout: true, script: """
-                        export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                        helm install -n onos-fabric -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml -f configs/onos-fabric.yaml onos
-                        """
-                    }
-                    timeout(10) {
-                        waitUntil {
-                            onos_fabric_completed = sh returnStdout: true, script: """
-                            export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
-                            kubectl get pods | grep -i onos-fabric | grep -i running | grep 1/1 | wc -l
-                            """
-                            return onos_fabric_completed.toInteger() == 1
+                            return onos_completed.toInteger() == 1
                         }
                     }
                 }