diff --git a/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml b/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml
index c74fd543..22952d1f 100755
--- a/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml
+++ b/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       - /opt/carma/logs:/opt/carma/logs
       - /opt/carma/.ros:/home/carma/.ros
     # Use the dynamic_bridge instead of the parameter bridge as the number of topics is small enough to pose less of a latency issue
-    command: bash -c 'wait-for-it.sh localhost:11311 -- rosparam load /opt/carma/vehicle/config/bridge.yml && source ~/.base-image/workspace/install/setup.bash && ros2 run ros1_bridge dynamic_bridge --multi-threads'
+    command: bash -c 'wait-for-it localhost:11311 -- rosparam load /opt/carma/vehicle/config/bridge.yml && source ~/.base-image/workspace/install/setup.bash && ros2 run ros1_bridge dynamic_bridge --multi-threads'
 
   messenger:
     image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
@@ -53,7 +53,7 @@ services:
     volumes:
       - /opt/carma/logs:/opt/carma/logs
       - /opt/carma/.ros:/opt/carma/.ros
-    command: wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma-messenger-docker.launch
+    command: wait-for-it localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma-messenger-docker.launch
 
   messenger_ros2:
     image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
diff --git a/carma-messenger-config/development/docker-compose.yml b/carma-messenger-config/development/docker-compose.yml
index 8320238f..425f3115 100755
--- a/carma-messenger-config/development/docker-compose.yml
+++ b/carma-messenger-config/development/docker-compose.yml
@@ -37,7 +37,7 @@ services:
       - /opt/carma/logs:/opt/carma/logs
       - /opt/carma/.ros:/home/carma/.ros
     # Use the dynamic_bridge instead of the parameter bridge as the number of topics is small enough to pose less of a latency issue
-    command: bash -c 'wait-for-it.sh localhost:11311 -- rosparam load /opt/carma/vehicle/config/bridge.yml && source ~/.base-image/workspace/install/setup.bash && ros2 run ros1_bridge dynamic_bridge --multi-threads'
+    command: bash -c 'wait-for-it localhost:11311 -- rosparam load /opt/carma/vehicle/config/bridge.yml && source ~/.base-image/workspace/install/setup.bash && ros2 run ros1_bridge dynamic_bridge --multi-threads'
 
   messenger:
     image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
@@ -49,7 +49,7 @@ services:
       - /opt/carma/logs:/opt/carma/logs
       - /opt/carma/.ros:/opt/carma/.ros
       - /opt/carma/vehicle:/opt/carma/vehicle
-    command: wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma-messenger-docker.launch
+    command: wait-for-it localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma-messenger-docker.launch
 
   messenger_ros2:
     image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
diff --git a/carma-messenger-core/Dockerfile b/carma-messenger-core/Dockerfile
index 4ab0f88c..264cc1e8 100755
--- a/carma-messenger-core/Dockerfile
+++ b/carma-messenger-core/Dockerfile
@@ -45,4 +45,4 @@ RUN sudo chmod -R +x /opt/carma/install
 
 RUN pip install future
 
-CMD  [ "wait-for-it.sh", "localhost:11311", "--", "roslaunch", "carma-messenger", "carma-messenger.launch"]
+CMD  [ "wait-for-it", "localhost:11311", "--", "roslaunch", "carma-messenger", "carma-messenger.launch"]