diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 6de376f..cf30ccf 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -50,6 +50,8 @@
             "-H", ":{{ .Values.olt_tcp_port }}",
             "-id", "{{ .Values.olt_id }}",
             "-i", "{{ .Values.pon_ports }}",
+            "-a", "{{ .Values.wpa_wait }}",
+            "-d", "{{ .Values.dhcp_wait }}",
           ]
           ports:
             - name: "bbsim-olt-id-{{ .Values.olt_id }}"
diff --git a/bbsim/values.yaml b/bbsim/values.yaml
index 9e31972..30c4652 100644
--- a/bbsim/values.yaml
+++ b/bbsim/values.yaml
@@ -26,11 +26,17 @@
 pon_ports: 1
 
 # -n option
-onus_per_pon_port: 1
+onus_per_pon_port: 16
 
 # -m option
 emulation_mode: 'both'
 
+# -a option
+wpa_wait: 60
+
+# -d option
+dhcp_wait: 120
+
 image:
   repository: 'voltha/voltha-bbsim'
   tag: '{{ .Chart.AppVersion }}'