diff --git a/compose/adapters-ponsim.yml b/compose/adapters-ponsim.yml
index 145d99b..86a30d2 100644
--- a/compose/adapters-ponsim.yml
+++ b/compose/adapters-ponsim.yml
@@ -23,7 +23,7 @@
         max-size: "10m"
         max-file: "3"
     command: [
-      "/adapters/adapters/ponsim_olt/main.py",
+      "/voltha/python/adapters/ponsim_olt/main.py",
       "-v",
       "--name=ponsim_olt",
       "--kafka_adapter=${DOCKER_HOST_IP}:9092",
@@ -41,7 +41,7 @@
         max-size: "10m"
         max-file: "3"
     command: [
-      "/adapters/adapters/ponsim_onu/main.py",
+      "/voltha/python/adapters/ponsim_onu/main.py",
       "-v",
       "--name=ponsim_onu",
       "--kafka_adapter=${DOCKER_HOST_IP}:9092",
diff --git a/compose/cli.yml b/compose/cli.yml
new file mode 100644
index 0000000..e8ff4ee
--- /dev/null
+++ b/compose/cli.yml
@@ -0,0 +1,37 @@
+---
+# Copyright 2018 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: "2"
+services:
+  cli:
+    image: "${REGISTRY}${REPOSITORY}voltha-cli:latest"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    environment:
+      DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
+    entrypoint:
+    - /voltha/python/cli/setup.sh
+    - -g 192.168.0.14:50057
+    networks:
+    - default
+    ports:
+    - "5022:22"
+
+networks:
+  default:
+    driver: bridge