diff --git a/VERSION b/VERSION
index dfb9edc..79a6144 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.1-dev
+2.4.4
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 15a990b..3e6adfd 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.5.6"
+version: "2.5.8"
 description: "A Helm chart for Voltha OpenOLT Adapter"
 keywords:
   - "onf"
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 41ba36f..99007b0 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -89,11 +89,11 @@
               value: {{ .Values.defaults.kv_store_data_prefix }}
           args:
             - "/app/openolt"
-            - "--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 }}"
+            - "--kafka_adapter_address={{ .Values.services.kafka.adapter.address }}"
+            - "--kafka_cluster_address={{ .Values.services.kafka.cluster.address }}"
             - "--core_topic={{ .Values.defaults.topics.core_topic }}"
             - "--adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}"
-            - "--kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
+            - "--kv_store_address={{ .Values.services.etcd.address }}"
             - "--log_level={{ $log_level }}"
             - "--current_replica={{ .Values.replicas.current_replica }}"
             - "--total_replica={{ .Values.replicas.total_replica }}"
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 1d027d7..cc953f9 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -48,16 +48,13 @@
 services:
   kafka:
     adapter:
-      service: kafka
-      port: 9092
+      address: kafka:9092
     cluster:
-      service: kafka
-      port: 9092
+      address: kafka:9092
 
   # Define connectivity to etcd
   etcd:
-    service: etcd
-    port: 2379
+    address: etcd:2379
 
 # Expose the golang pprof webserver, if enabled
 profiler:
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 21bdaca..73438e2 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.5.4"
+version: "2.5.6"
 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 f6ae94f..5b126ea 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -86,11 +86,11 @@
           args:
             - "/app/rw_core"
             - "--kv_store_type=etcd"
-            - "--kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
+            - "--kv_store_address={{ .Values.services.etcd.address }}"
             - "--grpc_address=0.0.0.0:50057"
             - "--banner"
-            - "--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 }}"
+            - "--kafka_adapter_address={{ .Values.services.kafka.adapter.address }}"
+            - "--kafka_cluster_address={{ .Values.services.kafka.cluster.address }}"
             - "--rw_core_topic={{ .Values.defaults.topics.core_topic }}"
             - "--core_timeout={{ tpl .Values.rw_core.core_timeout . }}"
             - "--timeout_long_request={{ tpl .Values.rw_core.timeout_long_request . }}"
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index 6149b9c..d0e5715 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -79,10 +79,10 @@
         args:
         - "/app/ofagent"
         {{- range .Values.services.controller }}
-        - "--controller={{ .service }}:{{ .port }}"
+        - "--controller={{ .address }}"
         {{- end }}
         - "--voltha={{ template "fullname" . }}-api.{{ .Release.Namespace }}.svc:55555"
-        - "--kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
+        - "--kv_store_address={{ .Values.services.etcd.address }}"
         - "--kv_store_type=etcd"
         - "--kv_store_request_timeout=60s"
         - "--log_level={{ $log_level }}"
diff --git a/voltha/values.yaml b/voltha/values.yaml
index a8c53e9..11e4174 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -45,21 +45,17 @@
 services:
   kafka:
     adapter:
-      service: kafka
-      port: 9092
+      address: kafka:9092
     cluster:
-      service: kafka
-      port: 9092
+      address: kafka:9092
 
   # Define connectivity to etcd
   etcd:
-    service: etcd
-    port: 2379
+    address: etcd:2379
 
   # Define the list of controllers to connect to
   controller:
-    - service: onos-openflow
-      port: 6653
+    - address: onos-openflow:6653
 
 # Expose the golang pprof webserver, if enabled
 profiler: