diff --git a/pkg/build/build.go b/pkg/build/build.go
index 938b7259..d29f2a0b 100644
--- a/pkg/build/build.go
+++ b/pkg/build/build.go
@@ -29,7 +29,7 @@ func (b *Builder) Build() error {
 	log.Audit("Generating image customization components...")
 
 	if err := b.imageConfigurator.Configure(b.context); err != nil {
-		log.Audit("Error configuring customization components, check the logs under the build directory for more information.")
+		log.Audit("Error configuring customization components.")
 		return fmt.Errorf("configuring image: %w", err)
 	}
 
@@ -37,13 +37,13 @@ func (b *Builder) Build() error {
 	case image.TypeISO:
 		log.Audit("Building ISO image...")
 		if err := b.buildIsoImage(); err != nil {
-			log.Audit("Error building ISO image, check the logs under the build directory for more information.")
+			log.Audit("Error building ISO image.")
 			return err
 		}
 	case image.TypeRAW:
 		log.Audit("Building RAW image...")
 		if err := b.buildRawImage(); err != nil {
-			log.Audit("Error building RAW image, check the logs under the build directory for more information.")
+			log.Audit("Error building RAW image.")
 			return err
 		}
 	default:
diff --git a/pkg/cli/build/build.go b/pkg/cli/build/build.go
index dce73abf..24258f39 100644
--- a/pkg/cli/build/build.go
+++ b/pkg/cli/build/build.go
@@ -69,12 +69,13 @@ func Run(_ *cli.Context) error {
 
 	defer func() {
 		if r := recover(); r != nil {
-			log.AuditInfo("Build failed unexpectedly, check the logs under the build directory for more information.")
+			log.Auditf("Build failed unexpectedly. %s", checkBuildLogMessage)
 			zap.S().Fatalf("Unexpected error occurred: %s", r)
 		}
 	}()
 
 	if err = eib.Run(ctx, rootBuildDir); err != nil {
+		log.Audit(checkBuildLogMessage)
 		zap.S().Fatalf("An error occurred building the image: %s", err)
 	}
 
diff --git a/pkg/eib/eib.go b/pkg/eib/eib.go
index 4f0e34c5..585e83fb 100644
--- a/pkg/eib/eib.go
+++ b/pkg/eib/eib.go
@@ -25,6 +25,7 @@ import (
 
 func Run(ctx *image.Context, rootBuildDir string) error {
 	if err := appendKubernetesSELinuxRPMs(ctx); err != nil {
+		log.Auditf("Bootstrapping dependency services failed.")
 		return fmt.Errorf("configuring kubernetes selinux policy: %w", err)
 	}
 
@@ -33,6 +34,7 @@ func Run(ctx *image.Context, rootBuildDir string) error {
 
 	c, err := buildCombustion(ctx, rootBuildDir)
 	if err != nil {
+		log.Audit("Bootstrapping dependency services failed.")
 		return fmt.Errorf("building combustion: %w", err)
 	}