diff --git a/envoy/front-proxy/voltha-grpc-proxy-no-http.template.json b/envoy/front-proxy/voltha-grpc-proxy-no-http.template.json
index 4741d34..2d71f57 100644
--- a/envoy/front-proxy/voltha-grpc-proxy-no-http.template.json
+++ b/envoy/front-proxy/voltha-grpc-proxy-no-http.template.json
@@ -154,9 +154,15 @@
         "lb_type": "round_robin",
 	"features": "http2",
         "hosts": [
-          {
-            "url": "tcp://{{- .VolthaVip }}"
-          }
+	    {{block "viplist" .VolthaRR}}
+	        {{- range .}}
+		    {{- if isFirst2}}
+	                {{- printf "{\"url\": \"tcp://%s\"}" . }}
+		    {{- else }}
+	                {{- printf ",{\"url\": \"tcp://%s\"}" . }}
+		    {{- end }}
+	        {{- end}}
+	    {{- end}}
         ]
       },
       {
diff --git a/envoy/front-proxy/voltha-grpc-proxy-no-https.template.json b/envoy/front-proxy/voltha-grpc-proxy-no-https.template.json
index 7c5ba2e..7c8e6b1 100644
--- a/envoy/front-proxy/voltha-grpc-proxy-no-https.template.json
+++ b/envoy/front-proxy/voltha-grpc-proxy-no-https.template.json
@@ -149,9 +149,15 @@
         "lb_type": "round_robin",
 	"features": "http2",
         "hosts": [
-          {
-            "url": "tcp://{{- .VolthaVip }}"
-          }
+	    {{block "viplist" .VolthaRR}}
+	        {{- range .}}
+		    {{- if isFirst2}}
+	                {{- printf "{\"url\": \"tcp://%s\"}" . }}
+		    {{- else }}
+	                {{- printf ",{\"url\": \"tcp://%s\"}" . }}
+		    {{- end }}
+	        {{- end}}
+	    {{- end}}
         ]
       },
       {