diff --git a/compose/system-test-bbsim.yml b/compose/system-test-bbsim.yml
index 37abd5e..d3dc347 100644
--- a/compose/system-test-bbsim.yml
+++ b/compose/system-test-bbsim.yml
@@ -50,7 +50,7 @@
 
 
   etcd:
-    image: "quay.io/coreos/etcd:v3.2.9"
+    image: "quay.io/coreos/etcd:v3.4.1"
     command: [
       "etcd",
       "--name=etcd0",
@@ -97,20 +97,6 @@
     restart: unless-stopped
 
 
-  cli:
-    image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-cli:${DOCKER_TAG}"
-    environment:
-      DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
-    entrypoint:
-    - /voltha/python/cli/setup.sh
-    - -g ${DOCKER_HOST_IP}:50057
-    networks:
-    - default
-    ports:
-    - "5022:22"
-    restart: unless-stopped
-
-
   ofagent:
     image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-ofagent:${DOCKER_TAG}"
     command: [