diff --git a/chart/templates/mayastor/agents/ha/ha-node-daemonset.yaml b/chart/templates/mayastor/agents/ha/ha-node-daemonset.yaml
index 7107bc564..38e0a7fc7 100644
--- a/chart/templates/mayastor/agents/ha/ha-node-daemonset.yaml
+++ b/chart/templates/mayastor/agents/ha/ha-node-daemonset.yaml
@@ -72,7 +72,8 @@ spec:
         args:
         - "--node-name=$(MY_NODE_NAME)"
         - "--csi-socket={{ default .Values.csi.node.pluginMountPath .Values.csi.node.pluginMounthPath }}/{{ .Values.csi.node.socketPath }}"
-        - "--grpc-endpoint=$(MY_POD_IP):50053"
+        - "--grpc-ip=$(MY_POD_IP)"
+        - "--grpc-port=50053"
         - "--cluster-agent=https://{{ .Release.Name }}-agent-core:50052"{{ if .Values.base.jaeger.enabled }}
         - "--jaeger={{ include "jaeger_url" . }}"{{ end }}{{ if .Values.eventing.enabled }}
         - "--events-url=nats://{{ .Release.Name }}-nats:4222"{{ end }}
diff --git a/chart/templates/mayastor/csi/csi-node-daemonset.yaml b/chart/templates/mayastor/csi/csi-node-daemonset.yaml
index 98399a082..a78c39381 100644
--- a/chart/templates/mayastor/csi/csi-node-daemonset.yaml
+++ b/chart/templates/mayastor/csi/csi-node-daemonset.yaml
@@ -90,7 +90,8 @@ spec:
         - "--node-name=$(MY_NODE_NAME)"
         - "--rest-endpoint=http://{{ .Release.Name }}-api-rest:8081"
         - "--enable-registration"
-        - "--grpc-endpoint=$(MY_POD_IP):10199"{{ if .Values.csi.node.nvme.io_timeout }}
+        - "--grpc-ip=$(MY_POD_IP)"
+        - "--grpc-port=10199"{{ if .Values.csi.node.nvme.io_timeout }}
         - "--nvme-io-timeout={{ .Values.csi.node.nvme.io_timeout }}"
         - "--nvme-core-io-timeout={{ .Values.csi.node.nvme.io_timeout }}"{{ else }}
         - "--nvme-io-timeout={{ .Values.io_engine.nvme.ioTimeout }}10s"
diff --git a/chart/templates/mayastor/io/io-engine-daemonset.yaml b/chart/templates/mayastor/io/io-engine-daemonset.yaml
index f3868e15e..644d613d3 100644
--- a/chart/templates/mayastor/io/io-engine-daemonset.yaml
+++ b/chart/templates/mayastor/io/io-engine-daemonset.yaml
@@ -98,7 +98,7 @@ spec:
         # For example -l 1,2,10-20 means use core 1, 2, 10 to 20.
         # Note: Ensure that the CPU resources are updated accordingly.
         #       If you use 2 CPUs, the CPU: field should also read 2.
-        - "-g$(MY_POD_IP)"
+        - "--grpc-ip=$(MY_POD_IP)"
         - "-N$(MY_NODE_NAME)"
         - "-Rhttps://{{ .Release.Name }}-agent-core:50051"
         - "-y/var/local/{{ .Release.Name }}/io-engine/config.yaml"