diff --git a/voltha-adapter-simulated/Chart.yaml b/voltha-adapter-simulated/Chart.yaml
index 43340fd..ec49f83 100644
--- a/voltha-adapter-simulated/Chart.yaml
+++ b/voltha-adapter-simulated/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha Simulated Adaptyer based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.0
+version: 2.1.1
 appVersion: 2.1.1
diff --git a/voltha-adapter-simulated/templates/adapters-simulated.yaml b/voltha-adapter-simulated/templates/adapters-simulated.yaml
index 66a7922..4849648 100644
--- a/voltha-adapter-simulated/templates/adapters-simulated.yaml
+++ b/voltha-adapter-simulated/templates/adapters-simulated.yaml
@@ -50,7 +50,7 @@
             - "-kv_store_port={{ .Values.services.etcd.port }}"
             - "-core_topic=rwcore"
             - "-simulator_topic=simulated_olt"
-            - "-onu_number=4"
+            - "-onu_number={{ .Values.onus_per_pon_port }}"
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/voltha-adapter-simulated/values.yaml b/voltha-adapter-simulated/values.yaml
index 51741c9..8882f59 100644
--- a/voltha-adapter-simulated/values.yaml
+++ b/voltha-adapter-simulated/values.yaml
@@ -29,7 +29,7 @@
     cluster:
       service: voltha-kafka.voltha.svc.cluster.local
       port: 9092
-  
+
   # Define connectivity to etcd
   etcd:
     service: voltha-etcd-cluster-client.voltha.svc.cluster.local
@@ -39,7 +39,8 @@
 replicas:
   adapter_simulated_olt: 1
   adapter_simulated_onu: 1
-  onu: 1
+
+onus_per_pon_port: 4
 
 images:
   adapter_simulated_olt: