diff --git a/compose/docker-compose-zk-kafka-test.yml b/compose/docker-compose-zk-kafka-test.yml
index 2cad1b8..30eea0a 100644
--- a/compose/docker-compose-zk-kafka-test.yml
+++ b/compose/docker-compose-zk-kafka-test.yml
@@ -13,11 +13,12 @@
   # Single-node kafka service
   #
   kafka:
-    image: "wurstmeister/kafka:latest"
+    image: "wurstmeister/kafka:1.1.0"
     ports:
      - 9092:9092
     environment:
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://10.100.198.220:9092
+#      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://10.100.198.220:9092
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://10.176.230.190:9092
       KAFKA_LISTENERS: PLAINTEXT://:9092
 #      KAFKA_ADVERTISED_HOST_NAME: 10.100.198.220
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
diff --git a/compose/ponsim-adapters.yml b/compose/ponsim-adapters.yml
new file mode 100644
index 0000000..fff3730
--- /dev/null
+++ b/compose/ponsim-adapters.yml
@@ -0,0 +1,41 @@
+version: '2'
+services:
+  ponsim_olt_adapter:
+    image: "${REGISTRY}${REPOSITORY}voltha-ponsim-adapter-olt${TAG}"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    command: [
+      "/adapters/adapters/ponsim_olt/main.py",
+      "-v",
+      "--name=ponsim_olt",
+      "--kafka_adapter=10.176.230.190:9092",
+      "--kafka_cluster=10.176.230.190:9092",
+      "--core_topic=rwcore"
+    ]
+    networks:
+    - default
+
+  ponsim_onu_adapter:
+    image: "${REGISTRY}${REPOSITORY}voltha-ponsim-adapter-onu${TAG}"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    command: [
+      "/adapters/adapters/ponsim_onu/main.py",
+      "-v",
+      "--name=ponsim_onu",
+      "--kafka_adapter=10.176.230.190:9092",
+      "--kafka_cluster=10.176.230.190:9092",
+      "--core_topic=rwcore"
+    ]
+    networks:
+    - default
+
+networks:
+  default:
+    driver: bridge
\ No newline at end of file
diff --git a/compose/ponsim.yml b/compose/ponsim.yml
new file mode 100644
index 0000000..fde48df
--- /dev/null
+++ b/compose/ponsim.yml
@@ -0,0 +1,57 @@
+version: '2'
+services:
+  ponsim_olt:
+    image: "${REGISTRY}${REPOSITORY}voltha-ponsim${TAG}"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    entrypoint:
+      - /app/ponsim
+      - -device_type
+      - "OLT"
+      - -onus
+      - "4"
+      - -internal_if
+      - "eth0"
+      - -external_if
+      - "eth0"
+      - -vcore_endpoint
+      - "vcore"
+      - -promiscuous
+      - -verbose
+    ports:
+      - "50060:50060"
+    networks:
+    - default
+
+  ponsim_onu:
+    image: "${REGISTRY}${REPOSITORY}voltha-ponsim${TAG}"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    entrypoint:
+      - /app/ponsim
+      - -device_type
+      - "ONU"
+      - -parent_addr
+      - "ponsim_olt"
+      - -grpc_port
+      - "50061"
+      - -internal_if
+      - "eth0"
+      - -external_if
+      - "lo"
+      - -promiscuous
+      - -verbose
+    ports:
+    - "50061:50061"
+    networks:
+    - default
+
+networks:
+  default:
+    driver: bridge
\ No newline at end of file
diff --git a/compose/ponsim_olt.yml b/compose/ponsim_olt.yml
new file mode 100644
index 0000000..be3f61e
--- /dev/null
+++ b/compose/ponsim_olt.yml
@@ -0,0 +1,31 @@
+version: '2'
+services:
+  ponsim_olt:
+    image: "${REGISTRY}${REPOSITORY}voltha-ponsim${TAG}"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    entrypoint:
+      - /app/ponsim
+      - -device_type
+      - "OLT"
+      - -onus
+      - "4"
+      - -internal_if
+      - "eth0"
+      - -external_if
+      - "eth0"
+      - -vcore_endpoint
+      - "vcore"
+      - -promiscuous
+      - -verbose
+    ports:
+      - "50060:50060"
+    networks:
+    - default
+
+networks:
+  default:
+    driver: bridge
\ No newline at end of file
diff --git a/compose/ponsim_onu.yml b/compose/ponsim_onu.yml
new file mode 100644
index 0000000..7462f11
--- /dev/null
+++ b/compose/ponsim_onu.yml
@@ -0,0 +1,31 @@
+version: '2'
+services:
+  ponsim_onu:
+    image: "${REGISTRY}${REPOSITORY}voltha-ponsim${TAG}"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    entrypoint:
+      - /app/ponsim
+      - -device_type
+      - "ONU"
+      - -parent_addr
+      - "ponsim_olt"
+      - -grpc_port
+      - "50061"
+      - -internal_if
+      - "eth0"
+      - -external_if
+      - "lo"
+      - -promiscuous
+      - -verbose
+    ports:
+    - "50061:50061"
+    networks:
+    - default
+
+networks:
+  default:
+    driver: bridge
\ No newline at end of file
diff --git a/compose/rw_core.yml b/compose/rw_core.yml
index a11f4a9..5df0147 100644
--- a/compose/rw_core.yml
+++ b/compose/rw_core.yml
@@ -10,6 +10,12 @@
         - -grpc_host=${DOCKER_HOST_IP}
         - -grpc_port=50057
         - -banner=true
+        - -kafka_adapter_host=10.176.230.190
+        - -kafka_adapter_port=9092
+        - -kafka_cluster_host=10.176.230.190
+        - -kafka_cluster_port=9092
+        - -rw_core_topic=rwcore
+        - -log_level=0
     ports:
       - "50057:50057"
     volumes: