diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 0ceee1d..4dd6c82 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -78,7 +78,7 @@ services:
   grafana:
     image: voltha/grafana
     ports:
-    - "8882:80"
+    - "8883:80"
     - "2003:2003"
     - "2004:2004"
     - "8126:8126"
@@ -120,7 +120,7 @@ services:
       "--consul=${DOCKER_HOST_IP}:8500",
       "--fluentd=fluentd:24224",
       "--rest-port=8880",
-      "--grpc-port=50555",
+      "--grpc-port=50556",
       "--kafka=@kafka",
       "--instance-id-is-container-name",
       "--interface=eth1",
@@ -129,7 +129,7 @@ services:
     ]
     ports:
     - 8880
-    - 50555
+    - 50556
     - 18880
     - "60001:60001"
     depends_on:
@@ -142,7 +142,6 @@ services:
       SERVICE_8880_CHECK_HTTP: "/health"
       SERVICE_8880_CHECK_INTERVAL: "5s"
       SERVICE_8880_CHECK_TIMEOUT: "1s"
-      SERVICE_50555_NAME: "voltha-grpc"
       SERVICE_18880_NAME: "voltha-sim-rest"
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
@@ -150,6 +149,28 @@ services:
     - default
     - ponmgmt
 
+  envoy:
+    image: voltha/envoy
+    entrypoint:
+      - /usr/local/bin/envoyd
+      - -envoy-cfg-template
+      - "/envoy/voltha-grpc-proxy.template.json"
+      - -envoy-config
+      - "/envoy/voltha-grpc-proxy.json"
+    ports:
+      - "50555:50555"
+      - "8882:8882"
+      - "8443:8443"
+      - "8001:8001"
+    environment:
+      SERVICE_50555_NAME: "voltha-grpc"
+    volumes:
+    - "/var/run/docker.sock:/tmp/docker.sock"
+    networks:
+    - default
+    - ponmgmt
+    links:
+    - voltha:vcore
   #
   # Voltha cli container
   #
@@ -196,6 +217,7 @@ services:
     - fluentd
     environment:
       SERVICE_8881_NAME: "chameleon-rest"
+      ENABLE_TLS: "False"
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
   #
@@ -260,7 +282,7 @@ services:
       "/dashd/dashd/main.py",
       "--kafka=@kafka",
       "--consul=${DOCKER_HOST_IP}:8500",
-      "--grafana_url=http://admin:admin@${DOCKER_HOST_IP}:8882/api",
+      "--grafana_url=http://admin:admin@${DOCKER_HOST_IP}:8883/api",
       "--topic=voltha.kpis",
       "--docker_host=${DOCKER_HOST_IP}"
     ]
@@ -288,8 +310,6 @@ services:
     - chameleon
     - portainer
     restart: unless-stopped
-    volumes:
-    - "/cord/incubator/voltha/nginx_config:/nginx_config"
 
   #
   # Docker ui
diff --git a/docker/Dockerfile.nginx b/docker/Dockerfile.nginx
index 128e6ee..000583a 100755
--- a/docker/Dockerfile.nginx
+++ b/docker/Dockerfile.nginx
@@ -25,7 +25,8 @@ RUN apt-get update && apt-get -y install nginx-full && apt-get -y install wget
 # Download the consul-template software
 RUN wget https://releases.hashicorp.com/consul-template/0.18.2/consul-template_0.18.2_linux_amd64.tgz -O - | tar xzf - -C /usr/bin 
 #
-
+RUN mkdir -p /nginx_config
+COPY nginx_config /nginx_config
 # Exposing process and default entry point
 ENTRYPOINT ["/nginx_config/start_service.sh"]