diff --git a/pkg/maker/superlists.go b/pkg/maker/superlists.go
index 45e6c0f..3716337 100644
--- a/pkg/maker/superlists.go
+++ b/pkg/maker/superlists.go
@@ -47,19 +47,23 @@ func (m *Maker) CreateSuperCMakeLists() error {
 		contextOutputs += ")"
 	}
 
-	var westContexts, westContextCheck, westTarget string
+	var westContexts, westContextCheck, westTarget, excludeFromMain string
 	if west {
 		westContexts = "\nset(WEST_CONTEXTS\n" + westContextFlags + ")\n"
 		westContextCheck = "\n  list(GET WEST_CONTEXTS ${INDEX} WEST_CONTEXT)\n  if(WEST_CONTEXT)\n    set(WEST_TARGET \"--target west\")\n  endif()"
 		westTarget = " ${WEST_TARGET}"
+		excludeFromMain = "\n    EXCLUDE_FROM_MAIN TRUE"
 	}
 
-	var verbosity, logConfigure string
+	var verbosity, logConfigure, stepLog string
 	if m.Options.Debug || m.Options.Verbose {
 		verbosity = " --verbose"
 	} else {
 		logConfigure = "\n    LOG_CONFIGURE         ON"
 		logConfigure += "\n    LOG_OUTPUT_ON_FAILURE ON"
+		if !west {
+			stepLog = "\n    LOG               TRUE"
+		}
 	}
 
 	// Write content
@@ -133,8 +137,8 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
 
   # Database generation step
   ExternalProject_Add_Step(${CONTEXT} database
-    COMMAND           ${CMAKE_COMMAND} --build <BINARY_DIR> --target database` + verbosity + `
-    ALWAYS            TRUE
+    COMMAND           ${CMAKE_COMMAND} --build <BINARY_DIR> --target database` + verbosity + excludeFromMain + `
+    ALWAYS            TRUE` + stepLog + `
     USES_TERMINAL     ON
     DEPENDEES         configure
   )
diff --git a/test/data/solutions/west/ref/CMakeLists.txt b/test/data/solutions/west/ref/CMakeLists.txt
index 64773b3..91454e3 100644
--- a/test/data/solutions/west/ref/CMakeLists.txt
+++ b/test/data/solutions/west/ref/CMakeLists.txt
@@ -91,6 +91,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
   # Database generation step
   ExternalProject_Add_Step(${CONTEXT} database
     COMMAND           ${CMAKE_COMMAND} --build <BINARY_DIR> --target database --verbose
+    EXCLUDE_FROM_MAIN TRUE
     ALWAYS            TRUE
     USES_TERMINAL     ON
     DEPENDEES         configure