diff --git a/Dockerfile b/Dockerfile
index f56490c6d196bb8aacdea1be5bbb8d1d8ba9c964..f95691fd835bea62e84d116cd0ab5767f0863a63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -99,6 +99,7 @@ RUN \
 	/app \
 	/config \
 	/defaults && \
+ mv /usr/bin/with-contenv /usr/bin/with-contenvb && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index dff27696a6d5380a36f8692d2d627d78fb527027..bc2a1f5316555a7855e3f23da02629a489e4e5e7 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -99,6 +99,7 @@ RUN \
 	/app \
 	/config \
 	/defaults && \
+ mv /usr/bin/with-contenv /usr/bin/with-contenvb && \
  echo "**** add qemu ****" && \
  curl -o \
  /usr/bin/qemu-aarch64-static -L \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index e9c989c66cebe579b0ea463f4dc47260bfd80a2f..e334f1b7107f7fc8de98bea5973610af0106adfe 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -99,6 +99,7 @@ RUN \
 	/app \
 	/config \
 	/defaults && \
+ mv /usr/bin/with-contenv /usr/bin/with-contenvb && \
  echo "**** add qemu ****" && \
  curl -o \
  /usr/bin/qemu-arm-static -L \
diff --git a/root/usr/bin/with-contenv b/root/usr/bin/with-contenv
new file mode 100644
index 0000000000000000000000000000000000000000..b535def003273b98208c51bd30d6ebf21dab2916
--- /dev/null
+++ b/root/usr/bin/with-contenv
@@ -0,0 +1,7 @@
+#! /bin/bash
+if [[ -f /var/run/s6/container_environment/UMASK ]] && [[ "$(pwdx $$)" =~ "/run/s6/services/" ]]; then
+  umask $(cat /var/run/s6/container_environment/UMASK)
+  exec /usr/bin/with-contenvb "$@"
+else
+  exec /usr/bin/with-contenvb "$@"
+fi