diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 9719139..a0797bd 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.9.5"
+version: "2.9.6"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index 8f77ae3..93286ff 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -18,8 +18,7 @@
 {{- $infraNamespaces := default "infra" .Values.global.voltha_infra_namespace -}}
 {{- $controllers := dict "controllers" (list) -}}
 {{- range $i, $e := until ($onosReplicas | int) -}}
-  {{- $port := add $onosOfPort $i -}}
-  {{- $current := printf "%s-onos-classic-%d.%s-onos-classic-hs.%s.svc:%d" $infraName $i $infraName $infraNamespaces $port -}}
+  {{- $current := printf "%s-onos-classic-%d.%s-onos-classic-hs.%s.svc:%d" $infraName $i $infraName $infraNamespaces ($onosOfPort | int) -}}
   {{- $controllers := (mustAppend $controllers.controllers $current) | set $controllers "controllers" -}}
 {{- end -}}
 ---