diff --git a/root/cronjob.sh b/root/cronjob.sh
index 1854773..d248ac7 100755
--- a/root/cronjob.sh
+++ b/root/cronjob.sh
@@ -12,6 +12,11 @@ exec 1> >(prepend "[cronjob.sh] ")
 LOCK_DIR=/tmp/xteve/.cronjob.lock
 mkdir -p /tmp/xteve
 
+BOOTSTRAP_ONLY="${bootstrap_only:-no}"
+if [ "${1:-}" = "--bootstrap-only" ]; then
+	BOOTSTRAP_ONLY="yes"
+fi
+
 if ! mkdir "$LOCK_DIR" 2>/dev/null; then
 	echo "Another cronjob instance is already running, exiting."
 	exit 0
@@ -155,7 +160,7 @@ fi
 
 sleep 1
 
-if [ "${bootstrap_only:-no}" = "yes" ]; then
+if [ "$BOOTSTRAP_ONLY" = "yes" ]; then
 	echo "Bootstrap mode enabled, skipping xTeVe/Emby/Plex/Channels API updates."
 	exit 0
 fi
diff --git a/root/etc/cont-init.d/99-firstrun b/root/etc/cont-init.d/99-firstrun
index 29b5ab5..6ae8ddb 100644
--- a/root/etc/cont-init.d/99-firstrun
+++ b/root/etc/cont-init.d/99-firstrun
@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv bash
 
-bootstrap_only=yes /cronjob.sh
+/cronjob.sh --bootstrap-only