diff --git a/docker/shared/root/docker/entrypoint.d/11-first-time-setup.sh b/docker/shared/root/docker/entrypoint.d/11-first-time-setup.sh
index f9fd6a61..6778bd90 100755
--- a/docker/shared/root/docker/entrypoint.d/11-first-time-setup.sh
+++ b/docker/shared/root/docker/entrypoint.d/11-first-time-setup.sh
@@ -3,6 +3,16 @@ source /docker/helpers.sh
 
 entrypoint-set-script-name "$0"
 
+# Allow automatic applying of outstanding/new migrations on startup
+: ${DOCKER_RUN_ONE_TIME_SETUP_TASKS:=1}
+
+if is-false "${DOCKER_RUN_ONE_TIME_SETUP_TASKS}"; then
+    log-warning "Automatic run of the 'One-time setup tasks' is disabled."
+    log-warning "Please set [DOCKER_RUN_ONE_TIME_SETUP_TASKS=1] in your [.env] file to enable this."
+
+    exit 0
+fi
+
 load-config-files
 await-database-ready