diff --git a/docker-compose.nodemicmac.yml b/docker-compose.nodemicmac.yml
index 7e7454ad..9ae37693 100644
--- a/docker-compose.nodemicmac.yml
+++ b/docker-compose.nodemicmac.yml
@@ -5,9 +5,10 @@
 version: '2.1'
 services:
   webapp:
-    entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh -t 0 broker:6379 -- /webodm/start.sh --create-micmac-pnode\""
     depends_on:
       - node-micmac-1
+    environment:
+      - WO_CREATE_MICMAC_PNODE=YES
   node-micmac-1:
     image: dronemapper/node-micmac
     container_name: node-micmac-1
diff --git a/docker-compose.nodeodm.yml b/docker-compose.nodeodm.yml
index 472e0a28..7a178c46 100644
--- a/docker-compose.nodeodm.yml
+++ b/docker-compose.nodeodm.yml
@@ -5,9 +5,10 @@
 version: '2.1'
 services:
   webapp:
-    entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh -t 0 broker:6379 -- /webodm/start.sh --create-default-pnode\""
     depends_on:
       - node-odm-1
+    environment:
+      - WO_CREATE_DEFAULT_PNODE=YES
   node-odm-1:
     image: opendronemap/nodeodm
     container_name: node-odm-1
diff --git a/start.sh b/start.sh
index 9da78df0..23e8a33d 100755
--- a/start.sh
+++ b/start.sh
@@ -57,11 +57,11 @@ fi
 echo Running migrations
 python manage.py migrate
 
-if [[ "$1" = "--create-default-pnode" ]]; then
+if [[ "$WO_CREATE_DEFAULT_PNODE" = "YES" ]]; then
    echo "from nodeodm.models import ProcessingNode; ProcessingNode.objects.update_or_create(hostname='node-odm-1', defaults={'hostname': 'node-odm-1', 'port': 3000})" | python manage.py shell
 fi
 
-if [[ "$1" = "--create-micmac-pnode" ]]; then
+if [[ "$WO_CREATE_MICMAC_PNODE" = "YES" ]]; then
    echo "from nodeodm.models import ProcessingNode; ProcessingNode.objects.update_or_create(hostname='node-micmac-1', defaults={'hostname': 'node-micmac-1', 'port': 3000})" | python manage.py shell
 fi