diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 9ac6ed64f5e266ed3b1390c582a189359858991c..92be2d6546adf8a1d9ac998b82729a688e8f9902 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -385,8 +385,7 @@ debian)
 		;;
 	jessie|stretch)
 		sudo cp ${OIB_DIR}/target/init_scripts/systemd-generic-board-startup.service ${tempdir}/lib/systemd/system/generic-board-startup.service
-
-		sudo cp ${OIB_DIR}/target/init_scripts/capemgr-${deb_distribution}.sh ${tempdir}/etc/init.d/capemgr.sh
+		sudo cp ${OIB_DIR}/target/init_scripts/systemd-capemgr.service ${tempdir}/lib/systemd/system/capemgr.service
 		sudo cp ${OIB_DIR}/target/init_scripts/capemgr ${tempdir}/etc/default/
 		distro="Debian"
 		;;
@@ -736,6 +735,10 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 			systemctl enable generic-board-startup.service || true
 		fi
 
+		if [ -f /lib/systemd/system/capemgr.service ] ; then
+			systemctl enable capemgr.service || true
+		fi
+
 		if [ ! "x${rfs_opt_scripts}" = "x" ] ; then
 			mkdir -p /opt/scripts/ || true
 
diff --git a/target/init_scripts/systemd-capemgr.service b/target/init_scripts/systemd-capemgr.service
new file mode 100644
index 0000000000000000000000000000000000000000..9c1880e1e37a93783d89f932f4be5e40b6eab15a
--- /dev/null
+++ b/target/init_scripts/systemd-capemgr.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Cape Manager Service
+After=local-fs.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh /opt/scripts/boot/capemgr.sh
+
+[Install]
+WantedBy=multi-user.target