diff --git a/compose/adapters-adtran_olt.yml b/compose/adapters-adtran-olt.yml
similarity index 77%
rename from compose/adapters-adtran_olt.yml
rename to compose/adapters-adtran-olt.yml
index 6489c20..3dedce2 100644
--- a/compose/adapters-adtran_olt.yml
+++ b/compose/adapters-adtran-olt.yml
@@ -15,24 +15,21 @@
 
 version: '2'
 services:
-  ponsim_olt:
+  adtran_olt:
     image: "${REGISTRY}${REPOSITORY}voltha-adapter-adtran-olt${TAG}"
     logging:
       driver: "json-file"
       options:
         max-size: "10m"
         max-file: "3"
-    entrypoint:
-      - /app/adtran_olt
-      - -device_type
-      - "OLT"
-      - -internal_if
-      - "eth0"
-      - -external_if
-      - "eth0"
-      - -verbose
-    ports:
-      - "50060:50060"
+    command: [
+      "/voltha/adapters/adtran_olt/main.py",
+      "-v",
+      "--name=adtran_olt",
+      "--kafka_adapter=${DOCKER_HOST_IP}:9092",
+      "--kafka_cluster=${DOCKER_HOST_IP}:9092",
+      "--core_topic=rwcore"
+    ]
     networks:
       - default
 
diff --git a/compose/adapters-adtran_onu.yml b/compose/adapters-adtran-onu.yml
similarity index 77%
rename from compose/adapters-adtran_onu.yml
rename to compose/adapters-adtran-onu.yml
index 839d206..ca58676 100644
--- a/compose/adapters-adtran_onu.yml
+++ b/compose/adapters-adtran-onu.yml
@@ -15,24 +15,21 @@
 
 version: '2'
 services:
-  ponsim_onu:
+  adtran_onu:
     image: "${REGISTRY}${REPOSITORY}voltha-adapter-adtran-onu${TAG}"
     logging:
       driver: "json-file"
       options:
         max-size: "10m"
         max-file: "3"
-    entrypoint:
-      - /app/adtran_onu
-      - -device_type
-      - "OLT"
-      - -internal_if
-      - "eth0"
-      - -external_if
-      - "eth0"
-      - -verbose
-    ports:
-      - "50061:50061"
+    command: [
+      "/voltha/adapters/adtran_onu/main.py",
+      "-v",
+      "--name=adtran_onu",
+      "--kafka_adapter=${DOCKER_HOST_IP}:9092",
+      "--kafka_cluster=${DOCKER_HOST_IP}:9092",
+      "--core_topic=rwcore"
+    ]
     networks:
       - default
 
diff --git a/compose/system-test.yml b/compose/system-test.yml
new file mode 100644
index 0000000..80646c9
--- /dev/null
+++ b/compose/system-test.yml
@@ -0,0 +1,180 @@
+---
+# 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'
+
+networks:
+  default:
+    driver: bridge
+
+services:
+
+  zookeeper:
+    image: "wurstmeister/zookeeper:latest"
+    environment:
+      SERVICE_2181_NAME: "zookeeper"
+    ports:
+    - 2181:2181
+    networks:
+    - default
+
+
+  kafka:
+    image: "wurstmeister/kafka:2.11-2.0.1"
+    environment:
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${DOCKER_HOST_IP}:9092
+      KAFKA_LISTENERS: PLAINTEXT://:9092
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+      SERVICE_9092_NAME: "kafka"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    ports:
+     - 9092:9092
+    networks:
+    - default
+
+
+  etcd:
+    image: "quay.io/coreos/etcd:v3.2.9"
+    command: [
+      "etcd",
+      "--name=etcd0",
+      "--advertise-client-urls=http://${DOCKER_HOST_IP}:2379,http://${DOCKER_HOST_IP}:4001",
+      "--listen-client-urls=http://0.0.0.0:2379,http://0.0.0.0:4001",
+      "--initial-advertise-peer-urls=http://${DOCKER_HOST_IP}:2380",
+      "--listen-peer-urls=http://0.0.0.0:2380",
+      "--initial-cluster-token=etcd-cluster-1",
+      "--initial-cluster=etcd0=http://${DOCKER_HOST_IP}:2380",
+      "--initial-cluster-state=new"
+    ]
+    ports:
+    - "2379:2379"
+    - 2380
+    - 4001
+    networks:
+    - default
+
+
+  rw_core:
+    image: voltha-rw-core
+    entrypoint:
+        - /app/rw_core
+        - -kv_store_type=etcd
+        - -kv_store_host=${DOCKER_HOST_IP}
+        - -kv_store_port=2379
+        - -grpc_port=50057
+        - -banner=true
+        - -kafka_adapter_host=${DOCKER_HOST_IP}
+        - -kafka_adapter_port=9092
+        - -kafka_cluster_host=${DOCKER_HOST_IP}
+        - -kafka_cluster_port=9092
+        - -rw_core_topic=rwcore
+        - -kv_store_data_prefix=service/voltha
+        - -in_competing_mode=false
+        - -log_level=0
+    volumes:
+    - "/var/run/docker.sock:/tmp/docker.sock"
+    ports:
+      - 50057:50057
+    networks:
+    - default
+    restart: unless-stopped
+
+
+  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 ${DOCKER_HOST_IP}:50057
+    networks:
+    - default
+    ports:
+    - "5022:22"
+
+
+  ofagent:
+    image: "${REGISTRY}${REPOSITORY}voltha-ofagent:latest"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    command: [
+      "/ofagent/ofagent/main.py",
+      "--consul=${DOCKER_HOST_IP}:8500",
+      "--controller=${DOCKER_HOST_IP}:6653",
+      "--grpc-endpoint=${DOCKER_HOST_IP}:50057",
+      "--instance-id-is-container-name",
+      "-v"
+    ]
+    volumes:
+    - "/var/run/docker.sock:/tmp/docker.sock"
+    networks:
+    - default
+    restart: unless-stopped
+
+
+  adapter_adtran_olt:
+    image: "${REGISTRY}${REPOSITORY}voltha-adapter-adtran-olt${TAG}"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    command: [
+      "/voltha/adapters/adtran_olt/main.py",
+      "-v",
+      "--name=adtran_olt",
+      "--kafka_adapter=${DOCKER_HOST_IP}:9092",
+      "--kafka_cluster=${DOCKER_HOST_IP}:9092",
+      "--backend=etcd",
+      "--etcd=${DOCKER_HOST_IP}:2379",
+      "--core_topic=rwcore"
+    ]
+    networks:
+    - default
+    restart: unless-stopped
+    depends_on:
+      - rw_core
+
+#  adapter_adtran_onu:
+#    image: "${REGISTRY}${REPOSITORY}voltha-adapter-adtran-onu${TAG}"
+#    logging:
+#      driver: "json-file"
+#      options:
+#        max-size: "10m"
+#        max-file: "3"
+#    command: [
+#      "/voltha/adapters/adtran_onu/main.py",
+#      "-v",
+#      "--name=adtran_onu",
+#      "--kafka_adapter=${DOCKER_HOST_IP}:9092",
+#      "--kafka_cluster=${DOCKER_HOST_IP}:9092",
+#      "--core_topic=rwcore"
+#    ]
+#    networks:
+#      - default
+#    restart: unless-stopped
+#    depends_on:
+#      - rw_core
+