diff --git a/Makefile b/Makefile
index 7ffcaa0..1be409a 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@
 VERSION                    ?= $(shell cat ./VERSION)
 
 # tool containers
-VOLTHA_TOOLS_VERSION ?= 2.3.1
+VOLTHA_TOOLS_VERSION ?= 2.4.0
 
 GO                = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app $(shell test -t 0 && echo "-it") -v gocache:/.cache -v gocache-${VOLTHA_TOOLS_VERSION}:/go/pkg voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-golang go
 GO_JUNIT_REPORT   = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app -i voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-go-junit-report go-junit-report
diff --git a/VERSION b/VERSION
index af8c8ec..f2c6cb6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.2
+4.2.3
diff --git a/pkg/kafka/client.go b/pkg/kafka/client.go
index 0337432..eee9631 100755
--- a/pkg/kafka/client.go
+++ b/pkg/kafka/client.go
@@ -17,8 +17,9 @@
 
 import (
 	"context"
-	ca "github.com/opencord/voltha-protos/v4/go/inter_container"
 	"time"
+
+	ca "github.com/opencord/voltha-protos/v4/go/inter_container"
 )
 
 const (
@@ -37,9 +38,7 @@
 )
 
 const (
-	DefaultKafkaHost                = "127.0.0.1"
-	DefaultKafkaPort                = 9092
-	DefaultKafkaAddress             = DefaultKafkaHost + ":" + string(DefaultKafkaPort)
+	DefaultKafkaAddress             = "127.0.0.1:9092"
 	DefaultGroupName                = "voltha"
 	DefaultSleepOnError             = 1
 	DefaultProducerFlushFrequency   = 10
diff --git a/pkg/log/log.go b/pkg/log/log.go
index b8d498c..7b1a123 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -54,11 +54,12 @@
 	"context"
 	"errors"
 	"fmt"
-	zp "go.uber.org/zap"
-	zc "go.uber.org/zap/zapcore"
 	"path"
 	"runtime"
 	"strings"
+
+	zp "go.uber.org/zap"
+	zc "go.uber.org/zap/zapcore"
 )
 
 type LogLevel int8
@@ -217,7 +218,7 @@
 	case FatalLevel:
 		return "FATAL", nil
 	}
-	return "", errors.New("Given LogLevel is invalid " + string(l))
+	return "", fmt.Errorf("Given LogLevel is invalid %d", l)
 }
 
 func getDefaultConfig(outputType string, level LogLevel, defaultFields Fields) zp.Config {