diff --git a/cmd/cbuild/commands/build/buildcprj.go b/cmd/cbuild/commands/build/buildcprj.go
index 9ad08d2..2accd50 100644
--- a/cmd/cbuild/commands/build/buildcprj.go
+++ b/cmd/cbuild/commands/build/buildcprj.go
@@ -11,8 +11,8 @@ import (
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/cproject"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/errutils"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/cbuild/commands/build/buildcprj_test.go b/cmd/cbuild/commands/build/buildcprj_test.go
index d5a9720..2b08450 100644
--- a/cmd/cbuild/commands/build/buildcprj_test.go
+++ b/cmd/cbuild/commands/build/buildcprj_test.go
@@ -12,7 +12,8 @@ import (
 	"testing"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
-	log "github.com/sirupsen/logrus"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -49,21 +50,21 @@ func TestPreLogConfiguration(t *testing.T) {
 		cmd := commands.NewRootCmd()
 		cmd.SetArgs([]string{"buildcprj", cprjFile, "-C"})
 		_ = cmd.Execute()
-		assert.Equal(log.WarnLevel, log.GetLevel())
+		assert.Equal(logrus.WarnLevel, log.GetLevel())
 	})
 
 	t.Run("test quiet verbosity level", func(t *testing.T) {
 		cmd := commands.NewRootCmd()
 		cmd.SetArgs([]string{"buildcprj", cprjFile, "--quiet", "-C"})
 		_ = cmd.Execute()
-		assert.Equal(log.ErrorLevel, log.GetLevel())
+		assert.Equal(logrus.ErrorLevel, log.GetLevel())
 	})
 
 	t.Run("test debug debug level", func(t *testing.T) {
 		cmd := commands.NewRootCmd()
 		cmd.SetArgs([]string{"buildcprj", cprjFile, "--debug", "-C"})
 		_ = cmd.Execute()
-		assert.Equal(log.DebugLevel, log.GetLevel())
+		assert.Equal(logrus.DebugLevel, log.GetLevel())
 	})
 
 	t.Run("test path generation to log file", func(t *testing.T) {
diff --git a/cmd/cbuild/commands/list/list_contexts.go b/cmd/cbuild/commands/list/list_contexts.go
index b542800..2e624ef 100644
--- a/cmd/cbuild/commands/list/list_contexts.go
+++ b/cmd/cbuild/commands/list/list_contexts.go
@@ -12,8 +12,8 @@ import (
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/csolution"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/errutils"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/cbuild/commands/list/list_environment.go b/cmd/cbuild/commands/list/list_environment.go
index c51deac..b3ffacb 100644
--- a/cmd/cbuild/commands/list/list_environment.go
+++ b/cmd/cbuild/commands/list/list_environment.go
@@ -9,8 +9,8 @@ import (
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/csolution"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/errutils"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/cbuild/commands/list/list_toolchains.go b/cmd/cbuild/commands/list/list_toolchains.go
index ed3a724..d14b6bc 100644
--- a/cmd/cbuild/commands/list/list_toolchains.go
+++ b/cmd/cbuild/commands/list/list_toolchains.go
@@ -12,8 +12,8 @@ import (
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/csolution"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/errutils"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/cbuild/commands/root.go b/cmd/cbuild/commands/root.go
index 8e45fe2..119be6e 100644
--- a/cmd/cbuild/commands/root.go
+++ b/cmd/cbuild/commands/root.go
@@ -21,7 +21,9 @@ import (
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/csolution"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/errutils"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
+
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	"github.com/spf13/cobra"
 )
 
@@ -60,18 +62,18 @@ Use "{{.CommandPath}} [command] --help" for more information about a command.{{e
 
 func preConfiguration(cmd *cobra.Command, args []string) error {
 	// configure log level
-	log.SetLevel(log.WarnLevel)
+	log.SetLevel(logrus.WarnLevel)
 	debug, _ := cmd.Flags().GetBool("debug")
 	quiet, _ := cmd.Flags().GetBool("quiet")
 	verbose, _ := cmd.Flags().GetBool("verbose")
 	logFile, _ := cmd.Flags().GetString("log")
 
 	if debug {
-		log.SetLevel(log.DebugLevel)
+		log.SetLevel(logrus.DebugLevel)
 	} else if verbose {
-		log.SetLevel(log.InfoLevel)
+		log.SetLevel(logrus.InfoLevel)
 	} else if quiet {
-		log.SetLevel(log.ErrorLevel)
+		log.SetLevel(logrus.ErrorLevel)
 	}
 
 	if logFile != "" {
diff --git a/cmd/cbuild/commands/root_test.go b/cmd/cbuild/commands/root_test.go
index 78d488b..d5a79a4 100644
--- a/cmd/cbuild/commands/root_test.go
+++ b/cmd/cbuild/commands/root_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/inittest"
+
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/cmd/cbuild/commands/setup/setup.go b/cmd/cbuild/commands/setup/setup.go
index c6947cb..35c5522 100644
--- a/cmd/cbuild/commands/setup/setup.go
+++ b/cmd/cbuild/commands/setup/setup.go
@@ -12,8 +12,8 @@ import (
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/csolution"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/errutils"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/cbuild/main.go b/cmd/cbuild/main.go
index 3c849ec..5392002 100644
--- a/cmd/cbuild/main.go
+++ b/cmd/cbuild/main.go
@@ -7,15 +7,14 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
-	log "github.com/sirupsen/logrus"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 )
 
 func main() {
-	log.SetFormatter(new(LogFormatter))
+	// log.SetFormatter(new(LogFormatter))
 	log.SetOutput(os.Stdout)
 
 	commands.Version = version
@@ -30,9 +29,9 @@ func main() {
 	}
 }
 
-type LogFormatter struct{}
+// type LogFormatter struct{}
 
-func (s *LogFormatter) Format(entry *log.Entry) ([]byte, error) {
-	msg := fmt.Sprintf("%s cbuild: %s\n", entry.Level.String(), entry.Message)
-	return []byte(msg), nil
-}
+// func (s *LogFormatter) Format(entry *log.Entry) ([]byte, error) {
+// 	msg := fmt.Sprintf("%s cbuild: %s\n", entry.Level.String(), entry.Message)
+// 	return []byte(msg), nil
+// }
diff --git a/pkg/builder/cbuildidx/builder.go b/pkg/builder/cbuildidx/builder.go
index e9405a1..2860761 100644
--- a/pkg/builder/cbuildidx/builder.go
+++ b/pkg/builder/cbuildidx/builder.go
@@ -16,9 +16,9 @@ import (
 
 	builder "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/errutils"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	utils "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	"github.com/hashicorp/go-version"
-	log "github.com/sirupsen/logrus"
 )
 
 const NinjaVersion = "1.11.1"
diff --git a/pkg/builder/cproject/builder.go b/pkg/builder/cproject/builder.go
index bd4c7a8..21d8d4c 100644
--- a/pkg/builder/cproject/builder.go
+++ b/pkg/builder/cproject/builder.go
@@ -15,8 +15,8 @@ import (
 
 	builder "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/errutils"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	utils "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
-	log "github.com/sirupsen/logrus"
 )
 
 type CprjBuilder struct {
diff --git a/pkg/builder/csolution/builder.go b/pkg/builder/csolution/builder.go
index bad4636..da9e1f8 100644
--- a/pkg/builder/csolution/builder.go
+++ b/pkg/builder/csolution/builder.go
@@ -22,8 +22,8 @@ import (
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/cbuildidx"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/cproject"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/errutils"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	utils "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
-	log "github.com/sirupsen/logrus"
 )
 
 type CSolutionBuilder struct {
diff --git a/pkg/builder/interface.go b/pkg/builder/interface.go
index 96eb5fc..fdf06da 100644
--- a/pkg/builder/interface.go
+++ b/pkg/builder/interface.go
@@ -11,8 +11,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
-	log "github.com/sirupsen/logrus"
 )
 
 type BuilderParams struct {
diff --git a/pkg/utils/exec.go b/pkg/utils/exec.go
index 8ebedc2..4e59678 100644
--- a/pkg/utils/exec.go
+++ b/pkg/utils/exec.go
@@ -10,7 +10,7 @@ import (
 	"bytes"
 	"os/exec"
 
-	log "github.com/sirupsen/logrus"
+	log "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/logger"
 )
 
 type RunnerInterface interface {