diff --git a/src/php/common/rootfs/usr/local/utils/s6-service b/src/php/common/rootfs/usr/local/utils/s6-service
index aa4b5e57..d3e3d5e9 100755
--- a/src/php/common/rootfs/usr/local/utils/s6-service
+++ b/src/php/common/rootfs/usr/local/utils/s6-service
@@ -9,6 +9,10 @@
 # service dirs
 s6="/etc/s6-overlay/s6-rc.d"
 disabled_s6="/etc/s6-overlay/s6-rc.d.disabled"
+user_bundle="${s6}/user"
+
+# s6-overlay 3.2.3.1 moved user bundle definitions outside s6-rc.d.
+[ -d "/etc/s6-overlay/user-bundles.d/user" ] && user_bundle="/etc/s6-overlay/user-bundles.d/user"
 
 # show help if no args or help flag
 case "$1" in
@@ -49,7 +53,7 @@ create() {
 hook_name="s6-exit-$(printf '%s' "$name" | tr -d '~')"
 svc_path="${s6}/${name}"
 deps_path="${s6}/${name}/dependencies.d"
-flag_path="${s6}/user/contents.d/${name}"
+flag_path="${user_bundle}/contents.d/${name}"
 
 # load file content if param is a file
 [ -n "$1" ] && [ -f "$1" ] && set -- "$(cat "$1")"