diff --git a/README.md b/README.md
index fe533f7..d5828c7 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,7 @@
   Reference - [kubectl](https://kubernetes.io/docs/reference/kubectl/kubectl/)
 
 * `voltctl` and `kubectl` must be properly configured on your system
-  prior to any test executions.  The `kind-voltha` environment will install
-  and configure these tools for you; see below.
+  prior to any test executions.
 
 Directory is structured as follows:
 
@@ -39,57 +38,14 @@
 
 ## Setting up a test environment
 
-An easy way to bring up VOLTHA + BBSim for testing is by using
-[kind-voltha](https://github.com/ciena/kind-voltha).  To set
+An easy way to bring up VOLTHA + BBSim for testing is by using the `helm-charts` as described in
+[voltha-helm-charts README](https://github.com/opencord/voltha-helm-charts/blob/master/README.md). To set
 up a minimal environment, first install [Docker](https://docs.docker.com/install/).
 
 > NOTE: Please make sure you are able to run the docker command (your user is
 > in the `docker` group)
 
-If you don't have a Kubernetes cluster, please use the following command to
-set up the cluster provided by [kind-voltha](https://github.com/ciena/kind-voltha)
-and install required tools.
-
-```bash
-git clone https://github.com/ciena/kind-voltha
-cd kind-voltha
-TYPE=minimal WITH_RADIUS=y WITH_BBSIM=y CONFIG_SADIS=y WITH_SIM_ADAPTERS=n ./voltha up
-source minimal-env.sh
-```
-
-If you prefer to use your own Kubernetes cluster, please read the document
-[kind-voltha configuration
-options](https://github.com/ciena/kind-voltha#voltha-up-configuration-options)
-first to see how to configure the `kind-voltha` installation behavior.
-
-> Recommended software versions
-- Helm: v2.14.3
-- Kubernetes: v1.15.5
-- KIND: v0.5.1
-
-You can skip the installation of Kubernetes cluster and Helm by setting
-environment variables.  For example, run the following command to install
-VOLTHA only in an existing cluster.
-
-```bash
-git clone https://github.com/ciena/kind-voltha
-cd kind-voltha
-TYPE=minimal WITH_RADIUS=y WITH_BBSIM=y CONFIG_SADIS=y WITH_SIM_ADAPTERS=n DEPLOY_K8S=n INSTALL_KUBECTL=n INSTALL_HELM=n ./voltha up
-source minimal-env.sh
-```
-
-The Helm values file `kind-voltha/minimal-values.yaml` determines which images will be deployed on the
-Kubernetes cluster.   The default is `master` images from [VOLTHA's Docker
-Hub repository](https://hub.docker.com/u/voltha/).  You can modify this file as needed, for
-example to deploy released images or private test images.
-
-### DT Workflow
-If you want to install voltha for the DT Workflow, add `WITH_RADIUS=n WITH_EAPOL=n WITH_DHCP=n WITH_IGMP=n CONFIG_SADIS=n` flags in the `./voltha up` command above.
-
-### Debug the kind-voltha installation
-
-If you meet any issues when you set up the VOLTHA testing environment by
-running `./voltha up`, you can see the installation logs from the file `kind-voltha/install-minimal.log`.
+Then you can follow all the instructions in the [voltha-helm-charts README](https://github.com/opencord/voltha-helm-charts/blob/master/README.md).
 
 ## Running the sanity tests
 
@@ -129,8 +85,7 @@
 * ROBOT_FILE: The test suite file in `tests/functional` that will be invoked by `robot`.
 
 * ROBOT_MISC_ARGS: Robot arguments passed directly to `robot`, for example to specify which test
-cases to run.  If you are running in a non-standard environment (e.g., not created by `kind-voltha`)
-you may need to override some default variable settings for your environment.
+cases to run. For some environments you may need to override some default variable settings for your environment.
 See [variables.robot](https://github.com/opencord/voltha-system-tests/blob/master/variables/variables.robot)
 for the list of defaults.
 
@@ -146,20 +101,12 @@
 ### Deploying POD
 
 Deploying POD can be either manual or automated using Jenkins job.
-You can install it manually by following these steps below.
+You can install it manually by following the steps in 
+[voltha-helm-charts README](https://github.com/opencord/voltha-helm-charts/blob/master/README.md)
 
-```bash
-git clone https://github.com/ciena/kind-voltha.git
-cd kind-voltha/
-EXTRA_HELM_FLAGS='-f <PATH_TO_YOUR_K8S_CONFIG_FILE>' WITH_RADIUS=yes WITH_TP=yes DEPLOY_K8S=no INSTALL_KUBECTL=no INSTALL_HELM=no ./voltha up
-```
-
-Note: replace `PATH_TO_YOUR_K8S_CONFIG_FILE` with your Kubernetes configuration
+Note: please add `-f PATH_TO_YOUR_K8S_CONFIG_FILE` to your helm commands with your Kubernetes configuration
 file. To create one please check this
 [example](https://github.com/opencord/pod-configs/blob/master/kubernetes-configs/voltha/flex-ocp-cord.yml).
-For more information on various environment variables with `./voltha up` please
-check the link
-[here](https://github.com/ciena/kind-voltha/blob/master/README.md)
 
 ### Dataplane test prerequisites
 
diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index a2ef6c0..73daf74 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
index 287f435..8514ec5 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 workflow: DT
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
index 3469558..56177a5 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 workflow: TT
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
index 4871656..efca8b8 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 72eba62..6241840 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index 353195d..9202b4a 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false
diff --git a/tests/data/bbsim-kind-8x8.yaml b/tests/data/bbsim-kind-8x8.yaml
index 16b059e..a44cc91 100755
--- a/tests/data/bbsim-kind-8x8.yaml
+++ b/tests/data/bbsim-kind-8x8.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index 5585438..ef35890 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 workflow: DT
diff --git a/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml
index cd77b89..cd5ac38 100755
--- a/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml
+++ b/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false
diff --git a/tests/data/bbsim-kind-multi-uni-tt.yaml b/tests/data/bbsim-kind-multi-uni-tt.yaml
index ec8efb1..58fac66 100755
--- a/tests/data/bbsim-kind-multi-uni-tt.yaml
+++ b/tests/data/bbsim-kind-multi-uni-tt.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 workflow: TT
diff --git a/tests/data/bbsim-kind-multi-uni.yaml b/tests/data/bbsim-kind-multi-uni.yaml
index c839f6f..b783644 100644
--- a/tests/data/bbsim-kind-multi-uni.yaml
+++ b/tests/data/bbsim-kind-multi-uni.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false
diff --git a/tests/data/bbsim-kind-tt.yaml b/tests/data/bbsim-kind-tt.yaml
index 19d000c..cb9201c 100755
--- a/tests/data/bbsim-kind-tt.yaml
+++ b/tests/data/bbsim-kind-tt.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 workflow: TT
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index b617e85..f9ca52a 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false
diff --git a/tests/data/dmi-components-bbsim.yaml b/tests/data/dmi-components-bbsim.yaml
index 9900b06..a306b30 100755
--- a/tests/data/dmi-components-bbsim.yaml
+++ b/tests/data/dmi-components-bbsim.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # connection parameter needed for device manager interface tests
 GIVEN_DM_IP: 127.0.0.1
diff --git a/tests/data/multiple-bbsim-kind.yaml b/tests/data/multiple-bbsim-kind.yaml
index 018eba7..e3c0dcf 100755
--- a/tests/data/multiple-bbsim-kind.yaml
+++ b/tests/data/multiple-bbsim-kind.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false
diff --git a/tests/data/pm-data.yaml b/tests/data/pm-data.yaml
index e62789b..0509910 100755
--- a/tests/data/pm-data.yaml
+++ b/tests/data/pm-data.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Pm user validation and precondition data for validation of received
 # pm-data elements from open-onu-go-adapter.
diff --git a/tests/data/software-upgrade.yaml b/tests/data/software-upgrade.yaml
index 9ba0f8b..080a0aa 100644
--- a/tests/data/software-upgrade.yaml
+++ b/tests/data/software-upgrade.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for kind-voltha running BBSim
+# Automated deployment configuration for systems running BBSim
 
 # Change default values in tests
 has_dataplane: false