diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/dependencies.d/init-services
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/finish b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/finish
new file mode 100755
index 0000000..7cf9745
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/finish
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+if [ -z "${LOGS_TO_STDOUT}" ]; then
+    exit 125
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run
new file mode 100755
index 0000000..d017df2
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run
@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bash
+
+if [ -n "${LOGS_TO_STDOUT}" ]; then
+    TAIL_LOGS=$(echo "$LOGS_TO_STDOUT" | sed 's#|# #g')
+    echo "Executing: tail -F $TAIL_LOGS"
+    tail -F $TAIL_LOGS
+else
+    echo "**** Env var LOGS_TO_STDOUT is not set, sleeping ****"
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/type b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/type
new file mode 100644
index 0000000..1780f9f
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/type
@@ -0,0 +1 @@
+longrun
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-universal-stdout-logs b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-universal-stdout-logs
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/services.d/stdout-logs/run b/root/etc/services.d/stdout-logs/run
old mode 100644
new mode 100755