diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/chromium-ozone-wayland-init.initd b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/chromium-ozone-wayland-init.initd
index bdd445a..d37031f 100644
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/chromium-ozone-wayland-init.initd
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/chromium-ozone-wayland-init.initd
@@ -17,7 +17,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 DESC="chromium-browser"
 NAME="chromium-ozone-wayland"
-DAEMON=/usr/bin/$NAME
+DAEMON=/usr/bin/chromium
 CHROMIUM_ARGS=""
 PIDFILE=/var/run/$NAME.pid
 
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb
index a46cdb1..d9ea484 100644
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb
@@ -33,7 +33,7 @@ CHROMIUM_EXTRA_ARGS ?= ""
 SYSTEMD_SERVICE:${PN} = "chromium-ozone-wayland.service"
 
 # Start after weston-init
-INITSCRIPT_NAME = "${BPM}"
+INITSCRIPT_NAME = "chromium-ozone-wayland"
 INITSCRIPT_PARAMS = "start 10 5 2 . stop 19 0 1 6 ."
 
 do_configure[noexec] = "1"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/qt-kiosk-browser-init.initd b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/qt-kiosk-browser-init.initd
index ee415b8..aba5469 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/qt-kiosk-browser-init.initd
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/qt-kiosk-browser-init.initd
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ### BEGIN INIT INFO
-# Provides:         $NAME
+# Provides:         qt-kiosk-browser
 # Required-Start:   $remote_fs $syslog
 # Required-Stop:    $remote_fs $syslog
 # Default-Start:    2 3 4 5
@@ -11,13 +11,20 @@
 set -e
 
 DESC="Qt kiosk browser init"
-NAME="qt-kiosk-browser-init"
+NAME="qt-kiosk-browser"
 DAEMON=/usr/bin/$NAME
 DAEMON_ARGS="--platform wayland /etc/$NAME.conf --no-sandbox"
 PIDFILE=/var/run/$NAME.pid
 
 test -x ${DAEMON} || exit 0
 
+# Same environment as the systemd unit's EnvironmentFile
+if [ -r /etc/default/$NAME ]; then
+    set -a
+    . /etc/default/$NAME
+    set +a
+fi
+
 umask 022
 
 . /etc/init.d/functions
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb
index 813e76c..3303558 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb
@@ -40,7 +40,7 @@ INITSCRIPT_NAME = "qt-kiosk-browser"
 
 do_install() {
     if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
-        install -Dm 0755 ${UNPACKDIR}/${PN}.initd ${D}${sysconfdir}/init.d/kiosk
+        install -Dm 0755 ${UNPACKDIR}/${PN}.initd ${D}${sysconfdir}/init.d/qt-kiosk-browser
     fi
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -Dm 0644 ${UNPACKDIR}/${PN}.service ${D}${systemd_system_unitdir}/qt-kiosk-browser.service