diff --git a/voltha-adapter-simulated/Chart.yaml b/voltha-adapter-simulated/Chart.yaml
index 06213b7..52cf8cb 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.0.0
+version: 2.0.1
 appVersion: 2.0.0
diff --git a/voltha-adapter-simulated/templates/adapters-simulated.yaml b/voltha-adapter-simulated/templates/adapters-simulated.yaml
index 0721b88..66ebfaa 100644
--- a/voltha-adapter-simulated/templates/adapters-simulated.yaml
+++ b/voltha-adapter-simulated/templates/adapters-simulated.yaml
@@ -13,17 +13,6 @@
 # limitations under the License.
 
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  name: adapter-simulated-olt
-  namespace: {{ .Release.Namespace }}
-spec:
-  clusterIP: None
-  selector:
-    app: adapter-simulated-olt
-
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -43,45 +32,19 @@
     spec:
       containers:
         - name: adapter-simulated-olt
-          image: {{ .Values.registry }}{{ .Values.images.adapter_simulated_olt.repository }}:{{ tpl .Values.images.adapter_simulated_olt.tag . }}
-          imagePullPolicy: {{ .Values.images.adapter_simulated_olt.pullPolicy }}
-          env:
-            - name: NAMESPACE
-              value: {{ quote .Release.Namespace }}
-            - name: ETCD_SERVICE
-              value: "{{ .Values.services.etcd.service }}"
-            - name: ETCD_SERVICE_PORT
-              value: "{{ .Values.services.etcd.port }}"
-            - name: ADAPTER_KAFKA_SERVICE
-              value: "{{ .Values.services.kafka.adapter.service }}"
-            - name: ADAPTER_KAFKA_SERVICE_PORT
-              value: "{{ .Values.services.kafka.adapter.port }}"
-            - name: CLUSTER_KAFKA_SERVICE
-              value: "{{ .Values.services.kafka.cluster.service }}"
-            - name: CLUSTER_KAFKA_SERVICE_PORT
-              value: "{{ .Values.services.kafka.cluster.port }}"
+          image: {{ tpl .Values.images.adapter_simulated_olt.registry . }}{{ tpl .Values.images.adapter_simulated_olt.repository . }}:{{ tpl .Values.images.adapter_simulated_olt.tag . }}
+          imagePullPolicy: {{ tpl .Values.images.adapter_simulated_olt.pullPolicy . }}
           args:
             - "/app/simulated_olt"
-            - "-kafka_adapter_host=$(ADAPTER_KAFKA_SERVICE)"
-            - "-kafka_adapter_port=$(ADAPTER_KAFKA_SERVICE_PORT)"
-            - "-kafka_cluster_host=$(CLUSTER_KAFKA_SERVICE)"
-            - "-kafka_cluster_port=$(CLUSTER_KAFKA_SERVICE_PORT)"
+            - "-kafka_adapter_host={{ .Values.services.kafka.adapter.service }}"
+            - "-kafka_adapter_port={{ .Values.services.kafka.adapter.port }}"
+            - "-kafka_cluster_host={{ .Values.services.kafka.cluster.service }}"
+            - "-kafka_cluster_port={{ .Values.services.kafka.cluster.port }}"
+            - "-kv_store_host={{ .Values.services.etcd.service }}"
+            - "-kv_store_port={{ .Values.services.etcd.port }}"
             - "-core_topic=rwcore"
             - "-simulator_topic=simulated_olt"
-            - "-kv_store_host=$(ETCD_SERVICE)"
-            - "-kv_store_port=$(ETCD_SERVICE_PORT)"
-            - "-onu_number=100"
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: adapter-simulated-onu
-  namespace: {{ .Release.Namespace }}
-spec:
-  clusterIP: None
-  selector:
-    app: adapter-simulated-onu
-
+            - "-onu_number=4"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -102,30 +65,15 @@
     spec:
       containers:
         - name: adapter-simulated-onu
-          image: {{ .Values.registry }}{{ .Values.images.adapter_simulated_onu.repository }}:{{ tpl .Values.images.adapter_simulated_onu.tag . }}
-          imagePullPolicy: {{ .Values.images.adapter_simulated_onu.pullPolicy }}
-          env:
-            - name: NAMESPACE
-              value: {{ quote .Release.Namespace }}
-            - name: ETCD_SERVICE
-              value: "{{ .Values.services.etcd.service }}"
-            - name: ETCD_SERVICE_PORT
-              value: "{{ .Values.services.etcd.port }}"
-            - name: ADAPTER_KAFKA_SERVICE
-              value: "{{ .Values.services.kafka.adapter.service }}"
-            - name: ADAPTER_KAFKA_SERVICE_PORT
-              value: "{{ .Values.services.kafka.adapter.port }}"
-            - name: CLUSTER_KAFKA_SERVICE
-              value: "{{ .Values.services.kafka.cluster.service }}"
-            - name: CLUSTER_KAFKA_SERVICE_PORT
-              value: "{{ .Values.services.kafka.cluster.port }}"
+          image: {{ tpl .Values.images.adapter_simulated_onu.registry . }}{{ tpl .Values.images.adapter_simulated_onu.repository . }}:{{ tpl .Values.images.adapter_simulated_onu.tag . }}
+          imagePullPolicy: {{ tpl .Values.images.adapter_simulated_onu.pullPolicy . }}
           args:
             - "/app/simulated_onu"
-            - "-kafka_adapter_host=$(ADAPTER_KAFKA_SERVICE)"
-            - "-kafka_adapter_port=$(ADAPTER_KAFKA_SERVICE_PORT)"
-            - "-kafka_cluster_host=$(CLUSTER_KAFKA_SERVICE)"
-            - "-kafka_cluster_port=$(CLUSTER_KAFKA_SERVICE_PORT)"
+            - "-kafka_adapter_host={{ .Values.services.kafka.adapter.service }}"
+            - "-kafka_adapter_port={{ .Values.services.kafka.adapter.port }}"
+            - "-kafka_cluster_host={{ .Values.services.kafka.cluster.service }}"
+            - "-kafka_cluster_port={{ .Values.services.kafka.cluster.port }}"
+            - "-kv_store_host={{ .Values.services.etcd.service }}"
+            - "-kv_store_port={{ .Values.services.etcd.port }}"
             - "-core_topic=rwcore"
-            - "-kv_store_host=$(ETCD_SERVICE)"
-            - "-kv_store_port=$(ETCD_SERVICE_PORT)"
             - "-simulator_topic=simulated_onu"
diff --git a/voltha-adapter-simulated/templates/onu.yaml b/voltha-adapter-simulated/templates/onu.yaml
deleted file mode 100644
index e44466b..0000000
--- a/voltha-adapter-simulated/templates/onu.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019-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: Service
-metadata:
-  name: onu
-  labels:
-    name: onu
-spec:
-  ports:
-    - name: grpc
-      port: 50061
-      targetPort: 50061
-  selector:
-    app: onu
-
----
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: onu
-spec:
-   replicas: {{ .Values.replicas.onu }}
-   template:
-     metadata:
-       labels:
-         app: onu
-       annotations:
-         cni: "calico,pon0"
-     spec:
-       containers:
-         - name: onu
-           image: {{ .Values.registry }}{{ .Values.images.ponsim.repository }}:{{ tpl .Values.images.ponsim.tag . }}
-           imagePullPolicy: {{ .Values.images.ponsim.pullPolicy }}
-           env:
-             - name: POD_IP
-               valueFrom:
-                 fieldRef:
-                   fieldPath: status.podIP
-             - name: NAMESPACE
-               value: {{ quote .Release.Namespace }}
-
-           args:
-             - "/app/ponsim"
-             - "-device_type"
-             - "ONU"
-             - "-parent_addr"
-             - "olt"
-             - "-grpc_port"
-             - "50061"
-             - "-internal_if"
-             - "eth0"
-             - "-external_if"
-             - "eth1"
-             - "-promiscuous"
-
-           ports:
-            - containerPort: 50061
-              name: grpc-port
diff --git a/voltha-adapter-simulated/values.yaml b/voltha-adapter-simulated/values.yaml
index 2dd877f..cc774c7 100644
--- a/voltha-adapter-simulated/values.yaml
+++ b/voltha-adapter-simulated/values.yaml
@@ -13,8 +13,12 @@
 # limitations under the License.
 
 ---
-# Globally define a registry
-registry: ''
+# Default overrides
+defaults:
+  image_registry:
+  image_tag:
+  image_org:
+  image_pullPolicy:
 
 # Define connectivity to required services
 services:
@@ -39,16 +43,13 @@
 
 images:
   adapter_simulated_olt:
-    repository: 'volthacore/voltha-adapter-simulated-olt'
-    tag: '{{ .Chart.AppVersion }}'
-    pullPolicy: 'Always'
+    registry: '{{ .Values.defaults.image_registry | default "" }}'
+    repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-adapter-simulated-olt'
+    tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
+    pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
 
   adapter_simulated_onu:
-    repository: 'volthacore/voltha-adapter-simulated-onu'
-    tag: '{{ .Chart.AppVersion }}'
-    pullPolicy: 'Always'
-
-  ponsim:
-    repository: 'volthacore/voltha-ponsim'
-    tag: '{{ .Chart.AppVersion }}'
-    pullPolicy: 'Always'
+    registry: '{{ .Values.defaults.image_registry | default "" }}'
+    repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-adapter-simulated-onu'
+    tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
+    pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'