diff --git a/root/usr/bin/with-contenv b/root/usr/bin/with-contenv
index e26f8f4..212d908 100755
--- a/root/usr/bin/with-contenv
+++ b/root/usr/bin/with-contenv
@@ -1,7 +1,9 @@
 #! /bin/bash
-if [[ -f /var/run/s6/container_environment/UMASK ]] && [[ "$(pwdx $$)" =~ "/run/s6/services/" ]]; then
-  umask $(cat /var/run/s6/container_environment/UMASK)
-  exec /command/with-contenv "$@"
-else
-  exec /command/with-contenv "$@"
+
+if [[ -f /var/run/s6/container_environment/UMASK ]] && \
+    { [[ "$(pwdx $$)" =~ "/run/s6/legacy-services/" ]] || \
+    [[ "$(pwdx $$)" =~ "/run/s6/services/" ]] || \
+    [[ "$(pwdx $$)" =~ "/servicedirs/svc-" ]]; }; then
+    umask $(cat /var/run/s6/container_environment/UMASK)
 fi
+exec /command/with-contenv "$@"