diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile
index bd92cc8bc..4d9d102d5 100644
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -96,7 +96,8 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 # Entrypoint modifications
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
 RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
-RUN sed -i "s|/usr/bin/with-contenv|/usr/bin/env|g" /etc/cont-init.d/*
+RUN sed -i "s|/usr/bin/with-contenv|/usr/bin/env|g" /etc/cont-init.d/* && \
+    sed -i "s|/usr/bin/with-contenv|/usr/bin/env|g" /etc/services.d/*/run
 
 #WORKDIR /data
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/guacamole/config.json b/guacamole/config.json
index 67e3343f3..c0cfef299 100644
--- a/guacamole/config.json
+++ b/guacamole/config.json
@@ -100,6 +100,6 @@
   "slug": "guacamole",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.6.0-test5",
+  "version": "1.6.0-test6",
   "video": true
 }
diff --git a/guacamole/rootfs/etc/cont-init.d/99-run.sh b/guacamole/rootfs/etc/cont-init.d/99-run.sh
index a9bf588e2..0cb388cbf 100755
--- a/guacamole/rootfs/etc/cont-init.d/99-run.sh
+++ b/guacamole/rootfs/etc/cont-init.d/99-run.sh
@@ -1 +1,8 @@
 #!/bin/bash
+
+for files in /etc/services.d/*; do
+    if [[ -f /etc/services.d/$files/run ]]; then
+        chmod +x /etc/services.d/$files/run
+        /./etc/services.d/$files/run & sleep 10
+    fi
+done
diff --git a/guacamole/rootfs/usr/bin/with-contenv b/guacamole/rootfs/usr/bin/with-contenv
deleted file mode 100644
index 2e173ca93..000000000
--- a/guacamole/rootfs/usr/bin/with-contenv
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Use /bin/bash shebang because we don't want the container environment in here
-
-# Version 1
-# 2024-10-18 - Initial Release
-WITHCONTENV_VER="1.20241018"
-
-if [[ -f /run/s6/container_environment/UMASK ]] &&
-    { [[ "$(pwdx $$)" =~ "/run/s6/legacy-services/" ]] ||
-        [[ "$(pwdx $$)" =~ "/run/s6/services/" ]] ||
-        [[ "$(pwdx $$)" =~ "/servicedirs/svc-" ]]; }; then
-    umask "$(cat /run/s6/container_environment/UMASK)"
-fi
-exec /command/with-contenv "$@"