diff --git a/compose/docker-compose-all.yml.j2 b/compose/docker-compose-all.yml.j2
index a66b6aa..cdf829b 100755
--- a/compose/docker-compose-all.yml.j2
+++ b/compose/docker-compose-all.yml.j2
@@ -129,7 +129,7 @@
     entrypoint:
       - voltha/voltha/main.py
       - -v
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --fluentd=fluentd:24224
       - --kafka=kafka
       - --rest-port=8880
@@ -161,7 +161,7 @@
     entrypoint:
       - /ofagent/ofagent/main.py
       - -v
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --fluentd=fluentd:24224
       - --controller=onos:6653
       - --grpc-endpoint=vcore:50556
@@ -189,6 +189,10 @@
       - "/envoy/voltha-grpc-proxy.template.json"
       - -envoy-config
       - "/envoy/voltha-grpc-proxy.json"
+      - -consul-svc-nme
+      - "vconsul"
+      - -kv-svc-name
+      - "vconsul"
     networks:
       - voltha-net
     ports:
@@ -212,7 +216,7 @@
       replicas: {{ SWARM_MANAGER_COUNT | default(2) }}
     entrypoint:
       - /cli/cli/setup.sh
-      - -C consul:8500
+      - -C vconsul:8500
       - -g voltha:50555
       - -s voltha:18880
       - -G
@@ -237,7 +241,7 @@
     entrypoint:
       - /netconf/netconf/main.py
       - -v
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --fluentd=fluentd:24224
       - --grpc-endpoint=voltha:50555
       - --instance-id-is-container-name
diff --git a/compose/docker-compose-cli.yml b/compose/docker-compose-cli.yml
index 403d06d..a78b525 100644
--- a/compose/docker-compose-cli.yml
+++ b/compose/docker-compose-cli.yml
@@ -22,7 +22,7 @@
       DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
     entrypoint:
       - /cli/cli/setup.sh
-      - -C consul:8500
+      - -C vconsul:8500
       - -g voltha:50555
       - -s voltha:18880
       - -G
diff --git a/compose/docker-compose-consul-cluster.yml b/compose/docker-compose-consul-cluster.yml
index 16a4a45..dd5d372 100644
--- a/compose/docker-compose-consul-cluster.yml
+++ b/compose/docker-compose-consul-cluster.yml
@@ -26,7 +26,7 @@
 version: "3"
 services:
 
-  consul:
+  vconsul:
     image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
     logging:
       driver: "json-file"
diff --git a/compose/docker-compose-dashd.yml b/compose/docker-compose-dashd.yml
index 7908450..58d7cd8 100755
--- a/compose/docker-compose-dashd.yml
+++ b/compose/docker-compose-dashd.yml
@@ -14,7 +14,7 @@
       "--docker_host=${DOCKER_HOST_IP}"
     ]
     depends_on:
-    - consul
+    - vconsul
     - kafka
     - grafana
     restart: unless-stopped
@@ -28,7 +28,7 @@
   #
   # Single-node consul agent
   #
-  consul:
+  vconsul:
     image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
 
   #
diff --git a/compose/docker-compose-docutests.yml b/compose/docker-compose-docutests.yml
index de75f81..ba6e94b 100644
--- a/compose/docker-compose-docutests.yml
+++ b/compose/docker-compose-docutests.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: "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"
 
@@ -94,9 +94,9 @@
     - 50555
     - 18880
     depends_on:
-    - consul
+    - vconsul
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_8880_NAME: "voltha-health"
@@ -127,10 +127,10 @@
       "-v"
     ]
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
@@ -154,10 +154,10 @@
     ports:
     - "830:1830"
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_1830_NAME: "netconf-server"
diff --git a/compose/docker-compose-envoy-swarm.yml b/compose/docker-compose-envoy-swarm.yml
index 1e5d43d..76ed069 100644
--- a/compose/docker-compose-envoy-swarm.yml
+++ b/compose/docker-compose-envoy-swarm.yml
@@ -26,6 +26,10 @@
       - "/envoy/voltha-grpc-proxy.template.json"
       - -envoy-config
       - "/envoy/voltha-grpc-proxy.json"
+      - -consul-svc-nme
+      - "vconsul"
+      - -kv-svc-name
+      - "vconsul"
     networks:
       - voltha-net
     ports:
diff --git a/compose/docker-compose-fixed-port.yml b/compose/docker-compose-fixed-port.yml
index cafe4ab..c810940 100644
--- a/compose/docker-compose-fixed-port.yml
+++ b/compose/docker-compose-fixed-port.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:${CONSUL_TAG:-0.9.2}"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
@@ -51,10 +51,10 @@
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
       # "-internal",
-      "consul://consul:8500"
+      "consul://vconsul:8500"
     ]
     links:
-    - consul
+    - vconsul
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
 
@@ -102,7 +102,7 @@
       "--host=${DOCKER_HOST_IP}"
     ]
     depends_on:
-    - consul
+    - vconsul
     - kafka
     - grafana
     restart: unless-stopped
@@ -129,9 +129,9 @@
     - 50555
     - 18880
     depends_on:
-    - consul
+    - vconsul
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_8880_NAME: "voltha-health"
@@ -166,10 +166,10 @@
       "-v"
     ]
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
@@ -193,10 +193,10 @@
     ports:
     - "830:1830"
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_1830_NAME: "netconf-server"
@@ -217,7 +217,7 @@
       "--docker_host=${DOCKER_HOST_IP}"
     ]
     depends_on:
-    - consul
+    - vconsul
     - kafka
     - grafana
     restart: unless-stopped
diff --git a/compose/docker-compose-netconf-swarm.yml b/compose/docker-compose-netconf-swarm.yml
index 140c8c4..091ea79 100644
--- a/compose/docker-compose-netconf-swarm.yml
+++ b/compose/docker-compose-netconf-swarm.yml
@@ -26,7 +26,7 @@
     entrypoint:
       - /netconf/netconf/main.py
       - -v
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --fluentd=fluentd:24224
       - --grpc-endpoint=voltha:50555
       - --instance-id-is-container-name
diff --git a/compose/docker-compose-ofagent-swarm.yml b/compose/docker-compose-ofagent-swarm.yml
index 5c0d0b8..8fc5ea2 100644
--- a/compose/docker-compose-ofagent-swarm.yml
+++ b/compose/docker-compose-ofagent-swarm.yml
@@ -20,7 +20,7 @@
         entrypoint:
             - /ofagent/ofagent/main.py
             - -v
-            - --consul=consul:8500
+            - --consul=vconsul:8500
             - --fluentd=fluentd:24224
             - --controller=onos:6653
             - --grpc-endpoint=vcore:50556
diff --git a/compose/docker-compose-ofagent-test.yml b/compose/docker-compose-ofagent-test.yml
index 20a4035..516196f 100644
--- a/compose/docker-compose-ofagent-test.yml
+++ b/compose/docker-compose-ofagent-test.yml
@@ -4,7 +4,7 @@
   #
   # Single-node consul agent
   #
-  consul:
+  vconsul:
     image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
@@ -27,10 +27,10 @@
       "-retry-attempts", "100",
       "-cleanup",
       # "-internal",
-      "consul://consul:8500"
+      "consul://vconsul:8500"
     ]
     links:
-    - consul
+    - vconsul
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
 
@@ -70,9 +70,9 @@
     - 18880
     - "60001:60001"
     depends_on:
-    - consul
+    - vconsul
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_8880_NAME: "voltha-health"
@@ -95,6 +95,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"
@@ -180,10 +184,10 @@
     image: "${REGISTRY}${REPOSITORY}voltha-ofagent:${TAG:-latest}"
     command: /ofagent/ofagent/main.py -v --consul=${DOCKER_HOST_IP}:8500 --fluentd=fluentd:24224 --controller ${DOCKER_HOST_IP}:6633 ${DOCKER_HOST_IP}:6644 ${DOCKER_HOST_IP}:6655 --grpc-endpoint=@voltha-grpc --instance-id-is-container-name --enable-tls --key-file=/ofagent/pki/voltha.key --cert-file=/ofagent/pki/voltha.crt
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
diff --git a/compose/docker-compose-stats-swarm.yml b/compose/docker-compose-stats-swarm.yml
index 6d4a673..1dde096 100644
--- a/compose/docker-compose-stats-swarm.yml
+++ b/compose/docker-compose-stats-swarm.yml
@@ -2,7 +2,7 @@
 # This stackfile deploys dashd and shovel services to a docker swarm.
 #
 # Each of these services depends on:
-# - consul     (service)
+# - vconsul     (service)
 # - kafka      (service)
 # - grafana    (service)
 # - voltha_net (overlay network)
@@ -26,7 +26,7 @@
     entrypoint:
       - /dashd/dashd/main.py
       - --kafka=kafka
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --grafana_url=http://admin:admin@grafana:80/api
       - --topic=voltha.kpis
       - --docker_host=${DOCKER_HOST_IP}
@@ -45,7 +45,7 @@
     entrypoint:
       - /shovel/shovel/main.py
       - --kafka=kafka
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --topic=voltha.kpis
       - --host=grafana
     networks:
diff --git a/compose/docker-compose-system-test-dispatcher.yml b/compose/docker-compose-system-test-dispatcher.yml
index 5865d60..64731c4 100644
--- a/compose/docker-compose-system-test-dispatcher.yml
+++ b/compose/docker-compose-system-test-dispatcher.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"
diff --git a/compose/docker-compose-system-test-encrypted.yml b/compose/docker-compose-system-test-encrypted.yml
index 57cd6fa..faafd10 100644
--- a/compose/docker-compose-system-test-encrypted.yml
+++ b/compose/docker-compose-system-test-encrypted.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}${REPOSITORY}voltha-consul${TAG}"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
@@ -51,10 +51,10 @@
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
       # "-internal",
-      "consul-tls://consul:8501"
+      "consul-tls://vconsul:8501"
     ]
     links:
-    - consul
+    - vconsul
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
     environment:
@@ -107,7 +107,7 @@
       "--host=${DOCKER_HOST_IP}"
     ]
     depends_on:
-    - consul
+    - vconsul
     - kafka
     - grafana
     restart: unless-stopped
@@ -134,9 +134,9 @@
     - 50555
     - 18880
     depends_on:
-    - consul
+    - vconsul
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_8880_NAME: "voltha-health"
@@ -187,10 +187,10 @@
       "-v"
     ]
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
@@ -214,10 +214,10 @@
     ports:
     - "830:1830"
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_1830_NAME: "netconf-server"
@@ -238,7 +238,7 @@
       "--docker_host=${DOCKER_HOST_IP}"
     ]
     depends_on:
-    - consul
+    - vconsul
     - kafka
     - grafana
     restart: unless-stopped
@@ -256,7 +256,7 @@
       "/nginx_config/start_service.sh"
     ]
     depends_on:
-    - consul
+    - vconsul
     - grafana
     - portainer
     restart: unless-stopped
diff --git a/compose/docker-compose-system-test-persistence.yml b/compose/docker-compose-system-test-persistence.yml
index 18cfa43..2289bf8 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"
diff --git a/compose/docker-compose-system-test-with-etcd.yml b/compose/docker-compose-system-test-with-etcd.yml
index a3cc69c..44e217c 100644
--- a/compose/docker-compose-system-test-with-etcd.yml
+++ b/compose/docker-compose-system-test-with-etcd.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:
@@ -72,10 +72,10 @@
       "-retry-attempts", "100",
       "-cleanup",
       # "-internal",
-      "consul://consul:8500"
+      "consul://vconsul:8500"
     ]
     links:
-    - consul
+    - vconsul
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
 
@@ -124,7 +124,7 @@
       "--host=${DOCKER_HOST_IP}"
     ]
     depends_on:
-    - consul
+    - vconsul
     - kafka
     - grafana
     restart: unless-stopped
@@ -154,10 +154,10 @@
     - 18880
     - "60001:60001"
     depends_on:
-    - consul
+    - vconsul
     - etcd
     links:
-    - consul
+    - vconsul
     - etcd
     - fluentd
     environment:
@@ -243,10 +243,10 @@
       "-v"
     ]
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
@@ -270,10 +270,10 @@
     ports:
     - "830:1830"
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_1830_NAME: "netconf-server"
@@ -294,7 +294,7 @@
       "--docker_host=${DOCKER_HOST_IP}"
     ]
     depends_on:
-    - consul
+    - vconsul
     - kafka
     - grafana
     restart: unless-stopped
@@ -312,7 +312,7 @@
       "/nginx_config/start_service.sh"
     ]
     depends_on:
-    - consul
+    - vconsul
     - grafana
     - portainer
     restart: unless-stopped
diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 99ffcd0..248e35a 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.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
@@ -133,9 +133,9 @@
     - 18880
     - "60001:60001"
     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"
@@ -180,6 +184,7 @@
     command: [
       "/cli/cli/setup.sh",
       "-L",
+      "-C vconsul:8500",
       "-G"
     ]
     environment:
@@ -212,10 +217,10 @@
       "-v"
     ]
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
@@ -239,10 +244,10 @@
     ports:
     - "830:1830"
     depends_on:
-    - consul
+    - vconsul
     - voltha
     links:
-    - consul
+    - vconsul
     - fluentd
     environment:
       SERVICE_1830_NAME: "netconf-server"
@@ -263,7 +268,7 @@
       "--docker_host=${DOCKER_HOST_IP}"
     ]
     depends_on:
-    - consul
+    - vconsul
     - kafka
     - grafana
     restart: unless-stopped
@@ -281,7 +286,7 @@
       "/nginx_config/start_service.sh"
     ]
     depends_on:
-    - consul
+    - vconsul
     - grafana
     - portainer
     restart: unless-stopped
diff --git a/compose/docker-compose-voltha-swarm.yml b/compose/docker-compose-voltha-swarm.yml
index cd6489a..00c5b73 100644
--- a/compose/docker-compose-voltha-swarm.yml
+++ b/compose/docker-compose-voltha-swarm.yml
@@ -12,7 +12,7 @@
     entrypoint:
       - voltha/voltha/main.py
       - -v
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --fluentd=fluentd:24224
       - --kafka=kafka
       - --rest-port=8880
diff --git a/compose/voltha-stack.yml.j2 b/compose/voltha-stack.yml.j2
index f8f536f..2a82abe 100644
--- a/compose/voltha-stack.yml.j2
+++ b/compose/voltha-stack.yml.j2
@@ -107,7 +107,7 @@
     ports:
       - 9092:9092
 
-  consul:
+  vconsul:
     image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
     logging:
       driver: "json-file"
@@ -334,7 +334,7 @@
     entrypoint:
       - voltha/voltha/main.py
       - -v
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --fluentd=fluentd:24224
       - --kafka=kafka
       - --rest-port=8880
@@ -366,7 +366,7 @@
     entrypoint:
       - /ofagent/ofagent/main.py
       - -v
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --fluentd=fluentd:24224
       - --controller=onos:6653
       - --grpc-endpoint=vcore:50556
@@ -395,6 +395,10 @@
     #  DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
     entrypoint:
       - /usr/local/bin/envoyd
+      - -consul-svc-nme
+      - "vconsul"
+      - -kv-svc-name
+      - "vconsul"
       - -envoy-cfg-template
       - "/envoy/voltha-grpc-proxy.template.json"
       - -envoy-config
@@ -424,7 +428,7 @@
     #  DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
     entrypoint:
       - /cli/cli/setup.sh
-      - -C consul:8500
+      - -C vconsul:8500
       - -g voltha:50555
       - -s voltha:18880
       - -G
@@ -449,7 +453,7 @@
     entrypoint:
       - /netconf/netconf/main.py
       - -v
-      - --consul=consul:8500
+      - --consul=vconsul:8500
       - --fluentd=fluentd:24224
       - --grpc-endpoint=voltha:50555
       - --instance-id-is-container-name
diff --git a/tests/itests/docutests/build_md_test.py b/tests/itests/docutests/build_md_test.py
index a6f5450..6dbdd7b 100644
--- a/tests/itests/docutests/build_md_test.py
+++ b/tests/itests/docutests/build_md_test.py
@@ -418,8 +418,7 @@
             cmd = command_defs['docker_ps_count']
             out, err, rc = run_command_to_completion_with_raw_stdout(cmd)
             self.assertEqual(rc, 0)
-            self.assertGreaterEqual(out.split(), [str(len(
-                docker_service_list))])
+            self.assertGreaterEqual(out, (len(docker_service_list)))
 
             # Retrieve the list of services from consul and validate against
             # the list obtained from docker composed
@@ -493,7 +492,7 @@
             # first work of each line
             print "Verify docker compose logs has output from all the services " \
                   "..."
-            expected_output = ['voltha_1', 'fluentd_1', 'consul_1',
+            expected_output = ['voltha_1', 'fluentd_1', 'vconsul_1',
                                'registrator_1', 'kafka_1', 'zookeeper_1',
                                'ofagent_1', 'netconf_1']
             cmd = command_defs['docker_compose_logs']