diff --git a/INITIAL-COMMANDS.md b/INITIAL-COMMANDS.md
index 787c11e..374f716 100644
--- a/INITIAL-COMMANDS.md
+++ b/INITIAL-COMMANDS.md
@@ -45,9 +45,6 @@ Run the complete base installation:
       };
       :put "Loading configuration and functions...";
       /system/script { run global-config; run global-functions; };
-      :put "Scheduling to load configuration and functions...";
-      /system/scheduler/remove [ find where name="global-scripts" ];
-      /system/scheduler/add name="global-scripts" start-time=startup on-event="/system/script { run global-config; run global-functions; }";
       :if ([ :len [ /certificate/find where fingerprint=$CertFingerprint ] ] > 0) do={
         :put "Renaming certificate by its common-name...";
         :global CertificateNameByCN;
diff --git a/Makefile b/Makefile
index 3d428ba..bd6d302 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ DATE		?= $(shell date --rfc-email)
 VERSION		?= $(shell git symbolic-ref --short HEAD 2>/dev/null)/$(shell git rev-list --count HEAD 2>/dev/null)/$(shell git rev-parse --short=8 HEAD 2>/dev/null)
 export DATE VERSION
 
-.PHONY: all checksums docs rsc clean
+.PHONY: all checksums commitinfo docs rsc clean
 
 all: checksums docs rsc
 
@@ -21,6 +21,10 @@ checksums: checksums.json
 checksums.json: contrib/checksums.sh $(ALL_RSC)
 	contrib/checksums.sh > $@
 
+commitinfo: global-functions.rsc
+	contrib/commitinfo.sh $< > $<~
+	mv $<~ $<
+
 docs: $(HTML)
 
 %.html: %.md general/style.css contrib/html.sh contrib/html.sh.d/head.html
diff --git a/README.d/05-run-and-schedule-scripts.avif b/README.d/05-run-and-schedule-scripts.avif
deleted file mode 100644
index 37e1173..0000000
Binary files a/README.d/05-run-and-schedule-scripts.avif and /dev/null differ
diff --git a/README.d/05-run-scripts.avif b/README.d/05-run-scripts.avif
new file mode 100644
index 0000000..e3b8b8b
Binary files /dev/null and b/README.d/05-run-scripts.avif differ
diff --git a/README.md b/README.md
index af9ef65..d8047d0 100644
--- a/README.md
+++ b/README.md
@@ -129,12 +129,12 @@ Now let's download the main scripts and add them in configuration on the fly.
 
 ![screenshot: import scripts](README.d/04-import-scripts.avif)
 
-And finally load configuration and functions and add the scheduler.
+And finally run configuration and functions. This will also add the
+scheduler for loading at system startup automatically.
 
     /system/script { run global-config; run global-functions; };
-    /system/scheduler/add name="global-scripts" start-time=startup on-event="/system/script { run global-config; run global-functions; }";
 
-![screenshot: run and schedule scripts](README.d/05-run-and-schedule-scripts.avif)
+![screenshot: run scripts](README.d/05-run-scripts.avif)
 
 > 💡️ **Hint**: You see complaints regarding syntax errors? Most likely the
 > RouterOS on your device is too old. Check for updates!
diff --git a/contrib/commitinfo.sh b/contrib/commitinfo.sh
new file mode 100755
index 0000000..21faf9f
--- /dev/null
+++ b/contrib/commitinfo.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+sed \
+	-e "/^:global CommitId/c :global CommitId \"${COMMITID:-unknown}\";" \
+	-e "/^:global CommitInfo/c :global CommitInfo \"${COMMITINFO:-unknown}\";" \
+	< "${1}"
diff --git a/global-functions.rsc b/global-functions.rsc
index dccb8b6..db9eac6 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1900,6 +1900,15 @@
   }
 }
 
+# add (and fix) global scripts scheduler
+:local OnEvent "/system/script { run global-config; run global-functions; }";
+:if ([ :len [ /system/scheduler/find where name="global-scripts" ] ] = 0) do={
+  /system/scheduler/add name="global-scripts" start-time=startup;
+}
+:if ([ /system/scheduler/get "global-scripts" on-event ] != $OnEvent) do={
+  /system/scheduler/set "global-scripts" on-event=$OnEvent;
+}
+
 # Log success
 :local Resource [ /system/resource/get ];
 $LogPrintOnce info $ScriptName ("Loaded on " . $Resource->"board-name" . \