diff --git a/roles/windmill/templates/worker_entrypoint.sh.j2 b/roles/windmill/templates/worker_entrypoint.sh.j2
index 44bb9bf..3bd2279 100644
--- a/roles/windmill/templates/worker_entrypoint.sh.j2
+++ b/roles/windmill/templates/worker_entrypoint.sh.j2
@@ -14,6 +14,7 @@ podman run \
 	-e MODE=worker \
 	-e WORKER_GROUP=default \
 	-e ENABLE_UNSHARE_PID="true" \
+	-e UNSHARE_ISOLATION_FLAGS="--user --map-root-user --pid --fork" \
 	-v /tmp/storage-run-1000/podman/podman.sock:/var/run/docker.sock \
 	-v /worker-logs:/tmp/windmill/logs \
 	-v /worker-dependency-cache:/tmp/windmill/cache \
@@ -23,4 +24,4 @@ podman run \
 
 child=$!
 trap _term SIGTERM
-wait $!
+wait "$!"