diff --git a/docker/containers/tactical-meshcentral/entrypoint.sh b/docker/containers/tactical-meshcentral/entrypoint.sh
index 4e15a3e7..aa1182ed 100644
--- a/docker/containers/tactical-meshcentral/entrypoint.sh
+++ b/docker/containers/tactical-meshcentral/entrypoint.sh
@@ -62,5 +62,11 @@ if [ ! -f "${TACTICAL_DIR}/tmp/mesh_token" ]; then
     node node_modules/meshcentral --logintokenkey > ${TACTICAL_DIR}/tmp/mesh_token
 fi
 
+# wait for nginx container
+until (echo > /dev/tcp/"${NGINX_HOST_IP}"/443) &> /dev/null; do
+  echo "waiting for nginx to start..."
+  sleep 5
+done
+
 # start mesh
 node node_modules/meshcentral
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index cec84e20..85ee32a3 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -51,6 +51,7 @@ services:
       POSTGRES_PASS: ${POSTGRES_PASS}
       APP_HOST: ${APP_HOST}
       API_HOST: ${API_HOST}
+      MESH_USER: ${MESH_USER}
       MESH_HOST: ${MESH_HOST}
       TRMM_USER: ${TRMM_USER}
       TRMM_PASS: ${TRMM_PASS}