diff --git a/compose/system-test-bbsim.yml b/compose/system-test-bbsim.yml
index 3370111..850dadd 100644
--- a/compose/system-test-bbsim.yml
+++ b/compose/system-test-bbsim.yml
@@ -76,16 +76,11 @@
     entrypoint:
       - /app/rw_core
       - -kv_store_type=etcd
-      - -kv_store_host=${DOCKER_HOST_IP}
-      - -kv_store_port=2379
-      - -grpc_port=50057
+      - -kv_store_address=${DOCKER_HOST_IP}:2379
       - -banner=true
-      - -kafka_adapter_host=${DOCKER_HOST_IP}
-      - -kafka_adapter_port=9092
-      - -kafka_cluster_host=${DOCKER_HOST_IP}
-      - -kafka_cluster_port=9092
+      - -kafka_adapter_address=${DOCKER_HOST_IP}:9092
+      - -kafka_cluster_address=${DOCKER_HOST_IP}:9092
       - -rw_core_topic=rwcore
-      - -kv_store_data_prefix=service/voltha
       - -in_competing_mode=false
       - -log_level=DEBUG
     volumes:
@@ -132,13 +127,10 @@
     image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-openolt-adapter:${DOCKER_TAG}"
     command: [
       "/app/openolt",
-      "--kafka_adapter_host=${DOCKER_HOST_IP}",
-      "--kafka_adapter_port=9092",
-      "--kafka_cluster_host=${DOCKER_HOST_IP}",
-      "--kafka_cluster_port=9092",
+      "--kafka_adapter_address=${DOCKER_HOST_IP}:9092",
+      "--kafka_cluster_address=${DOCKER_HOST_IP}:9092",
       "--core_topic=rwcore",
-      "--kv_store_host=${DOCKER_HOST_IP}",
-      "--kv_store_port=2379",
+      "--kv_store_address=${DOCKER_HOST_IP}:2379",
       "--log_level=DEBUG"
     ]
     ports:
@@ -165,6 +157,7 @@
     restart: unless-stopped
 
 
+
   bbsim:
     image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}bbsim:${DOCKER_TAG}"
     privileged: true
diff --git a/compose/system-test.yml b/compose/system-test.yml
index 5956f30..4923889 100644
--- a/compose/system-test.yml
+++ b/compose/system-test.yml
@@ -74,26 +74,21 @@
   rw_core:
     image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-rw-core:${DOCKER_TAG}"
     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=DEBUG
+      - /app/rw_core
+      - -kv_store_type=etcd
+      - -kv_store_address=${DOCKER_HOST_IP}:2379
+      - -banner=true
+      - -kafka_adapter_address=${DOCKER_HOST_IP}:9092
+      - -kafka_cluster_address=${DOCKER_HOST_IP}:9092
+      - -rw_core_topic=rwcore
+      - -in_competing_mode=false
+      - -log_level=DEBUG
     volumes:
-    - "/var/run/docker.sock:/tmp/docker.sock"
+      - "/var/run/docker.sock:/tmp/docker.sock"
     ports:
       - 50057:50057
     networks:
-    - default
+      - default
     restart: unless-stopped
 
 
@@ -132,19 +127,16 @@
     image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-openolt-adapter:${DOCKER_TAG}"
     command: [
       "/app/openolt",
-      "--kafka_adapter_host=${DOCKER_HOST_IP}",
-      "--kafka_adapter_port=9092",
-      "--kafka_cluster_host=${DOCKER_HOST_IP}",
-      "--kafka_cluster_port=9092",
+      "--kafka_adapter_address=${DOCKER_HOST_IP}:9092",
+      "--kafka_cluster_address=${DOCKER_HOST_IP}:9092",
       "--core_topic=rwcore",
-      "--kv_store_host=${DOCKER_HOST_IP}",
-      "--kv_store_port=2379",
+      "--kv_store_address=${DOCKER_HOST_IP}:2379",
       "--log_level=DEBUG"
     ]
     ports:
       - "50062:50062"
     networks:
-    - default
+      - default
     restart: unless-stopped