diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 3cf5260..dfa74a4 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha-adapter-openolt"
-version: 2.4.5
+version: 2.4.6
 description: "A Helm chart for Voltha OpenOLT Adapter"
 keywords:
   - "onf"
@@ -33,4 +33,4 @@
 
 # appVersion refers to multiple components with potentially different
 # container image versions.
-appVersion: 2.4.1
+appVersion: 2.4.8
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index ab37ca3..4cb5ffc 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -78,18 +78,15 @@
               value: {{ .Values.defaults.kv_store_data_prefix }}
           args:
             - "/app/openolt"
-            - "--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 }}"
+            - "--kafka_adapter_address={{ .Values.services.kafka.adapter.service }}:{{ .Values.services.kafka.adapter.port }}"
+            - "--kafka_cluster_address={{ .Values.services.kafka.cluster.service }}:{{ .Values.services.kafka.cluster.port }}"
             - "--core_topic={{ .Values.defaults.topics.core_topic }}"
             - "--adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}"
-            - "--kv_store_host={{ .Values.services.etcd.service }}"
-            - "--kv_store_port={{ .Values.services.etcd.port }}"
+            - "--kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
             - "--log_level={{ $log_level }}"
             - "--current_replica={{ .Values.replicas.current_replica }}"
             - "--total_replica={{ .Values.replicas.total_replica }}"
-            - "--probe_port=8080"
+            - "--probe_address=:8080"
           {{- if .Values.securityContext.enabled }}
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index c653877..98b5a36 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.4.12"
+version: "2.4.13"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 0d1210a..08ce50c 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -86,22 +86,18 @@
           args:
             - "/app/rw_core"
             - "-kv_store_type=etcd"
-            - "-kv_store_host={{ .Values.services.etcd.service }}"
-            - "-kv_store_port={{ .Values.services.etcd.port }}"
-            - "-grpc_host=0.0.0.0"
-            - "-grpc_port=50057"
+            - "-kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
+            - "-grpc_address=0.0.0.0:50057"
             - "-banner=true"
-            - "-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 }}"
+            - "-kafka_adapter_address={{ .Values.services.kafka.adapter.service }}:{{ .Values.services.kafka.adapter.port }}"
+            - "-kafka_cluster_address={{ .Values.services.kafka.cluster.service }}:{{ .Values.services.kafka.cluster.port }}"
             - "-rw_core_topic={{ .Values.defaults.topics.core_topic }}"
             - "-in_competing_mode=false"
             - "-core_timeout={{ tpl .Values.rw_core.core_timeout . }}"
             - "-timeout_long_request={{ tpl .Values.rw_core.timeout_long_request . }}"
             - "-timeout_request={{ tpl .Values.rw_core.timeout_request . }}"
             - "-log_level={{ $log_level }}"
-            - "-probe_port=8080"
+            - "-probe_address=:8080"
           ports:
             - containerPort: 50057
               name: grpc
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index e1fcfc3..786c4cf 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -78,8 +78,7 @@
         - "--controller={{ .service }}:{{ .port }}"
         {{- end }}
         - "--voltha={{ template "fullname" . }}-api.{{ .Release.Namespace }}.svc:55555"
-        - "--kv_store_host=etcd.{{ .Release.Namespace }}.svc"
-        - "--kv_store_port=2379"
+        - "--kv_store_address=etcd.{{ .Release.Namespace }}.svc:{{ .Values.services.etcd.port }}"
         - "--kv_store_type=etcd"
         - "--kv_store_request_timeout=60s"
         - "--log_level={{ $log_level }}"
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 8a8b5da..8685d4e 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -88,11 +88,11 @@
   ofagent:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-ofagent-go'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}1.2.0{{- end }}{{- else }}1.2.0{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}1.2.1{{- end }}{{- else }}1.2.1{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   rw_core:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-rw-core'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.4.1{{- end }}{{- else }}2.4.1{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.4.2{{- end }}{{- else }}2.4.2{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'