diff --git a/compose/docker-compose-system-test-persistence.yml b/compose/docker-compose-system-test-persistence.yml
index fc77d9e..99f42eb 100644
--- a/compose/docker-compose-system-test-persistence.yml
+++ b/compose/docker-compose-system-test-persistence.yml
@@ -23,13 +23,13 @@
       KAFKA_HEAP_OPTS: "-Xmx256M -Xms128M"
       SERVICE_9092_NAME: "kafka"
     depends_on:
-    - consul
+    - vconsul
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   #
   # Single-node consul agent
   #
-  consul:
+  vconsul:
     image: "${REGISTRY}consul:0.9.2"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
@@ -52,10 +52,10 @@
       "-retry-attempts", "100",
       "-cleanup",
       # "-internal",
-      "consul://consul:8500"
+      "consul://vconsul:8500"
     ]
     links:
-    - consul
+    - vconsul
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
 
@@ -104,7 +104,7 @@
       "--host=${DOCKER_HOST_IP}"
     ]
     depends_on:
-    - consul
+    - vconsul
     - kafka
     - grafana
     restart: unless-stopped
@@ -132,9 +132,9 @@
     - 50556
     - 18880
     depends_on:
-    - consul
+    - vconsul
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_8880_NAME: "voltha-health"
@@ -158,6 +158,10 @@
       - "/envoy/voltha-grpc-proxy.template.json"
       - -envoy-config
       - "/envoy/voltha-grpc-proxy.json"
+      - -consul-svc-nme
+      - "vconsul"
+      - -kv-svc-name
+      - "vconsul"
     ports:
       - "50555:50555"
       - "8882:8882"
@@ -209,10 +213,10 @@
       "-v"
     ]
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
@@ -236,10 +240,10 @@
     ports:
     - "830:1830"
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_1830_NAME: "netconf-server"