diff --git a/lib/functions/cli/cli-docker.sh b/lib/functions/cli/cli-docker.sh
index 9d645e61bb..be3710cd4e 100644
--- a/lib/functions/cli/cli-docker.sh
+++ b/lib/functions/cli/cli-docker.sh
@@ -19,14 +19,15 @@ function cli_docker_run() {
 
 	LOG_SECTION="docker_cli_prepare" do_with_logging docker_cli_prepare
 
-	if [[ "${DOCKERFILE_GENERATE_ONLY}" == "yes" ]]; then
-		display_alert "Dockerfile generated" "exiting" "info"
-		exit 0
-	fi
-
 	# @TODO: and can be very well said that in CI, we always want FAST_DOCKER=yes, unless we're building the Docker image itself.
 	if [[ "${FAST_DOCKER:-"no"}" != "yes" ]]; then # "no, I want *slow* docker" -- no one, ever
 		LOG_SECTION="docker_cli_prepare_dockerfile" do_with_logging docker_cli_prepare_dockerfile
+
+		if [[ "${DOCKERFILE_GENERATE_ONLY}" == "yes" ]]; then
+			display_alert "Dockerfile generated" "exiting" "info"
+			exit 0
+		fi
+
 		LOG_SECTION="docker_cli_build_dockerfile" do_with_logging docker_cli_build_dockerfile
 	fi
 
diff --git a/lib/functions/logging/export-logs.sh b/lib/functions/logging/export-logs.sh
index 48e7411a7d..6efaf7bbe0 100644
--- a/lib/functions/logging/export-logs.sh
+++ b/lib/functions/logging/export-logs.sh
@@ -146,7 +146,7 @@ function export_ansi_logs() {
 	declare target_relative_to_src
 	target_relative_to_src="$(realpath --relative-to="${SRC}" "${target_file}")"
 
-	if [[ "${show_message_after_export:-"yes"}" != "skip" ]]; then
+	if [[ "${show_message_after_export:-"yes"}" != "skip" && "${ARMBIAN_INSIDE_DOCKERFILE_BUILD:-"no"}" != "yes" ]]; then
 		display_alert "ANSI log file built; inspect it by running:" "less -RS ${target_relative_to_src}"
 		display_alert "Share log (beta 2!)" "curl --data-binary @${target_relative_to_src} https://paste.next.armbian.com/log"
 		# @TODO: compress; have a CLI cmd to upload; also render Markdown logs, etc