diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index 9b2d34e..2ac0c83 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: 3.0.15
-appVersion: 0.0.16
+version: 3.0.16
+appVersion: 0.0.18
diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 8c6898d..02434d5 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -57,7 +57,14 @@
             {{ end -}}
             "-c_tag", "{{ .Values.c_tag }}",
             "-s_tag", "{{ .Values.s_tag }}",
-            "-delay", "{{ .Values.delay }}"
+            "-delay", "{{ .Values.delay }}",
+            {{ if .Values.enableEvents -}}
+            "-enableEvents",
+            "-kafkaAddress", "{{ .Values.kafkaAddress }}",
+            {{ end -}}
+            {{ if .Values.enablePerf -}}
+            "-enableperf"
+            {{ end -}}
           ]
           ports:
             - name: "bbsim-{{ .Values.olt_id }}"
diff --git a/bbsim/values.yaml b/bbsim/values.yaml
index 9136b44..bbd5afd 100644
--- a/bbsim/values.yaml
+++ b/bbsim/values.yaml
@@ -30,6 +30,9 @@
 olt_tcp_port: 50060
 bbsim_api_port: 50070
 bbsim_sadis_port: 50074
+enablePerf: false
+enableEvents: false
+kafkaAddress: ":9092"
 
 images:
   bbsim: