diff --git a/root/etc/cont-init.d/100-es-config.sh b/root/etc/cont-init.d/100-es-config.sh
index c0c65c1..8422f59 100644
--- a/root/etc/cont-init.d/100-es-config.sh
+++ b/root/etc/cont-init.d/100-es-config.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 . "/usr/local/bin/logger"
 program_name="es-config"
 
diff --git a/root/etc/cont-init.d/105-es-certificate-gen.sh b/root/etc/cont-init.d/105-es-certificate-gen.sh
index d0295b0..7b76626 100644
--- a/root/etc/cont-init.d/105-es-certificate-gen.sh
+++ b/root/etc/cont-init.d/105-es-certificate-gen.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 . "/usr/local/bin/logger"
 program_name="es-certificate-gen"
 
diff --git a/root/etc/mariadbconfigure.d/20-es-config.sh b/root/etc/mariadbconfigure.d/20-es-config.sh
index f334c80..10ee649 100644
--- a/root/etc/mariadbconfigure.d/20-es-config.sh
+++ b/root/etc/mariadbconfigure.d/20-es-config.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 . "/usr/local/bin/logger"
 # ==============================================================================
 # es-config
diff --git a/root/etc/services.d/zmeventnotification/finish b/root/etc/services.d/zmeventnotification/finish
index e4aa11e..d5a7fbe 100644
--- a/root/etc/services.d/zmeventnotification/finish
+++ b/root/etc/services.d/zmeventnotification/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 . "/usr/local/bin/logger"
 # ==============================================================================
 # ZM Event Notification Server
diff --git a/root/etc/services.d/zmeventnotification/log/run b/root/etc/services.d/zmeventnotification/log/run
index 3e2a20c..5600277 100644
--- a/root/etc/services.d/zmeventnotification/log/run
+++ b/root/etc/services.d/zmeventnotification/log/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 program_name="zmeventnotification-service"
 
 s6-format-filter "%1 %s" "[${program_name}]" | logutil-service /log/"${program_name}"
diff --git a/root/etc/services.d/zmeventnotification/run b/root/etc/services.d/zmeventnotification/run
index 6ba7445..b3532d1 100644
--- a/root/etc/services.d/zmeventnotification/run
+++ b/root/etc/services.d/zmeventnotification/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 . "/usr/local/bin/logger"
 # ==============================================================================
 # ZM Event Notification Server
@@ -13,7 +13,7 @@ if [ "${ES_DEBUG_ENABLED}" -eq 1 ]; then
 fi
 
 echo "Waiting for ZoneMinder to start" | info
-/bin/s6-svwait -U /var/run/s6/services/zoneminder
+s6-svwait -U /run/service/zoneminder
 
 echo "Starting Event Server..." | info
 fdmove -c 1 3 \