diff --git a/debian/bluecherry.service b/debian/bluecherry.service
new file mode 100644
index 00000000..5c70d440
--- /dev/null
+++ b/debian/bluecherry.service
@@ -0,0 +1,27 @@
+[Unit]
+Documentation=man:systemd-sysv-generator(8)
+Description=LSB: Bluecherry DVR Server
+Before=multi-user.target
+Before=multi-user.target
+Before=multi-user.target
+Before=graphical.target
+After=remote-fs.target
+
+[Service]
+Type=forking
+Restart=on-failure
+RestartSec=5s
+PIDFile=/var/run/bluecherry/pid
+OOMScoreAdjust=-100
+TimeoutStartSec=5min
+TimeoutStopSec=30s
+WorkingDirectory=/usr/share/bluecherry
+Environment=DAEMONUSER=bluecherry
+Environment=DAEMONGROUP=bluecherry
+Environment=DAEMON_ARGS="-s -u $DAEMONUSER -g $DAEMONGROUP"
+IgnoreSIGPIPE=no
+KillMode=process
+RemainAfterExit=no
+SuccessExitStatus=0
+ExecStart=sh bluecherry.sh start
+ExecStop=sh bluecherry.sh stop
diff --git a/scripts/bluecherry.sh b/scripts/bluecherry.sh
new file mode 100644
index 00000000..dd8a6b87
--- /dev/null
+++ b/scripts/bluecherry.sh
@@ -0,0 +1,122 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          bluecherry
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Bluecherry DVR Server
+# Description:       Bluecherry DVR Server
+### END INIT INFO
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Bluecherry DVR Server"
+NAME=bc-server
+DAEMON=/usr/sbin/$NAME
+DAEMONUSER=bluecherry
+DAEMONGROUP=bluecherry
+DAEMON_ARGS="-s -u $DAEMONUSER -g $DAEMONGROUP"
+PIDDIR=/var/run/bluecherry
+PIDFILE=$PIDDIR/pid
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	mkdir -p "$PIDDIR"
+	chown "$DAEMONUSER:$DAEMONUSER" "$PIDDIR"
+
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon -qtSp $PIDFILE -x $DAEMON > /dev/null || return 1
+	start-stop-daemon -qSbmp $PIDFILE -x $DAEMON -- $DAEMON_ARGS \
+	|| return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon -qKR TERM/30/KILL/5 -p $PIDFILE -n $NAME
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	# Wait for children to finish too if this is a daemon that forks
+	# and if the daemon is only ever run from this initscript.
+	# If the above conditions are not satisfied then add some other code
+	# that waits for the process to drop all resources that could be
+	# needed by services started subsequently.  A last resort is to
+	# sleep for some time.
+	start-stop-daemon -qKoR 0/30/KILL/5 -x $DAEMON
+	[ "$?" = 2 ] && return 2
+
+	rm -f $PIDFILE
+	sleep 3
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	[ "$VERBOSE" != no ] && case "$?" in
+		0|1) log_end_msg 0 ;;
+		2)   log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	[ "$VERBOSE" != no ] && case "$?" in
+		0|1) log_end_msg 0 ;;
+		2)   log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME"
+       exit
+       ;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		log_end_msg "$?"
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:
diff --git a/scripts/build-scripts-docker/build b/scripts/build-scripts-docker/build
old mode 100644
new mode 100755
diff --git a/scripts/build-scripts-docker/build-helper.sh b/scripts/build-scripts-docker/build-helper.sh
old mode 100644
new mode 100755
diff --git a/scripts/build-scripts-docker/output/focal/x86_64/bluecherry-dbg_3.1.0-rc6_amd64.deb b/scripts/build-scripts-docker/output/focal/x86_64/bluecherry-dbg_3.1.0-rc6_amd64.deb
new file mode 100644
index 00000000..3af02696
Binary files /dev/null and b/scripts/build-scripts-docker/output/focal/x86_64/bluecherry-dbg_3.1.0-rc6_amd64.deb differ
diff --git a/scripts/build-scripts-docker/output/focal/x86_64/bluecherry_3.1.0-rc6_amd64.deb b/scripts/build-scripts-docker/output/focal/x86_64/bluecherry_3.1.0-rc6_amd64.deb
new file mode 100644
index 00000000..4f3a9490
Binary files /dev/null and b/scripts/build-scripts-docker/output/focal/x86_64/bluecherry_3.1.0-rc6_amd64.deb differ
diff --git a/scripts/build_helper/post_make_install.sh b/scripts/build_helper/post_make_install.sh
index 78ac5006..18b3b3fc 100755
--- a/scripts/build_helper/post_make_install.sh
+++ b/scripts/build_helper/post_make_install.sh
@@ -21,6 +21,7 @@ cp    ${SRC_PATH}/misc/postinstall.sh ${DST_DIR}/usr/share/bluecherry/
 cp    ${SRC_PATH}/misc/bc_db_tool.sh ${DST_DIR}/usr/share/bluecherry/
 cp    ${SRC_PATH}/misc/drop_licenses.sh ${DST_DIR}/usr/share/bluecherry/
 cp    ${SRC_PATH}/misc/remove_all_data.sh ${DST_DIR}/usr/share/bluecherry/
+cp    ${SRC_PATH}/scripts/bluecherry.sh ${DST_DIR}/usr/share/bluecherry/
 install -d ${DST_DIR}/usr/share/bluecherry/scripts
 install ${SRC_PATH}/scripts/build_helper/get_distro_release_name.sh \
 	${DST_DIR}/usr/share/bluecherry/scripts