diff --git a/pkg/eventhandler/eventhandler.go b/pkg/eventhandler/eventhandler.go
index b9ddc3a4..537f1a3e 100644
--- a/pkg/eventhandler/eventhandler.go
+++ b/pkg/eventhandler/eventhandler.go
@@ -16,6 +16,7 @@ package eventhandler
 
 import (
 	"context"
+	"runtime/debug"
 	"time"
 
 	corecommon "github.com/horizoncd/horizon/core/common"
@@ -26,7 +27,6 @@ import (
 	eventmanager "github.com/horizoncd/horizon/pkg/event/manager"
 	"github.com/horizoncd/horizon/pkg/event/models"
 	"github.com/horizoncd/horizon/pkg/param/managerparam"
-	"github.com/horizoncd/horizon/pkg/util/common"
 	"github.com/horizoncd/horizon/pkg/util/log"
 	webhookmanager "github.com/horizoncd/horizon/pkg/webhook/manager"
 )
@@ -92,8 +92,7 @@ func (e *eventHandlerService) Start() {
 	go func() {
 		defer func() {
 			if err := recover(); err != nil {
-				log.Errorf(e.ctx, "event handler service panic: %v", err)
-				common.PrintStack()
+				log.Errorf(e.ctx, "event handler service panic: %s", string(debug.Stack()))
 			}
 		}()
 
diff --git a/pkg/webhook/service/service.go b/pkg/webhook/service/service.go
index 756e3d3e..9b13a9a6 100644
--- a/pkg/webhook/service/service.go
+++ b/pkg/webhook/service/service.go
@@ -23,6 +23,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
+	"runtime/debug"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -34,7 +35,6 @@ import (
 	"github.com/horizoncd/horizon/pkg/eventhandler/wlgenerator"
 	"github.com/horizoncd/horizon/pkg/param/managerparam"
 	usermanager "github.com/horizoncd/horizon/pkg/user/manager"
-	"github.com/horizoncd/horizon/pkg/util/common"
 	"github.com/horizoncd/horizon/pkg/util/log"
 	webhookmanager "github.com/horizoncd/horizon/pkg/webhook/manager"
 	"github.com/horizoncd/horizon/pkg/webhook/models"
@@ -153,8 +153,7 @@ func (s *service) Start() {
 	go func() {
 		defer func() {
 			if err := recover(); err != nil {
-				log.Errorf(s.ctx, "webhook service reconcile panic: %v", err)
-				common.PrintStack()
+				log.Errorf(s.ctx, "webhook service reconcile panic: %s", string(debug.Stack()))
 			}
 		}()
 
@@ -286,8 +285,7 @@ func (w *worker) start() {
 	ctx := w.ctx
 	defer func() {
 		if err := recover(); err != nil {
-			log.Errorf(ctx, "webhook worker panic: %v", err)
-			common.PrintStack()
+			log.Errorf(ctx, "webhook worker panic: %s", string(debug.Stack()))
 		}
 	}()
 L: