diff --git a/.gitignore b/.gitignore
index e941ef0..fd2c35e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,3 @@
 minimal-env.sh
 full-env.sh
 .DS_Store
-kube-config-*
diff --git a/full-values.yaml b/full-values.yaml
index 53a657e..253c7b9 100644
--- a/full-values.yaml
+++ b/full-values.yaml
@@ -23,32 +23,33 @@
 # this block and replace "<VALUE>" with "voltha-2.1".
 defaults:
   image_tag: master
-  image_pullPolicy: Always
 
 private_etcd_cluster: false
 private_kafka_cluster: false
 
-# OPENONU-ADAPTER IMPLEMENTATION
-# ------------------------------
-# There are currently two implementations of OPENONU-ADAPTER: the original
-# written in Python and the reimplementation written in Go. The variable
-# `use_openonu_adapter_go` can be used to optionally use the new Go
-# implementation. This is done by setting that value to `true`.
+# OFAGENT IMPLEMENTATION
+# ----------------------
+# There are currently two implementations of OFAGENT: the original written in
+# Python and the reimplementation written in Go. The variable `use_ofagent_go`
+# can be used to optionally select the implementation. The Go version is the
+# version to be part of the official release and is the default. The Python
+# verison has been deprecated and is no longer being actively workes, but is
+# being left as an option for this release.
 #
 # Along with this change you will also may need to set the Docker image
-# information below (search for START_OPENONU_ADAPTER_GO).
-use_openonu_adapter_go: false
+# information below (search for START_OFAGENT_GO).
+use_ofagent_go: true
 
-#images:
-#  onos:
-#    repository: voltha/voltha-onos
+images:
+  onos:
+    repository: voltha/voltha-onos
     # IMAGE_SELECTION
     # ---------------
     # The helm chart used to deploy ONOS is the public ONOS helm chart so,
     # there is a need to specify the exact image repository and image tag.
     # If you would like to use the "master", "voltha-2.1", or other image
     # just replace the "tag" value below.
-    #    tag: master
+    tag: master
 
 # IMAGE_SELECTION
 # ---------------
@@ -71,18 +72,18 @@
 #  bbsim:
 #    repository: voltha/bbsim
 #    tag: master
+# START_OFAGENT_GO - Comment the following block to use the
+# Python implementation of the ofagent
 #  ofagent:
 #    repository: voltha/voltha-ofagent-go
 #    tag: master
+# END_OFAGENT_GO
+#  ofagent:
+#    repository: voltha/voltha-ofagent-py
+#    tag: 2.1.1
 #  rw_core:
 #    repository: voltha/voltha-rw-core
 #    tag: 2.1.1
-# START_OPENONU_ADAPTER_GO - Uncomment the following block to use the
-# Go implementation of the openonu-adapter
-#  adapter_open_onu_go:
-#    repository: voltha-openonu-adapter-go
-#    tag: master
-# END_OPENONU_ADAPTER_GO
 
 etcd:
   replicas: 3
@@ -134,35 +135,27 @@
 # open-onu:
 #   fullNameOverride: voltha-adapter-openonu
 
-onos:
-  image:
-    repository: voltha/voltha-onos
-    tag: master
-    pullPolicy: Always
-  onos_env:
-    - name: POD_IP
-      valueFrom:
-      fieldRef:
-        fieldPath: status.podIP
-    - name: NAMESPACE
-      valueFrom:
-      fieldRef:
-        fieldPath: metadata.namespace
-    - name: ONOS_APPS
-      value: "drivers,openflow-base,hostprovider"
-  # No persistent volume in Atomix to have clean state for each re-deploy of ONOS
-  atomix:
-    persistence:
-      enabled: false
+onos_env:
+  - name: POD_IP
+    valueFrom:
+    fieldRef:
+      fieldPath: status.podIP
+  - name: NAMESPACE
+    valueFrom:
+    fieldRef:
+      fieldPath: metadata.namespace
+  - name: ONOS_APPS
+    value: "drivers,openflow-base,hostprovider"
+
+# No persistent volume in Atomix to have clean state for each re-deploy of ONOS
+atomix:
+  persistence:
+    enabled: false
 
 # Customization for BBSIM
-bbsim:
-  nni: 1
-  pon: 1
-  onu: 1
-  sadisFormat: "att"
-  kafkaEventTopic: "bbsim"
-  enableEvents: false
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon: 1
+onu: 1
 
 # SHOCK THE MONKEY OR LET LOSE THE DOGS OF WAR
 # The VOLTHA charts have support for adding extra labels to deployments and
diff --git a/minimal-values.yaml b/minimal-values.yaml
index b7adf13..b9d16c6 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -39,16 +39,16 @@
 # information below (search for START_OPENONU_ADAPTER_GO).
 use_openonu_adapter_go: false
 
-#images:
-#  onos:
-#    repository: voltha/voltha-onos
+images:
+  onos:
+    repository: voltha/voltha-onos
     # IMAGE_SELECTION
     # ---------------
     # The helm chart used to deploy ONOS is the public ONOS helm chart so,
     # there is a need to specify the exact image repository and image tag.
     # If you would like to use the "master", "voltha-2.1", or other image
     # just replace the "tag" value below.
-    #    tag: master
+    tag: master
 
 # IMAGE_SELECTION
 # ---------------
@@ -134,35 +134,27 @@
 # open-onu:
 #   fullNameOverride: voltha-adapter-openonu
 
-onos:
-  image:
-    repository: voltha/voltha-onos
-    tag: master
-    pullPolicy: Always
-  onos_env:
-    - name: POD_IP
-      valueFrom:
-      fieldRef:
-        fieldPath: status.podIP
-    - name: NAMESPACE
-      valueFrom:
-      fieldRef:
-        fieldPath: metadata.namespace
-    - name: ONOS_APPS
-      value: "drivers,openflow-base,hostprovider"
-  # No persistent volume in Atomix to have clean state for each re-deploy of ONOS
-  atomix:
-    persistence:
-      enabled: false
+onos_env:
+  - name: POD_IP
+    valueFrom:
+    fieldRef:
+      fieldPath: status.podIP
+  - name: NAMESPACE
+    valueFrom:
+    fieldRef:
+      fieldPath: metadata.namespace
+  - name: ONOS_APPS
+    value: "drivers,openflow-base,hostprovider"
+
+# No persistent volume in Atomix to have clean state for each re-deploy of ONOS
+atomix:
+  persistence:
+    enabled: false
 
 # Customization for BBSIM
-bbsim:
-  nni: 1
-  pon: 1
-  onu: 1
-  sadisFormat: "att"
-  kafkaEventTopic: "bbsim"
-  enableEvents: false
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon: 1
+onu: 1
 
 # SHOCK THE MONKEY OR LET LOSE THE DOGS OF WAR
 # The VOLTHA charts have support for adding extra labels to deployments and
diff --git a/scripts/ced b/scripts/ced
index e1e1527..1d85473 100755
--- a/scripts/ced
+++ b/scripts/ced
@@ -1,12 +1,4 @@
 #!/usr/bin/env bash
-REQ=$(test $# -gt 0 && echo $1 || echo 0)
-IDX=$((REQ + 1))
 set -x
-BBSIM=$(kubectl get --all-namespaces -l app=bbsim svc -o json | jq -r '.items[] | .metadata.name + "." + .metadata.namespace + ".svc:50060"' | sed "$IDX!d")
-set +x
-if [[ -z "$BBSIM" ]]; then
-    >&2 echo "ERROR: No BBSIM instance found as index '$REQ'"
-    exit 1
-fi
-set -x
+BBSIM=$(kubectl get --all-namespaces -l app=bbsim svc -o json | jq -r '.items[] | .metadata.name + "." + .metadata.namespace + ".svc:50060"' | head -1)
 exec voltctl device enable "$(voltctl device create -t openolt -H "$BBSIM")"
diff --git a/scripts/monitor.sh b/scripts/monitor.sh
index b5952a2..4621941 100755
--- a/scripts/monitor.sh
+++ b/scripts/monitor.sh
@@ -67,7 +67,7 @@
 echo
 kubectl get --all-namespaces pods,svc,configmap | grep -v kube-system | cut -c -$__COLS
 echo
-kubectl  describe --all-namespaces  pods | grep Image: | grep '\(voltha\|bbsim\)' | sed -e "s/^ *//g" -e "s/: */: /g" | sort -u | cut -c -$__COLS
+kubectl  describe --all-namespaces  pods | grep Image: | grep '\(voltha\|bbsim\)' | sed -e "s/^ *//g" -e "s/: */: /g" | sort -u | cut -c -$COLS
 echo
 echo "DB SIZE: $("$SCRIPTPATH/etcd-db-size.sh")"
 echo
diff --git a/voltha b/voltha
index 6acc1f9..e41d5d8 100755
--- a/voltha
+++ b/voltha
@@ -1631,7 +1631,7 @@
         bspin "Verify ONOS LEGACY installed $BIRD"
         if [ "$HELM_USE_UPGRADE" == "yes" ] || [ "$(helm list --deployed --short --namespace "$INFRA_NS" "^onos\$" | wc -l)" -ne 1 ]; then
             espin "$NOT_VERIFIED"
-            INTERNAL_EXTRA_HELM_INSTALL_ARGS="$SET_TAG $EXTRA_HELM_FLAGS" helm_install - "$INFRA_NS" onos "$ONOS_CHART" "$ONOS_CHART_VERSION" "+onos" "$_HELM_DESC ONOS LEGACY"
+            INTERNAL_EXTRA_HELM_INSTALL_ARGS="$SET_TAG $EXTRA_HELM_FLAGS" helm_install - "$INFRA_NS" onos "$ONOS_CHART" "$ONOS_CHART_VERSION" - "$_HELM_DESC ONOS LEGACY"
             INTERNAL_EXTRA_HELM_INSTALL_ARGS=
         else
             espin "$VERIFIED"
@@ -2105,17 +2105,7 @@
             else
                 INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set dhcp=false"
             fi
-            if is_in "$WITH_KAFKA" "yes,external"; then
-                _HOST=kafka.$INFRA_NS.svc
-                _PORT=9092
-                INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set kafkaAddress=$_HOST:$_PORT"
-            elif [ "$WITH_KAFKA" != "no" ]; then
-                _HOST="$(echo "$WITH_KAFKA" | cut -d: -f1)"
-                _PORT="$(echo "$WITH_KAFKA" | cut -s -d: -f2)"
-                _PORT=${_PORT:-9092}
-                INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set kafkaAddress=$_HOST:$_PORT"
-            fi
-            helm_install - "$BBSIM_NS" "bbsim${instance_num}" "$VOLTHA_BBSIM_CHART" "$VOLTHA_BBSIM_CHART_VERSION" "+bbsim" "$_HELM_DESC BBSIM${instance_num}"
+            helm_install - "$BBSIM_NS" "bbsim${instance_num}" "$VOLTHA_BBSIM_CHART" "$VOLTHA_BBSIM_CHART_VERSION" - "$_HELM_DESC BBSIM${instance_num}"
             INTERNAL_EXTRA_HELM_INSTALL_ARGS=
         else
             espin - "$VERIFIED"