diff --git a/compose/cli.yml b/compose/cli.yml
index e8ff4ee..2869329 100644
--- a/compose/cli.yml
+++ b/compose/cli.yml
@@ -26,7 +26,7 @@
       DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
     entrypoint:
     - /voltha/python/cli/setup.sh
-    - -g 192.168.0.14:50057
+    - -g ${DOCKER_HOST_IP}:50057
     networks:
     - default
     ports:
diff --git a/compose/rw_core.yml b/compose/rw_core.yml
index c5d39ce..8b164db 100644
--- a/compose/rw_core.yml
+++ b/compose/rw_core.yml
@@ -22,7 +22,6 @@
         - -kv_store_type=etcd
         - -kv_store_host=${DOCKER_HOST_IP}
         - -kv_store_port=2379
-        - -grpc_host=${DOCKER_HOST_IP}
         - -grpc_port=50057
         - -banner=true
         - -kafka_adapter_host=${DOCKER_HOST_IP}
@@ -32,7 +31,7 @@
         - -rw_core_topic=rwcore
         - -log_level=0
     ports:
-      - "50057:50057"
+      - 50057:50057
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
     networks: