diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index ed9c4516..f59aa789 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,6 +1,6 @@
 version: '2'
 services:
   webapp:
-    entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /webodm/wait-for-it.sh db:5432 -- /webodm/start.sh --create-default-pnode --setup-devenv"
+    entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-it.sh db:5432 -- /webodm/start.sh --create-default-pnode --setup-devenv\""
     volumes:
       - .:/webodm
diff --git a/docker-compose.nodeodm.yml b/docker-compose.nodeodm.yml
index e9b8b8f1..32798a16 100644
--- a/docker-compose.nodeodm.yml
+++ b/docker-compose.nodeodm.yml
@@ -5,7 +5,7 @@
 version: '2'
 services:
   webapp:
-    entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /webodm/wait-for-it.sh db:5432 -- /webodm/start.sh --create-default-pnode"
+    entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c "/webodm/wait-for-it.sh db:5432 -- /webodm/start.sh --create-default-pnode\""
     depends_on:
       - node-odm-1
   node-odm-1: