diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index 93e55c3..546adb1 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -16,5 +16,5 @@
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.1
-appVersion: 2.1.1
+version: 3.0.0
+appVersion: 0.0.1
diff --git a/bbsim/templates/NOTES.txt b/bbsim/templates/NOTES.txt
index 1359652..700b9b7 100644
--- a/bbsim/templates/NOTES.txt
+++ b/bbsim/templates/NOTES.txt
@@ -1,5 +1,9 @@
 BBSim deployed with release name: {{ .Release.Name }}
 
-OLT ID: {{ .Values.olt_id }}, on TCP port: {{ .Values.olt_tcp_port }}
-# of PON Ports: {{ .Values.pon_ports }}
-ONUs per PON Port: {{ .Values.onus_per_pon_port }} (total: {{ mul .Values.pon_ports .Values.onus_per_pon_port}})
+OLT ID: {{ .Values.olt_id }}
+# of NNI Ports: {{ .Values.nni }}
+# of PON Ports: {{ .Values.pon }}
+# of ONU Ports: {{ .Values.onu }}
+Total ONUs: (total: {{ mul .Values.pon .Values.onu}})
+
+OLT is listening on: "bbsim:{{ .Values.olt_tcp_port }}"
diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 8156ed2..89c6118 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -45,14 +45,10 @@
             privileged: true
           command: [
             "/app/bbsim",
-            "-n", "{{ .Values.onus_per_pon_port }}",
-            "-m", "{{ .Values.emulation_mode }}",
-            "-H", ":{{ .Values.olt_tcp_port }}",
-            "-id", "{{ .Values.olt_id }}",
-            "-i", "{{ .Values.pon_ports }}",
-            "-aw", "{{ .Values.wpa_wait }}",
-            "-dw", "{{ .Values.dhcp_wait }}",
-            "-k", "{{ .Values.kafka_broker }}",
+            "-olt_id", "{{ .Values.olt_id }}",
+            "-nni", "{{ .Values.nni }}",
+            "-pon", "{{ .Values.pon }}",
+            "-onu", "{{ .Values.onu }}",
           ]
           ports:
             - name: "bbsim-olt-id-{{ .Values.olt_id }}"
diff --git a/bbsim/templates/service.yaml b/bbsim/templates/service.yaml
index d63c129..d82a397 100644
--- a/bbsim/templates/service.yaml
+++ b/bbsim/templates/service.yaml
@@ -29,6 +29,9 @@
     - name: "bbsim-olt-id-{{ .Values.olt_id }}"
       port: {{ .Values.olt_tcp_port }}
       protocol: TCP
+    - name: "bbsim-olt-id-{{ .Values.olt_id }}-api"
+      port: {{ .Values.bbsim_api_port }}
+      protocol: TCP
   selector:
     app: {{ template "bbsim.name" . }}
     release: {{ .Release.Name }}
diff --git a/bbsim/templates/tests/test-bbsim.yaml b/bbsim/templates/tests/test-bbsim.yaml
deleted file mode 100644
index 93d30d0..0000000
--- a/bbsim/templates/tests/test-bbsim.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ .Release.Name }}-api-test"
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  restartPolicy: Never
-  containers:
-    - name: {{ .Release.Name }}-api-test
-      image: {{ .Values.images.xos_api_tester.repository }}:{{ .Values.images.xos_api_tester.tag }}
-      imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
-      volumeMounts:
-        - name: log-volume
-          mountPath: /src/cord-api/Tests/Log/
-      env:
-        - name: SERVER_IP
-          value: 'xos-chameleon'
-        - name: SERVER_PORT
-          value: '9101'
-      command: ["robot", "-d", "Log", "-T", "-v", "number_of_onus:{{ .Values.onus_per_pon_port }}", "WorkflowValidations/BBSIM.robot"]
-  volumes:
-    - name: log-volume
-      hostPath:
-        path: /tmp/helm_test_bbsim_logs_{{ dateInZone "20060102T030405.00Z" (now) "UTC"  }}
-        type: DirectoryOrCreate
diff --git a/bbsim/values.yaml b/bbsim/values.yaml
index b99d139..5c0161c 100644
--- a/bbsim/values.yaml
+++ b/bbsim/values.yaml
@@ -16,39 +16,20 @@
 
 # CLI switches passed to bbsim
 
-# -id option
 olt_id: 0
+nni: 1
+pon: 1
+onu: 1
 
-# -H option, port number portion
+# TODO read this values in the config
 olt_tcp_port: 50060
-
-# -i option
-pon_ports: 1
-
-# -n option
-onus_per_pon_port: 16
-
-# -m option
-emulation_mode: 'both'
-
-# -a option
-wpa_wait: 10
-
-# -d option
-dhcp_wait: 10
-
-# -k option
-kafka_broker: 'cord-kafka.default.svc.cluster.local:9092'
+bbsim_api_port: 50070
 
 images:
   bbsim:
-    repository: 'voltha/voltha-bbsim'
+    repository: 'voltha/bbsim'
     tag: '{{ .Chart.AppVersion }}'
     pullPolicy: 'Always'
-  xos_api_tester:
-    repository: 'xosproject/xos-api-tester'
-    tag: 'master'
-    pullPolicy: 'Always'
 
 global:
   registry: ''
@@ -67,4 +48,4 @@
 
 tolerations: []
 
-affinity: {}
+affinity: {}
\ No newline at end of file