diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 41a6357a53f3ec00fa7949bdf0a828c12f1cfe72..d1fb399959534c3d4a32d1e1a4b9b39a5e518825 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -408,14 +408,7 @@ if [ "x${deb_arch}" = "xarmhf" ] ; then
 		;;
 	ubuntu)
 		case "${deb_codename}" in
-		xenial)
-			#while bb-customizations installes "generic-board-startup.service" other boards/configs could use this default.
-			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/systemd-capemgr.service" "${tempdir}/lib/systemd/system/capemgr.service"
-			sudo cp "${OIB_DIR}/target/init_scripts/capemgr" "${tempdir}/etc/default/"
-			distro="Ubuntu"
-			;;
-		*)
+		trusty)
 			sudo cp "${OIB_DIR}/target/init_scripts/generic-${deb_distribution}.conf" "${tempdir}/etc/init/generic-boot-script.conf"
 			sudo cp "${OIB_DIR}/target/init_scripts/capemgr-${deb_distribution}.sh" "${tempdir}/etc/init/capemgr.sh"
 			sudo cp "${OIB_DIR}/target/init_scripts/capemgr" "${tempdir}/etc/default/"
@@ -428,6 +421,13 @@ if [ "x${deb_arch}" = "xarmhf" ] ; then
 				sudo sed -i -e 's:sleep 59:#sleep 59:g' "${tempdir}/etc/init/failsafe.conf"
 			fi
 			;;
+		vivid|wily|xenial)
+			#while bb-customizations installes "generic-board-startup.service" other boards/configs could use this default.
+			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/systemd-capemgr.service" "${tempdir}/lib/systemd/system/capemgr.service"
+			sudo cp "${OIB_DIR}/target/init_scripts/capemgr" "${tempdir}/etc/default/"
+			distro="Ubuntu"
+			;;
 		esac
 		;;
 	esac