diff --git a/http/client/client_test.go b/http/client/client_test.go
index 04181a0..6658030 100644
--- a/http/client/client_test.go
+++ b/http/client/client_test.go
@@ -3,12 +3,13 @@ package client
 import (
 	"context"
 	"fmt"
-	"github.com/stretchr/testify/assert"
-	"github.com/vithubati/go-core/authenticator"
 	"net/http"
 	"net/url"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/vithubati/go-core/authenticator"
 )
 
 func TestNew(t *testing.T) {
@@ -57,7 +58,7 @@ func TestRequestWithID(t *testing.T) {
 
 func TestExecute(t *testing.T) {
 	t.Parallel()
-	tUrl := "http://echo.jsontest.com/name/vithu/team/avengers/job/developer"
+	tUrl := "http://echo.free.beeceptor.com/name/vithu/team/avengers/job/developer"
 	reqId := "cca61568-583-1lec-9d64-0242ac120002"
 	auth, _ := authenticator.NewBearerTokenAuthenticator("Test-TOKEN")
 	client := New(WithAuthenticator(auth))
@@ -69,7 +70,7 @@ func TestExecute(t *testing.T) {
 	resp, err := client.Execute(req)
 	assert.Nil(t, err)
 	assert.NotNil(t, resp)
-	assert.Equal(t, "http://echo.jsontest.com/name/vithu/team/avengers/job/developer?limit=5&size=10", resp.Request.URL)
+	assert.Equal(t, "http://echo.free.beeceptor.com/name/vithu/team/avengers/job/developer?limit=5&size=10", resp.Request.URL)
 	fmt.Printf("Trace Info: %+v\n", resp.Request.TraceInfo())
 }
 
diff --git a/logger/logger.go b/logger/logger.go
index 41d07f0..22e6dde 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -2,11 +2,12 @@ package logger
 
 import (
 	"context"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	"os"
 	"time"
 	_ "time/tzdata"
+
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 var l *logrus.Entry
@@ -21,15 +22,19 @@ func init() {
 // New returns a logrus o*log. Entry with the givenn fields and formatter
 func New(fields logrus.Fields, level logrus.Level) *logrus.Entry {
 	if l == nil {
-		location, err := time.LoadLocation("America/New_York")
-		if err != nil {
-			panic(err)
-		}
 		lg := logrus.StandardLogger()
-		lg.SetFormatter(&logrus.JSONFormatter{DisableTimestamp: true})
+		lg.SetFormatter(&logrus.JSONFormatter{
+			TimestampFormat:   time.RFC3339Nano,
+			DisableHTMLEscape: true,
+			FieldMap: logrus.FieldMap{
+				logrus.FieldKeyTime:  "@timestamp",
+				logrus.FieldKeyLevel: "log.level",
+				logrus.FieldKeyMsg:   "message",
+			},
+		})
 		lg.SetOutput(os.Stdout)
 		lg.SetLevel(level)
-		l = logrus.NewEntry(lg).WithFields(fields).WithFields(logrus.Fields{"timestamp": time.Now().UTC().In(location).Format(time.RFC3339Nano)})
+		l = logrus.NewEntry(lg).WithFields(fields)
 		l.Level = level
 		return l
 	}
diff --git a/logger/logger_test.go b/logger/logger_test.go
index fc2cfb7..5f43b6c 100644
--- a/logger/logger_test.go
+++ b/logger/logger_test.go
@@ -3,10 +3,11 @@ package logger
 import (
 	"context"
 	"errors"
-	"github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
+
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNew(t *testing.T) {
@@ -25,8 +26,6 @@ func TestWith(t *testing.T) {
 	log := New(logrus.Fields{}, logrus.DebugLevel)
 	ctx := With(context.Background(), log)
 	assert.NotNil(t, ctx)
-	log2 := From(context.Background())
-	assert.Equal(t, log, log2)
 }
 
 func TestWithFormatter(t *testing.T) {