diff --git a/beacon-chain/BUILD.bazel b/beacon-chain/BUILD.bazel
index 1b957f2b0c..bbbc08e42c 100644
--- a/beacon-chain/BUILD.bazel
+++ b/beacon-chain/BUILD.bazel
@@ -8,6 +8,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "main.go",
         "usage.go",
     ],
diff --git a/beacon-chain/cache/depositcache/BUILD.bazel b/beacon-chain/cache/depositcache/BUILD.bazel
index 3b4bfe740d..4f85c42b7a 100644
--- a/beacon-chain/cache/depositcache/BUILD.bazel
+++ b/beacon-chain/cache/depositcache/BUILD.bazel
@@ -5,6 +5,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "deposits_cache.go",
+        "log.go",
         "pending_deposits.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/cache/depositcache",
diff --git a/beacon-chain/cache/depositcache/deposits_cache.go b/beacon-chain/cache/depositcache/deposits_cache.go
index 7d998cf38b..a93ce91730 100644
--- a/beacon-chain/cache/depositcache/deposits_cache.go
+++ b/beacon-chain/cache/depositcache/deposits_cache.go
@@ -19,7 +19,7 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/trieutil"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 )
 
@@ -78,7 +78,7 @@ func (dc *DepositCache) InsertDeposit(ctx context.Context, d *ethpb.Deposit, blo
 	ctx, span := trace.StartSpan(ctx, "DepositsCache.InsertDeposit")
 	defer span.End()
 	if d == nil {
-		log.WithFields(log.Fields{
+		log.WithFields(logrus.Fields{
 			"block":        blockNum,
 			"deposit":      d,
 			"index":        index,
diff --git a/beacon-chain/cache/depositcache/log.go b/beacon-chain/cache/depositcache/log.go
new file mode 100644
index 0000000000..6cf0f78a5a
--- /dev/null
+++ b/beacon-chain/cache/depositcache/log.go
@@ -0,0 +1,5 @@
+package depositcache
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "depositcache")
diff --git a/beacon-chain/cache/depositcache/pending_deposits.go b/beacon-chain/cache/depositcache/pending_deposits.go
index 08604a651d..054deeb6e4 100644
--- a/beacon-chain/cache/depositcache/pending_deposits.go
+++ b/beacon-chain/cache/depositcache/pending_deposits.go
@@ -10,7 +10,7 @@ import (
 	ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
 	dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db"
 	"github.com/prysmaticlabs/prysm/shared/hashutil"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 )
 
@@ -33,7 +33,7 @@ func (dc *DepositCache) InsertPendingDeposit(ctx context.Context, d *ethpb.Depos
 	ctx, span := trace.StartSpan(ctx, "DepositsCache.InsertPendingDeposit")
 	defer span.End()
 	if d == nil {
-		log.WithFields(log.Fields{
+		log.WithFields(logrus.Fields{
 			"block":   blockNum,
 			"deposit": d,
 		}).Debug("Ignoring nil deposit insertion")
diff --git a/beacon-chain/core/state/BUILD.bazel b/beacon-chain/core/state/BUILD.bazel
index e1fe8dd62d..9db49a2cdb 100644
--- a/beacon-chain/core/state/BUILD.bazel
+++ b/beacon-chain/core/state/BUILD.bazel
@@ -6,6 +6,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "skip_slot_cache.go",
         "state.go",
         "transition.go",
diff --git a/beacon-chain/core/state/log.go b/beacon-chain/core/state/log.go
new file mode 100644
index 0000000000..81f15d6e53
--- /dev/null
+++ b/beacon-chain/core/state/log.go
@@ -0,0 +1,5 @@
+package state
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "state")
diff --git a/beacon-chain/core/state/transition.go b/beacon-chain/core/state/transition.go
index da601ffc9f..331ecebc94 100644
--- a/beacon-chain/core/state/transition.go
+++ b/beacon-chain/core/state/transition.go
@@ -21,7 +21,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/mathutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/traceutil"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 )
 
@@ -312,7 +311,7 @@ func ProcessSlots(ctx context.Context, state *stateTrie.BeaconState, slot uint64
 	defer func() {
 		if err := SkipSlotCache.MarkNotInProgress(key); err != nil {
 			traceutil.AnnotateError(span, err)
-			logrus.WithError(err).Error("Failed to mark skip slot no longer in progress")
+			log.WithError(err).Error("Failed to mark skip slot no longer in progress")
 		}
 	}()
 
@@ -322,7 +321,7 @@ func ProcessSlots(ctx context.Context, state *stateTrie.BeaconState, slot uint64
 			// Cache last best value.
 			if highestSlot < state.Slot() {
 				if err := SkipSlotCache.Put(ctx, key, state); err != nil {
-					logrus.WithError(err).Error("Failed to put skip slot cache value")
+					log.WithError(err).Error("Failed to put skip slot cache value")
 				}
 			}
 			return nil, ctx.Err()
@@ -347,7 +346,7 @@ func ProcessSlots(ctx context.Context, state *stateTrie.BeaconState, slot uint64
 
 	if highestSlot < state.Slot() {
 		if err := SkipSlotCache.Put(ctx, key, state); err != nil {
-			logrus.WithError(err).Error("Failed to put skip slot cache value")
+			log.WithError(err).Error("Failed to put skip slot cache value")
 			traceutil.AnnotateError(span, err)
 		}
 	}
diff --git a/beacon-chain/db/BUILD.bazel b/beacon-chain/db/BUILD.bazel
index ce43ad4e7e..cffb0d1cc1 100644
--- a/beacon-chain/db/BUILD.bazel
+++ b/beacon-chain/db/BUILD.bazel
@@ -12,6 +12,7 @@ go_library(
     srcs = [
         "alias.go",
         "cmd.go",
+        "log.go",
         "restore.go",
     ] + select({
         ":kafka_disabled": [
diff --git a/beacon-chain/db/cmd.go b/beacon-chain/db/cmd.go
index 395c1f4136..80098d2559 100644
--- a/beacon-chain/db/cmd.go
+++ b/beacon-chain/db/cmd.go
@@ -3,7 +3,6 @@ package db
 import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/tos"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -23,7 +22,7 @@ var DatabaseCommands = &cli.Command{
 			Before: tos.VerifyTosAcceptedOrPrompt,
 			Action: func(cliCtx *cli.Context) error {
 				if err := restore(cliCtx); err != nil {
-					logrus.Fatalf("Could not restore database: %v", err)
+					log.Fatalf("Could not restore database: %v", err)
 				}
 				return nil
 			},
diff --git a/beacon-chain/db/kafka/BUILD.bazel b/beacon-chain/db/kafka/BUILD.bazel
index 2f7a18844d..57a3d89731 100644
--- a/beacon-chain/db/kafka/BUILD.bazel
+++ b/beacon-chain/db/kafka/BUILD.bazel
@@ -4,6 +4,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "export_wrapper.go",
+        "log.go",
         "passthrough.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/db/kafka",
diff --git a/beacon-chain/db/kafka/export_wrapper.go b/beacon-chain/db/kafka/export_wrapper.go
index a517cf7c37..82bf46196c 100644
--- a/beacon-chain/db/kafka/export_wrapper.go
+++ b/beacon-chain/db/kafka/export_wrapper.go
@@ -14,14 +14,12 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/db/iface"
 	"github.com/prysmaticlabs/prysm/shared/featureconfig"
 	"github.com/prysmaticlabs/prysm/shared/traceutil"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 	"gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
 	_ "gopkg.in/confluentinc/confluent-kafka-go.v1/kafka/librdkafka" // Required for c++ kafka library.
 )
 
 var _ iface.Database = (*Exporter)(nil)
-var log = logrus.WithField("prefix", "exporter")
 var marshaler = &jsonpb.Marshaler{}
 
 // Exporter wraps a database interface and exports certain objects to kafka topics.
diff --git a/beacon-chain/db/kafka/log.go b/beacon-chain/db/kafka/log.go
new file mode 100644
index 0000000000..73984f79e3
--- /dev/null
+++ b/beacon-chain/db/kafka/log.go
@@ -0,0 +1,5 @@
+package kafka
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "exporter")
diff --git a/beacon-chain/db/kv/BUILD.bazel b/beacon-chain/db/kv/BUILD.bazel
index 75585e1aa0..0af106ffbf 100644
--- a/beacon-chain/db/kv/BUILD.bazel
+++ b/beacon-chain/db/kv/BUILD.bazel
@@ -12,6 +12,7 @@ go_library(
         "encoding.go",
         "finalized_block_roots.go",
         "kv.go",
+        "log.go",
         "migration.go",
         "migration_archived_index.go",
         "migration_block_slot_index.go",
diff --git a/beacon-chain/db/kv/backup.go b/beacon-chain/db/kv/backup.go
index d7d915dc16..b5bdeeac52 100644
--- a/beacon-chain/db/kv/backup.go
+++ b/beacon-chain/db/kv/backup.go
@@ -8,7 +8,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
@@ -43,7 +42,7 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 		return err
 	}
 	backupPath := path.Join(backupsDir, fmt.Sprintf("prysm_beacondb_at_slot_%07d.backup", head.Block.Slot))
-	logrus.WithField("prefix", "db").WithField("backup", backupPath).Info("Writing backup database.")
+	log.WithField("backup", backupPath).Info("Writing backup database.")
 
 	copyDB, err := bolt.Open(
 		backupPath,
@@ -55,13 +54,13 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 	}
 	defer func() {
 		if err := copyDB.Close(); err != nil {
-			logrus.WithError(err).Error("Failed to close backup database")
+			log.WithError(err).Error("Failed to close backup database")
 		}
 	}()
 
 	return s.db.View(func(tx *bolt.Tx) error {
 		return tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			logrus.Debugf("Copying bucket %s\n", name)
+			log.Debugf("Copying bucket %s\n", name)
 			return copyDB.Update(func(tx2 *bolt.Tx) error {
 				b2, err := tx2.CreateBucketIfNotExists(name)
 				if err != nil {
diff --git a/beacon-chain/db/kv/log.go b/beacon-chain/db/kv/log.go
new file mode 100644
index 0000000000..5c1d80880c
--- /dev/null
+++ b/beacon-chain/db/kv/log.go
@@ -0,0 +1,5 @@
+package kv
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")
diff --git a/beacon-chain/db/kv/state.go b/beacon-chain/db/kv/state.go
index e75fd3100a..80b77ef82c 100644
--- a/beacon-chain/db/kv/state.go
+++ b/beacon-chain/db/kv/state.go
@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/state"
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	log "github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
diff --git a/beacon-chain/db/log.go b/beacon-chain/db/log.go
new file mode 100644
index 0000000000..f320f2fe6a
--- /dev/null
+++ b/beacon-chain/db/log.go
@@ -0,0 +1,5 @@
+package db
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")
diff --git a/beacon-chain/db/restore.go b/beacon-chain/db/restore.go
index 0770909ad2..e53202f966 100644
--- a/beacon-chain/db/restore.go
+++ b/beacon-chain/db/restore.go
@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/promptutil"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -30,7 +29,7 @@ func restore(cliCtx *cli.Context) error {
 			return errors.Wrap(err, "could not validate choice")
 		}
 		if strings.EqualFold(resp, "n") {
-			logrus.Info("Restore aborted")
+			log.Info("Restore aborted")
 			return nil
 		}
 	}
@@ -41,6 +40,6 @@ func restore(cliCtx *cli.Context) error {
 		return err
 	}
 
-	logrus.Info("Restore completed successfully")
+	log.Info("Restore completed successfully")
 	return nil
 }
diff --git a/beacon-chain/flags/BUILD.bazel b/beacon-chain/flags/BUILD.bazel
index e1c0dc6c20..ecc5594893 100644
--- a/beacon-chain/flags/BUILD.bazel
+++ b/beacon-chain/flags/BUILD.bazel
@@ -6,6 +6,7 @@ go_library(
         "base.go",
         "config.go",
         "interop.go",
+        "log.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/flags",
     visibility = ["//beacon-chain:__subpackages__"],
diff --git a/beacon-chain/flags/config.go b/beacon-chain/flags/config.go
index f593ae85b0..dc1d87ba32 100644
--- a/beacon-chain/flags/config.go
+++ b/beacon-chain/flags/config.go
@@ -2,7 +2,6 @@ package flags
 
 import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
-	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/beacon-chain/flags/log.go b/beacon-chain/flags/log.go
new file mode 100644
index 0000000000..466be72575
--- /dev/null
+++ b/beacon-chain/flags/log.go
@@ -0,0 +1,5 @@
+package flags
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "flags")
diff --git a/beacon-chain/gateway/server/BUILD.bazel b/beacon-chain/gateway/server/BUILD.bazel
index 1023a6e9d0..51e9d059de 100644
--- a/beacon-chain/gateway/server/BUILD.bazel
+++ b/beacon-chain/gateway/server/BUILD.bazel
@@ -6,7 +6,10 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
 
 go_library(
     name = "go_default_library",
-    srcs = ["main.go"],
+    srcs = [
+        "log.go",
+        "main.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/gateway/server",
     visibility = ["//visibility:private"],
     deps = [
diff --git a/beacon-chain/gateway/server/log.go b/beacon-chain/gateway/server/log.go
new file mode 100644
index 0000000000..4f254e16d2
--- /dev/null
+++ b/beacon-chain/gateway/server/log.go
@@ -0,0 +1,5 @@
+package main
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.New()
diff --git a/beacon-chain/gateway/server/main.go b/beacon-chain/gateway/server/main.go
index 3ca488cbc4..c04b5ef8c4 100644
--- a/beacon-chain/gateway/server/main.go
+++ b/beacon-chain/gateway/server/main.go
@@ -29,8 +29,6 @@ func init() {
 	logrus.SetFormatter(joonix.NewFormatter())
 }
 
-var log = logrus.New()
-
 func main() {
 	flag.Parse()
 	if *debug {
diff --git a/beacon-chain/log.go b/beacon-chain/log.go
new file mode 100644
index 0000000000..f295010594
--- /dev/null
+++ b/beacon-chain/log.go
@@ -0,0 +1,5 @@
+package main
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "main")
diff --git a/beacon-chain/main.go b/beacon-chain/main.go
index 7e8f4cf047..c800d14c8f 100644
--- a/beacon-chain/main.go
+++ b/beacon-chain/main.go
@@ -113,7 +113,6 @@ func init() {
 }
 
 func main() {
-	log := logrus.WithField("prefix", "main")
 	app := cli.App{}
 	app.Name = "beacon-chain"
 	app.Usage = "this is a beacon chain implementation for Ethereum 2.0"
diff --git a/beacon-chain/node/BUILD.bazel b/beacon-chain/node/BUILD.bazel
index d19c50b71f..16ddb44c10 100644
--- a/beacon-chain/node/BUILD.bazel
+++ b/beacon-chain/node/BUILD.bazel
@@ -5,6 +5,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "helper.go",
+        "log.go",
         "node.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/node",
diff --git a/beacon-chain/node/log.go b/beacon-chain/node/log.go
new file mode 100644
index 0000000000..2c3b06e822
--- /dev/null
+++ b/beacon-chain/node/log.go
@@ -0,0 +1,5 @@
+package node
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "node")
diff --git a/beacon-chain/node/node.go b/beacon-chain/node/node.go
index e207d1e58f..3cab02a43f 100644
--- a/beacon-chain/node/node.go
+++ b/beacon-chain/node/node.go
@@ -52,8 +52,6 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-var log = logrus.WithField("prefix", "node")
-
 const testSkipPowFlag = "test-skip-pow"
 
 // BeaconNode defines a struct that handles the services running a random beacon chain
diff --git a/beacon-chain/p2p/info.go b/beacon-chain/p2p/info.go
index 27be3430f2..3981dffd9d 100644
--- a/beacon-chain/p2p/info.go
+++ b/beacon-chain/p2p/info.go
@@ -9,7 +9,6 @@ import (
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/peer"
 	ma "github.com/multiformats/go-multiaddr"
-	"github.com/sirupsen/logrus"
 )
 
 // InfoHandler is a handler to serve /p2p page in metrics.
@@ -26,7 +25,7 @@ self=%s
 		len(s.host.Network().Peers()),
 		formatPeers(s.host), // Must be last. Writes one entry per row.
 	); err != nil {
-		logrus.WithError(err).Error("Failed to render p2p info page")
+		log.WithError(err).Error("Failed to render p2p info page")
 		return
 	}
 
diff --git a/beacon-chain/powchain/BUILD.bazel b/beacon-chain/powchain/BUILD.bazel
index 16c220ade3..ad77913adc 100644
--- a/beacon-chain/powchain/BUILD.bazel
+++ b/beacon-chain/powchain/BUILD.bazel
@@ -7,6 +7,7 @@ go_library(
         "block_cache.go",
         "block_reader.go",
         "deposit.go",
+        "log.go",
         "log_processing.go",
         "service.go",
     ],
diff --git a/beacon-chain/powchain/log.go b/beacon-chain/powchain/log.go
new file mode 100644
index 0000000000..e5da30f137
--- /dev/null
+++ b/beacon-chain/powchain/log.go
@@ -0,0 +1,5 @@
+package powchain
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "powchain")
diff --git a/beacon-chain/powchain/log_processing.go b/beacon-chain/powchain/log_processing.go
index 40133ba8bf..b71a8af12d 100644
--- a/beacon-chain/powchain/log_processing.go
+++ b/beacon-chain/powchain/log_processing.go
@@ -61,12 +61,12 @@ func (s *Service) ProcessETH1Block(ctx context.Context, blkNum *big.Int) error {
 	if err != nil {
 		return err
 	}
-	for _, log := range logs {
+	for _, filterLog := range logs {
 		// ignore logs that are not of the required block number
-		if log.BlockNumber != blkNum.Uint64() {
+		if filterLog.BlockNumber != blkNum.Uint64() {
 			continue
 		}
-		if err := s.ProcessLog(ctx, log); err != nil {
+		if err := s.ProcessLog(ctx, filterLog); err != nil {
 			return errors.Wrap(err, "could not process log")
 		}
 	}
@@ -331,16 +331,16 @@ func (s *Service) processPastLogs(ctx context.Context) error {
 			}
 		}
 
-		for _, log := range logs {
-			if log.BlockNumber > currentBlockNum {
-				if err := s.checkHeaderRange(currentBlockNum, log.BlockNumber-1, headersMap, requestHeaders); err != nil {
+		for _, filterLog := range logs {
+			if filterLog.BlockNumber > currentBlockNum {
+				if err := s.checkHeaderRange(currentBlockNum, filterLog.BlockNumber-1, headersMap, requestHeaders); err != nil {
 					return err
 				}
 				// set new block number after checking for chainstart for previous block.
 				s.latestEth1Data.LastRequestedBlock = currentBlockNum
-				currentBlockNum = log.BlockNumber
+				currentBlockNum = filterLog.BlockNumber
 			}
-			if err := s.ProcessLog(ctx, log); err != nil {
+			if err := s.ProcessLog(ctx, filterLog); err != nil {
 				return err
 			}
 		}
diff --git a/beacon-chain/powchain/service.go b/beacon-chain/powchain/service.go
index 596f1dd7ee..62c7eaad6d 100644
--- a/beacon-chain/powchain/service.go
+++ b/beacon-chain/powchain/service.go
@@ -40,8 +40,6 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logrus.WithField("prefix", "powchain")
-
 var (
 	validDepositsCount = promauto.NewCounter(prometheus.CounterOpts{
 		Name: "powchain_valid_deposits_received",
diff --git a/beacon-chain/rpc/BUILD.bazel b/beacon-chain/rpc/BUILD.bazel
index b064d99e89..0bf9eafb02 100644
--- a/beacon-chain/rpc/BUILD.bazel
+++ b/beacon-chain/rpc/BUILD.bazel
@@ -3,7 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["service.go"],
+    srcs = [
+        "log.go",
+        "service.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/rpc",
     visibility = ["//beacon-chain:__subpackages__"],
     deps = [
diff --git a/beacon-chain/rpc/beacon/BUILD.bazel b/beacon-chain/rpc/beacon/BUILD.bazel
index 95a2a9e9ee..6a89369e2b 100644
--- a/beacon-chain/rpc/beacon/BUILD.bazel
+++ b/beacon-chain/rpc/beacon/BUILD.bazel
@@ -9,6 +9,7 @@ go_library(
         "blocks.go",
         "committees.go",
         "config.go",
+        "log.go",
         "server.go",
         "slashings.go",
         "validators.go",
diff --git a/beacon-chain/rpc/beacon/attestations.go b/beacon-chain/rpc/beacon/attestations.go
index 17f3c1b0f3..436629862b 100644
--- a/beacon-chain/rpc/beacon/attestations.go
+++ b/beacon-chain/rpc/beacon/attestations.go
@@ -19,13 +19,10 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/pagination"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/slotutil"
-	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
-var log = logrus.WithField("prefix", "rpc")
-
 // sortableAttestations implements the Sort interface to sort attestations
 // by slot as the canonical sorting attribute.
 type sortableAttestations []*ethpb.Attestation
diff --git a/beacon-chain/rpc/beacon/log.go b/beacon-chain/rpc/beacon/log.go
new file mode 100644
index 0000000000..99ec18c4db
--- /dev/null
+++ b/beacon-chain/rpc/beacon/log.go
@@ -0,0 +1,5 @@
+package beacon
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc")
diff --git a/beacon-chain/rpc/beaconv1/BUILD.bazel b/beacon-chain/rpc/beaconv1/BUILD.bazel
index bc9c5a8085..a78be45450 100644
--- a/beacon-chain/rpc/beaconv1/BUILD.bazel
+++ b/beacon-chain/rpc/beaconv1/BUILD.bazel
@@ -6,6 +6,7 @@ go_library(
     srcs = [
         "blocks.go",
         "config.go",
+        "log.go",
         "pool.go",
         "server.go",
         "state.go",
diff --git a/beacon-chain/rpc/beaconv1/blocks.go b/beacon-chain/rpc/beaconv1/blocks.go
index 0f721bfbfb..c2ad4f5535 100644
--- a/beacon-chain/rpc/beaconv1/blocks.go
+++ b/beacon-chain/rpc/beaconv1/blocks.go
@@ -14,7 +14,6 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/db/filters"
 	"github.com/prysmaticlabs/prysm/proto/migration"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
diff --git a/beacon-chain/rpc/beaconv1/log.go b/beacon-chain/rpc/beaconv1/log.go
new file mode 100644
index 0000000000..b772eed27d
--- /dev/null
+++ b/beacon-chain/rpc/beaconv1/log.go
@@ -0,0 +1,5 @@
+package beaconv1
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc/beaconv1")
diff --git a/beacon-chain/rpc/log.go b/beacon-chain/rpc/log.go
new file mode 100644
index 0000000000..5c2ea5ccf3
--- /dev/null
+++ b/beacon-chain/rpc/log.go
@@ -0,0 +1,5 @@
+package rpc
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc")
diff --git a/beacon-chain/rpc/service.go b/beacon-chain/rpc/service.go
index b33aff58d4..9136071615 100644
--- a/beacon-chain/rpc/service.go
+++ b/beacon-chain/rpc/service.go
@@ -52,12 +52,6 @@ import (
 
 const attestationBufferSize = 100
 
-var log logrus.FieldLogger
-
-func init() {
-	log = logrus.WithField("prefix", "rpc")
-}
-
 // Service defining an RPC server for a beacon node.
 type Service struct {
 	ctx                     context.Context
diff --git a/beacon-chain/rpc/validator/BUILD.bazel b/beacon-chain/rpc/validator/BUILD.bazel
index 678aab9e6f..57a1e58722 100644
--- a/beacon-chain/rpc/validator/BUILD.bazel
+++ b/beacon-chain/rpc/validator/BUILD.bazel
@@ -8,6 +8,7 @@ go_library(
         "assignments.go",
         "attester.go",
         "exit.go",
+        "log.go",
         "proposer.go",
         "proposer_utils.go",
         "server.go",
diff --git a/beacon-chain/rpc/validator/log.go b/beacon-chain/rpc/validator/log.go
new file mode 100644
index 0000000000..43f3b2870b
--- /dev/null
+++ b/beacon-chain/rpc/validator/log.go
@@ -0,0 +1,5 @@
+package validator
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc/validator")
diff --git a/beacon-chain/rpc/validator/server.go b/beacon-chain/rpc/validator/server.go
index c18b7c1cd9..e0e8a94ef7 100644
--- a/beacon-chain/rpc/validator/server.go
+++ b/beacon-chain/rpc/validator/server.go
@@ -29,17 +29,10 @@ import (
 	pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
-var log logrus.FieldLogger
-
-func init() {
-	log = logrus.WithField("prefix", "rpc/validator")
-}
-
 // Server defines a server implementation of the gRPC Validator service,
 // providing RPC endpoints for obtaining validator assignments per epoch, the slots
 // and committees in which particular validators need to perform their responsibilities,
diff --git a/slasher/BUILD.bazel b/slasher/BUILD.bazel
index 4ec023769b..a6b7c6d3ab 100644
--- a/slasher/BUILD.bazel
+++ b/slasher/BUILD.bazel
@@ -7,6 +7,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "main.go",
         "usage.go",
     ],
diff --git a/slasher/beaconclient/BUILD.bazel b/slasher/beaconclient/BUILD.bazel
index 04eea53eb7..37a8869f6e 100644
--- a/slasher/beaconclient/BUILD.bazel
+++ b/slasher/beaconclient/BUILD.bazel
@@ -6,6 +6,7 @@ go_library(
     srcs = [
         "chain_data.go",
         "historical_data_retrieval.go",
+        "log.go",
         "metrics.go",
         "receivers.go",
         "service.go",
diff --git a/slasher/beaconclient/log.go b/slasher/beaconclient/log.go
new file mode 100644
index 0000000000..3844cb1a46
--- /dev/null
+++ b/slasher/beaconclient/log.go
@@ -0,0 +1,5 @@
+package beaconclient
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "beaconclient")
diff --git a/slasher/beaconclient/service.go b/slasher/beaconclient/service.go
index 5835ec1180..dda2fef161 100644
--- a/slasher/beaconclient/service.go
+++ b/slasher/beaconclient/service.go
@@ -18,14 +18,11 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/grpcutils"
 	"github.com/prysmaticlabs/prysm/slasher/cache"
 	"github.com/prysmaticlabs/prysm/slasher/db"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/plugin/ocgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )
 
-var log = logrus.WithField("prefix", "beaconclient")
-
 // Notifier defines a struct which exposes event feeds regarding beacon blocks,
 // attestations, and more information received from a beacon node.
 type Notifier interface {
diff --git a/slasher/cache/BUILD.bazel b/slasher/cache/BUILD.bazel
index e80e16a75c..e101173c80 100644
--- a/slasher/cache/BUILD.bazel
+++ b/slasher/cache/BUILD.bazel
@@ -7,6 +7,7 @@ go_library(
         "doc.go",
         "flat_span_cache.go",
         "highest_attestation_cache.go",
+        "log.go",
         "span_cache.go",
         "validators_cache.go",
     ],
diff --git a/slasher/cache/flat_span_cache.go b/slasher/cache/flat_span_cache.go
index 93d49f78cf..a8fc515db2 100644
--- a/slasher/cache/flat_span_cache.go
+++ b/slasher/cache/flat_span_cache.go
@@ -3,7 +3,6 @@ package cache
 import (
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/prysmaticlabs/prysm/slasher/detection/attestations/types"
-	log "github.com/sirupsen/logrus"
 )
 
 // EpochFlatSpansCache is used to store the spans needed on a per-epoch basis for slashing detection.
diff --git a/slasher/cache/highest_attestation_cache.go b/slasher/cache/highest_attestation_cache.go
index 45ae8136a4..a9204e0615 100644
--- a/slasher/cache/highest_attestation_cache.go
+++ b/slasher/cache/highest_attestation_cache.go
@@ -3,7 +3,6 @@ package cache
 import (
 	lru "github.com/hashicorp/golang-lru"
 	slashpb "github.com/prysmaticlabs/prysm/proto/slashing"
-	log "github.com/sirupsen/logrus"
 )
 
 var (
diff --git a/slasher/cache/log.go b/slasher/cache/log.go
new file mode 100644
index 0000000000..4aae0382d0
--- /dev/null
+++ b/slasher/cache/log.go
@@ -0,0 +1,5 @@
+package cache
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "cache")
diff --git a/slasher/cache/span_cache.go b/slasher/cache/span_cache.go
index 3811562612..236b3abfeb 100644
--- a/slasher/cache/span_cache.go
+++ b/slasher/cache/span_cache.go
@@ -5,7 +5,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prysmaticlabs/prysm/slasher/detection/attestations/types"
-	log "github.com/sirupsen/logrus"
 )
 
 var (
diff --git a/slasher/db/BUILD.bazel b/slasher/db/BUILD.bazel
index 3feebbb8e5..be62df94d9 100644
--- a/slasher/db/BUILD.bazel
+++ b/slasher/db/BUILD.bazel
@@ -7,6 +7,7 @@ go_library(
         "alias.go",
         "cmd.go",
         "db.go",
+        "log.go",
         "restore.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/slasher/db",
diff --git a/slasher/db/cmd.go b/slasher/db/cmd.go
index 15ac8e2a7b..280b788bd1 100644
--- a/slasher/db/cmd.go
+++ b/slasher/db/cmd.go
@@ -3,7 +3,6 @@ package db
 import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/tos"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -23,7 +22,7 @@ var DatabaseCommands = &cli.Command{
 			Before: tos.VerifyTosAcceptedOrPrompt,
 			Action: func(cliCtx *cli.Context) error {
 				if err := restore(cliCtx); err != nil {
-					logrus.Fatalf("Could not restore database: %v", err)
+					log.Fatalf("Could not restore database: %v", err)
 				}
 				return nil
 			},
diff --git a/slasher/db/kv/BUILD.bazel b/slasher/db/kv/BUILD.bazel
index 2d7ae9355e..6b77d64df3 100644
--- a/slasher/db/kv/BUILD.bazel
+++ b/slasher/db/kv/BUILD.bazel
@@ -11,6 +11,7 @@ go_library(
         "highest_attestation.go",
         "indexed_attestations.go",
         "kv.go",
+        "log.go",
         "proposer_slashings.go",
         "schema.go",
         "spanner_new.go",
diff --git a/slasher/db/kv/backup.go b/slasher/db/kv/backup.go
index 01b3ffbc60..d2d8853917 100644
--- a/slasher/db/kv/backup.go
+++ b/slasher/db/kv/backup.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
@@ -36,7 +35,7 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 		return err
 	}
 	backupPath := path.Join(backupsDir, fmt.Sprintf("prysm_slasherdb_%d.backup", time.Now().Unix()))
-	logrus.WithField("prefix", "db").WithField("backup", backupPath).Info("Writing backup database")
+	log.WithField("backup", backupPath).Info("Writing backup database")
 
 	copyDB, err := bolt.Open(
 		backupPath,
@@ -48,13 +47,13 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 	}
 	defer func() {
 		if err := copyDB.Close(); err != nil {
-			logrus.WithError(err).Error("Failed to close backup database")
+			log.WithError(err).Error("Failed to close backup database")
 		}
 	}()
 
 	return s.db.View(func(tx *bolt.Tx) error {
 		return tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			logrus.Debugf("Copying bucket %s\n", name)
+			log.Debugf("Copying bucket %s\n", name)
 			return copyDB.Update(func(tx2 *bolt.Tx) error {
 				b2, err := tx2.CreateBucketIfNotExists(name)
 				if err != nil {
diff --git a/slasher/db/kv/block_header.go b/slasher/db/kv/block_header.go
index d57df3db2c..dbd4bfa42b 100644
--- a/slasher/db/kv/block_header.go
+++ b/slasher/db/kv/block_header.go
@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
@@ -62,7 +61,7 @@ func (db *Store) HasBlockHeader(ctx context.Context, slot, validatorID uint64) b
 		hasBlockHeader = false
 		return nil
 	}); err != nil {
-		logrus.WithError(err).Error("Failed to lookup block header from DB")
+		log.WithError(err).Error("Failed to lookup block header from DB")
 	}
 
 	return hasBlockHeader
diff --git a/slasher/db/kv/highest_attestation.go b/slasher/db/kv/highest_attestation.go
index df0222b2f7..307aaedcd3 100644
--- a/slasher/db/kv/highest_attestation.go
+++ b/slasher/db/kv/highest_attestation.go
@@ -7,7 +7,6 @@ import (
 	"github.com/pkg/errors"
 	slashpb "github.com/prysmaticlabs/prysm/proto/slashing"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	log "github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
diff --git a/slasher/db/kv/log.go b/slasher/db/kv/log.go
new file mode 100644
index 0000000000..5c1d80880c
--- /dev/null
+++ b/slasher/db/kv/log.go
@@ -0,0 +1,5 @@
+package kv
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")
diff --git a/slasher/db/kv/spanner_new.go b/slasher/db/kv/spanner_new.go
index c73ecca6ca..baba77128b 100644
--- a/slasher/db/kv/spanner_new.go
+++ b/slasher/db/kv/spanner_new.go
@@ -9,7 +9,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/slasher/detection/attestations/types"
-	log "github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
diff --git a/slasher/db/log.go b/slasher/db/log.go
new file mode 100644
index 0000000000..f320f2fe6a
--- /dev/null
+++ b/slasher/db/log.go
@@ -0,0 +1,5 @@
+package db
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")
diff --git a/slasher/db/restore.go b/slasher/db/restore.go
index 1dd73c65d6..a183e541b6 100644
--- a/slasher/db/restore.go
+++ b/slasher/db/restore.go
@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/promptutil"
 	"github.com/prysmaticlabs/prysm/slasher/db/kv"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -30,7 +29,7 @@ func restore(cliCtx *cli.Context) error {
 			return errors.Wrap(err, "could not validate choice")
 		}
 		if strings.EqualFold(resp, "n") {
-			logrus.Info("Restore aborted")
+			log.Info("Restore aborted")
 			return nil
 		}
 	}
@@ -41,6 +40,6 @@ func restore(cliCtx *cli.Context) error {
 		return err
 	}
 
-	logrus.Info("Restore completed successfully")
+	log.Info("Restore completed successfully")
 	return nil
 }
diff --git a/slasher/detection/BUILD.bazel b/slasher/detection/BUILD.bazel
index 57b3f3601c..05baef0cd4 100644
--- a/slasher/detection/BUILD.bazel
+++ b/slasher/detection/BUILD.bazel
@@ -6,6 +6,7 @@ go_library(
     srcs = [
         "detect.go",
         "listeners.go",
+        "log.go",
         "metrics.go",
         "service.go",
     ],
diff --git a/slasher/detection/log.go b/slasher/detection/log.go
new file mode 100644
index 0000000000..6093918e7e
--- /dev/null
+++ b/slasher/detection/log.go
@@ -0,0 +1,5 @@
+package detection
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "detection")
diff --git a/slasher/detection/service.go b/slasher/detection/service.go
index 75035283e3..968b705e90 100644
--- a/slasher/detection/service.go
+++ b/slasher/detection/service.go
@@ -16,8 +16,6 @@ import (
 	"go.opencensus.io/trace"
 )
 
-var log = logrus.WithField("prefix", "detection")
-
 // Status detection statuses type.
 type Status int
 
diff --git a/slasher/log.go b/slasher/log.go
new file mode 100644
index 0000000000..f295010594
--- /dev/null
+++ b/slasher/log.go
@@ -0,0 +1,5 @@
+package main
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "main")
diff --git a/slasher/main.go b/slasher/main.go
index 9c7e0d5ec2..c92f6da464 100644
--- a/slasher/main.go
+++ b/slasher/main.go
@@ -24,8 +24,6 @@ import (
 	prefixed "github.com/x-cray/logrus-prefixed-formatter"
 )
 
-var log = logrus.WithField("prefix", "main")
-
 func startSlasher(cliCtx *cli.Context) error {
 	// verify if ToS accepted
 	if err := tos.VerifyTosAcceptedOrPrompt(cliCtx); err != nil {
diff --git a/slasher/node/BUILD.bazel b/slasher/node/BUILD.bazel
index 9f28d4f9c3..c321236ba9 100644
--- a/slasher/node/BUILD.bazel
+++ b/slasher/node/BUILD.bazel
@@ -3,7 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["node.go"],
+    srcs = [
+        "log.go",
+        "node.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/slasher/node",
     visibility = ["//slasher:__subpackages__"],
     deps = [
diff --git a/slasher/node/log.go b/slasher/node/log.go
new file mode 100644
index 0000000000..2c3b06e822
--- /dev/null
+++ b/slasher/node/log.go
@@ -0,0 +1,5 @@
+package node
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "node")
diff --git a/slasher/node/node.go b/slasher/node/node.go
index 5b908bf26a..b537f248a4 100644
--- a/slasher/node/node.go
+++ b/slasher/node/node.go
@@ -34,8 +34,6 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var log = logrus.WithField("prefix", "node")
-
 // SlasherNode defines a struct that handles the services running a slashing detector
 // for eth2. It handles the lifecycle of the entire system and registers
 // services to a service registry.
diff --git a/slasher/rpc/BUILD.bazel b/slasher/rpc/BUILD.bazel
index 10b09bd5e9..e19fc033b4 100644
--- a/slasher/rpc/BUILD.bazel
+++ b/slasher/rpc/BUILD.bazel
@@ -4,6 +4,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "server.go",
         "service.go",
     ],
diff --git a/slasher/rpc/log.go b/slasher/rpc/log.go
new file mode 100644
index 0000000000..5c2ea5ccf3
--- /dev/null
+++ b/slasher/rpc/log.go
@@ -0,0 +1,5 @@
+package rpc
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc")
diff --git a/slasher/rpc/service.go b/slasher/rpc/service.go
index f3af3dd4ea..3eafd82722 100644
--- a/slasher/rpc/service.go
+++ b/slasher/rpc/service.go
@@ -17,7 +17,6 @@ import (
 	"github.com/prysmaticlabs/prysm/slasher/beaconclient"
 	"github.com/prysmaticlabs/prysm/slasher/db"
 	"github.com/prysmaticlabs/prysm/slasher/detection"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/plugin/ocgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -52,8 +51,6 @@ type Config struct {
 	BeaconClient *beaconclient.Service
 }
 
-var log = logrus.WithField("prefix", "rpc")
-
 // NewService instantiates a new RPC service instance that will
 // be registered into a running beacon node.
 func NewService(ctx context.Context, cfg *Config) *Service {
diff --git a/validator/BUILD.bazel b/validator/BUILD.bazel
index 459d21fc16..a8a1c1d733 100644
--- a/validator/BUILD.bazel
+++ b/validator/BUILD.bazel
@@ -8,6 +8,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "main.go",
         "usage.go",
     ],
diff --git a/validator/accounts/BUILD.bazel b/validator/accounts/BUILD.bazel
index ef9a0d6211..40602d79df 100644
--- a/validator/accounts/BUILD.bazel
+++ b/validator/accounts/BUILD.bazel
@@ -15,6 +15,7 @@ go_library(
         "cmd_accounts.go",
         "cmd_wallet.go",
         "doc.go",
+        "log.go",
         "wallet_create.go",
         "wallet_edit.go",
         "wallet_recover.go",
diff --git a/validator/accounts/accounts.go b/validator/accounts/accounts.go
index 8f71baaf5a..ea52e55fb6 100644
--- a/validator/accounts/accounts.go
+++ b/validator/accounts/accounts.go
@@ -3,11 +3,8 @@ package accounts
 import (
 	"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
 	"github.com/prysmaticlabs/prysm/validator/keymanager"
-	"github.com/sirupsen/logrus"
 )
 
-var log = logrus.WithField("prefix", "accounts")
-
 var msgKeymanagerNotSupported = "keymanager kind not supported: %s"
 
 // AccountsConfig specifies parameters to run to delete, enable, disable accounts.
diff --git a/validator/accounts/log.go b/validator/accounts/log.go
new file mode 100644
index 0000000000..21a541d77d
--- /dev/null
+++ b/validator/accounts/log.go
@@ -0,0 +1,5 @@
+package accounts
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "accounts")
diff --git a/validator/accounts/prompt/BUILD.bazel b/validator/accounts/prompt/BUILD.bazel
index 08cde4fcd3..c8e9229ad3 100644
--- a/validator/accounts/prompt/BUILD.bazel
+++ b/validator/accounts/prompt/BUILD.bazel
@@ -2,7 +2,10 @@ load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = ["prompt.go"],
+    srcs = [
+        "log.go",
+        "prompt.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/validator/accounts/prompt",
     visibility = ["//validator:__subpackages__"],
     deps = [
diff --git a/validator/accounts/prompt/log.go b/validator/accounts/prompt/log.go
new file mode 100644
index 0000000000..e909277a07
--- /dev/null
+++ b/validator/accounts/prompt/log.go
@@ -0,0 +1,5 @@
+package prompt
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "prompt")
diff --git a/validator/accounts/prompt/prompt.go b/validator/accounts/prompt/prompt.go
index 65b5676b55..92c0c3222a 100644
--- a/validator/accounts/prompt/prompt.go
+++ b/validator/accounts/prompt/prompt.go
@@ -12,7 +12,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/promptutil"
 	"github.com/prysmaticlabs/prysm/validator/flags"
 	"github.com/prysmaticlabs/prysm/validator/keymanager/remote"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -33,10 +32,7 @@ const (
 	SelectAccountsEnablePromptText = "Select the account(s) you would like to enable"
 )
 
-var (
-	au  = aurora.NewAurora(true)
-	log = logrus.WithField("prefix", "prompt")
-)
+var au = aurora.NewAurora(true)
 
 // InputDirectory from the cli.
 func InputDirectory(cliCtx *cli.Context, promptText string, flag *cli.StringFlag) (string, error) {
diff --git a/validator/accounts/wallet/BUILD.bazel b/validator/accounts/wallet/BUILD.bazel
index 56759249b1..02e41e258e 100644
--- a/validator/accounts/wallet/BUILD.bazel
+++ b/validator/accounts/wallet/BUILD.bazel
@@ -3,7 +3,10 @@ load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = ["wallet.go"],
+    srcs = [
+        "log.go",
+        "wallet.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/validator/accounts/wallet",
     visibility = ["//validator:__subpackages__"],
     deps = [
diff --git a/validator/accounts/wallet/log.go b/validator/accounts/wallet/log.go
new file mode 100644
index 0000000000..ff6bb92eab
--- /dev/null
+++ b/validator/accounts/wallet/log.go
@@ -0,0 +1,5 @@
+package wallet
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "wallet")
diff --git a/validator/accounts/wallet/wallet.go b/validator/accounts/wallet/wallet.go
index 08d5709378..f3b3ef0a22 100644
--- a/validator/accounts/wallet/wallet.go
+++ b/validator/accounts/wallet/wallet.go
@@ -22,8 +22,6 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var log = logrus.WithField("prefix", "wallet")
-
 const (
 	// KeymanagerConfigFileName for the keymanager used by the wallet: imported, derived, or remote.
 	KeymanagerConfigFileName = "keymanageropts.json"
diff --git a/validator/client/log.go b/validator/client/log.go
index ac4c935e45..24f01c2c4c 100644
--- a/validator/client/log.go
+++ b/validator/client/log.go
@@ -12,6 +12,8 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+var log = logrus.WithField("prefix", "validator")
+
 type attSubmitted struct {
 	data              *ethpb.AttestationData
 	attesterIndices   []uint64
diff --git a/validator/client/service.go b/validator/client/service.go
index 41cc696353..933d412f23 100644
--- a/validator/client/service.go
+++ b/validator/client/service.go
@@ -25,15 +25,12 @@ import (
 	"github.com/prysmaticlabs/prysm/validator/keymanager"
 	"github.com/prysmaticlabs/prysm/validator/keymanager/imported"
 	slashingprotection "github.com/prysmaticlabs/prysm/validator/slashing-protection"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/plugin/ocgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/metadata"
 )
 
-var log = logrus.WithField("prefix", "validator")
-
 // SyncChecker is able to determine if a beacon node is currently
 // going through chain synchronization.
 type SyncChecker interface {
diff --git a/validator/db/BUILD.bazel b/validator/db/BUILD.bazel
index a0674f1107..0773d285b3 100644
--- a/validator/db/BUILD.bazel
+++ b/validator/db/BUILD.bazel
@@ -6,6 +6,7 @@ go_library(
     srcs = [
         "alias.go",
         "cmd.go",
+        "log.go",
         "restore.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/db",
diff --git a/validator/db/cmd.go b/validator/db/cmd.go
index d9c77a7e5e..5979e4d08b 100644
--- a/validator/db/cmd.go
+++ b/validator/db/cmd.go
@@ -3,7 +3,6 @@ package db
 import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/tos"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -23,7 +22,7 @@ var DatabaseCommands = &cli.Command{
 			Before: tos.VerifyTosAcceptedOrPrompt,
 			Action: func(cliCtx *cli.Context) error {
 				if err := restore(cliCtx); err != nil {
-					logrus.Fatalf("Could not restore database: %v", err)
+					log.Fatalf("Could not restore database: %v", err)
 				}
 				return nil
 			},
diff --git a/validator/db/kv/BUILD.bazel b/validator/db/kv/BUILD.bazel
index 80076b0c56..bcc4136880 100644
--- a/validator/db/kv/BUILD.bazel
+++ b/validator/db/kv/BUILD.bazel
@@ -10,6 +10,7 @@ go_library(
         "db.go",
         "genesis.go",
         "historical_attestations.go",
+        "log.go",
         "migration.go",
         "proposal_history_v2.go",
         "prune_attester_protection.go",
diff --git a/validator/db/kv/backup.go b/validator/db/kv/backup.go
index a02d2695fc..831f84ec8d 100644
--- a/validator/db/kv/backup.go
+++ b/validator/db/kv/backup.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
@@ -36,7 +35,7 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 		return err
 	}
 	backupPath := path.Join(backupsDir, fmt.Sprintf("prysm_validatordb_%d.backup", time.Now().Unix()))
-	logrus.WithField("prefix", "db").WithField("backup", backupPath).Info("Writing backup database")
+	log.WithField("backup", backupPath).Info("Writing backup database")
 
 	copyDB, err := bolt.Open(
 		backupPath,
@@ -48,13 +47,13 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 	}
 	defer func() {
 		if err := copyDB.Close(); err != nil {
-			logrus.WithError(err).Error("Failed to close backup database")
+			log.WithError(err).Error("Failed to close backup database")
 		}
 	}()
 
 	return s.db.View(func(tx *bolt.Tx) error {
 		return tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			logrus.Debugf("Copying bucket %s\n", name)
+			log.Debugf("Copying bucket %s\n", name)
 			return copyDB.Update(func(tx2 *bolt.Tx) error {
 				b2, err := tx2.CreateBucketIfNotExists(name)
 				if err != nil {
diff --git a/validator/db/kv/historical_attestations.go b/validator/db/kv/historical_attestations.go
index 6778f8edfb..3e2540d1d4 100644
--- a/validator/db/kv/historical_attestations.go
+++ b/validator/db/kv/historical_attestations.go
@@ -7,7 +7,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	log "github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 )
 
diff --git a/validator/db/kv/log.go b/validator/db/kv/log.go
new file mode 100644
index 0000000000..5c1d80880c
--- /dev/null
+++ b/validator/db/kv/log.go
@@ -0,0 +1,5 @@
+package kv
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")
diff --git a/validator/db/log.go b/validator/db/log.go
new file mode 100644
index 0000000000..f320f2fe6a
--- /dev/null
+++ b/validator/db/log.go
@@ -0,0 +1,5 @@
+package db
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")
diff --git a/validator/db/restore.go b/validator/db/restore.go
index 995e586699..26d46e8de9 100644
--- a/validator/db/restore.go
+++ b/validator/db/restore.go
@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/promptutil"
 	"github.com/prysmaticlabs/prysm/validator/db/kv"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -29,7 +28,7 @@ func restore(cliCtx *cli.Context) error {
 			return errors.Wrap(err, "could not validate choice")
 		}
 		if strings.EqualFold(resp, "n") {
-			logrus.Info("Restore aborted")
+			log.Info("Restore aborted")
 			return nil
 		}
 	}
@@ -40,6 +39,6 @@ func restore(cliCtx *cli.Context) error {
 		return err
 	}
 
-	logrus.Info("Restore completed successfully")
+	log.Info("Restore completed successfully")
 	return nil
 }
diff --git a/validator/keymanager/derived/BUILD.bazel b/validator/keymanager/derived/BUILD.bazel
index 87c9c08b39..438311e441 100644
--- a/validator/keymanager/derived/BUILD.bazel
+++ b/validator/keymanager/derived/BUILD.bazel
@@ -5,6 +5,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "keymanager.go",
+        "log.go",
         "mnemonic.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/keymanager/derived",
diff --git a/validator/keymanager/derived/keymanager.go b/validator/keymanager/derived/keymanager.go
index a8ebfe6b6a..c5b017940b 100644
--- a/validator/keymanager/derived/keymanager.go
+++ b/validator/keymanager/derived/keymanager.go
@@ -10,14 +10,9 @@ import (
 	"github.com/prysmaticlabs/prysm/validator/accounts/iface"
 	"github.com/prysmaticlabs/prysm/validator/keymanager"
 	"github.com/prysmaticlabs/prysm/validator/keymanager/imported"
-	"github.com/sirupsen/logrus"
 	util "github.com/wealdtech/go-eth2-util"
 )
 
-var (
-	log = logrus.WithField("prefix", "derived-keymanager")
-)
-
 const (
 	// DerivationPathFormat describes the structure of how keys are derived from a master key.
 	DerivationPathFormat = "m / purpose / coin_type / account_index / withdrawal_key / validating_key"
diff --git a/validator/keymanager/derived/log.go b/validator/keymanager/derived/log.go
new file mode 100644
index 0000000000..a4b39d299a
--- /dev/null
+++ b/validator/keymanager/derived/log.go
@@ -0,0 +1,5 @@
+package derived
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "derived-keymanager")
diff --git a/validator/keymanager/imported/BUILD.bazel b/validator/keymanager/imported/BUILD.bazel
index b46f5085d3..f217dc5fb3 100644
--- a/validator/keymanager/imported/BUILD.bazel
+++ b/validator/keymanager/imported/BUILD.bazel
@@ -9,6 +9,7 @@ go_library(
         "enable_disable.go",
         "import.go",
         "keymanager.go",
+        "log.go",
         "refresh.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/keymanager/imported",
diff --git a/validator/keymanager/imported/keymanager.go b/validator/keymanager/imported/keymanager.go
index d7279bf117..c091b589ec 100644
--- a/validator/keymanager/imported/keymanager.go
+++ b/validator/keymanager/imported/keymanager.go
@@ -24,7 +24,6 @@ import (
 )
 
 var (
-	log               = logrus.WithField("prefix", "imported-keymanager")
 	lock              sync.RWMutex
 	orderedPublicKeys = make([][48]byte, 0)
 	secretKeysCache   = make(map[[48]byte]bls.SecretKey)
diff --git a/validator/keymanager/imported/log.go b/validator/keymanager/imported/log.go
new file mode 100644
index 0000000000..98aebef6cb
--- /dev/null
+++ b/validator/keymanager/imported/log.go
@@ -0,0 +1,5 @@
+package imported
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "imported-keymanager")
diff --git a/validator/keymanager/remote/BUILD.bazel b/validator/keymanager/remote/BUILD.bazel
index 7d681c9221..bb8cd0a463 100644
--- a/validator/keymanager/remote/BUILD.bazel
+++ b/validator/keymanager/remote/BUILD.bazel
@@ -6,6 +6,7 @@ go_library(
     srcs = [
         "doc.go",
         "keymanager.go",
+        "log.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/keymanager/remote",
     visibility = [
diff --git a/validator/keymanager/remote/keymanager.go b/validator/keymanager/remote/keymanager.go
index fd1b7b9023..722b85a1e0 100644
--- a/validator/keymanager/remote/keymanager.go
+++ b/validator/keymanager/remote/keymanager.go
@@ -16,13 +16,11 @@ import (
 	validatorpb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2"
 	"github.com/prysmaticlabs/prysm/shared/bls"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )
 
 var (
-	log = logrus.WithField("prefix", "remote-keymanager")
 	// ErrSigningFailed defines a failure from the remote server
 	// when performing a signing operation.
 	ErrSigningFailed = errors.New("signing failed in the remote server")
diff --git a/validator/keymanager/remote/log.go b/validator/keymanager/remote/log.go
new file mode 100644
index 0000000000..3e7e5ec2f0
--- /dev/null
+++ b/validator/keymanager/remote/log.go
@@ -0,0 +1,5 @@
+package remote
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "remote-keymanager")
diff --git a/validator/log.go b/validator/log.go
new file mode 100644
index 0000000000..f295010594
--- /dev/null
+++ b/validator/log.go
@@ -0,0 +1,5 @@
+package main
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "main")
diff --git a/validator/main.go b/validator/main.go
index c180a80792..0243844b8e 100644
--- a/validator/main.go
+++ b/validator/main.go
@@ -29,8 +29,6 @@ import (
 	prefixed "github.com/x-cray/logrus-prefixed-formatter"
 )
 
-var log = logrus.WithField("prefix", "main")
-
 func startNode(ctx *cli.Context) error {
 	// verify if ToS accepted
 	if err := tos.VerifyTosAcceptedOrPrompt(ctx); err != nil {
diff --git a/validator/node/BUILD.bazel b/validator/node/BUILD.bazel
index 02d9feda4e..73fb4bfc6c 100644
--- a/validator/node/BUILD.bazel
+++ b/validator/node/BUILD.bazel
@@ -19,7 +19,10 @@ go_test(
 
 go_library(
     name = "go_default_library",
-    srcs = ["node.go"],
+    srcs = [
+        "log.go",
+        "node.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/validator/node",
     visibility = ["//validator:__subpackages__"],
     deps = [
diff --git a/validator/node/log.go b/validator/node/log.go
new file mode 100644
index 0000000000..2c3b06e822
--- /dev/null
+++ b/validator/node/log.go
@@ -0,0 +1,5 @@
+package node
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "node")
diff --git a/validator/node/node.go b/validator/node/node.go
index 50c00f3b04..65b93937f4 100644
--- a/validator/node/node.go
+++ b/validator/node/node.go
@@ -40,8 +40,6 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var log = logrus.WithField("prefix", "node")
-
 // ValidatorClient defines an instance of an eth2 validator that manages
 // the entire lifecycle of services attached to it participating in eth2.
 type ValidatorClient struct {
diff --git a/validator/rpc/BUILD.bazel b/validator/rpc/BUILD.bazel
index 58b619a829..0593a41b94 100644
--- a/validator/rpc/BUILD.bazel
+++ b/validator/rpc/BUILD.bazel
@@ -9,6 +9,7 @@ go_library(
         "beacon.go",
         "health.go",
         "intercepter.go",
+        "log.go",
         "server.go",
         "wallet.go",
     ],
diff --git a/validator/rpc/gateway/BUILD.bazel b/validator/rpc/gateway/BUILD.bazel
index d7b6cab3ae..d7b9385017 100644
--- a/validator/rpc/gateway/BUILD.bazel
+++ b/validator/rpc/gateway/BUILD.bazel
@@ -2,7 +2,10 @@ load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = ["gateway.go"],
+    srcs = [
+        "gateway.go",
+        "log.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/validator/rpc/gateway",
     visibility = ["//validator:__subpackages__"],
     deps = [
diff --git a/validator/rpc/gateway/gateway.go b/validator/rpc/gateway/gateway.go
index cb0656bd01..399d5580d1 100644
--- a/validator/rpc/gateway/gateway.go
+++ b/validator/rpc/gateway/gateway.go
@@ -9,12 +9,9 @@ import (
 	pb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2_gateway"
 	"github.com/prysmaticlabs/prysm/validator/web"
 	"github.com/rs/cors"
-	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 )
 
-var log = logrus.WithField("prefix", "gateway")
-
 // Gateway is the gRPC gateway to serve HTTP JSON traffic as a
 // proxy and forward it to the gRPC server.
 type Gateway struct {
diff --git a/validator/rpc/gateway/log.go b/validator/rpc/gateway/log.go
new file mode 100644
index 0000000000..fe3dcc54cd
--- /dev/null
+++ b/validator/rpc/gateway/log.go
@@ -0,0 +1,5 @@
+package gateway
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "gateway")
diff --git a/validator/rpc/log.go b/validator/rpc/log.go
new file mode 100644
index 0000000000..5c2ea5ccf3
--- /dev/null
+++ b/validator/rpc/log.go
@@ -0,0 +1,5 @@
+package rpc
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc")
diff --git a/validator/rpc/server.go b/validator/rpc/server.go
index 0c29aa0394..3b5890782b 100644
--- a/validator/rpc/server.go
+++ b/validator/rpc/server.go
@@ -29,12 +29,6 @@ import (
 	"google.golang.org/grpc/reflection"
 )
 
-var log logrus.FieldLogger
-
-func init() {
-	log = logrus.WithField("prefix", "rpc")
-}
-
 // Config options for the gRPC server.
 type Config struct {
 	ValidatorGatewayHost     string
diff --git a/validator/slashing-protection/BUILD.bazel b/validator/slashing-protection/BUILD.bazel
index f99c3aff83..d87eb275ea 100644
--- a/validator/slashing-protection/BUILD.bazel
+++ b/validator/slashing-protection/BUILD.bazel
@@ -5,6 +5,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "external.go",
+        "log.go",
         "protector.go",
         "slasher_client.go",
     ],
diff --git a/validator/slashing-protection/external.go b/validator/slashing-protection/external.go
index 83ed55e33f..530689ddd2 100644
--- a/validator/slashing-protection/external.go
+++ b/validator/slashing-protection/external.go
@@ -4,7 +4,6 @@ import (
 	"context"
 
 	ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
-	log "github.com/sirupsen/logrus"
 )
 
 // CheckBlockSafety this function is part of slashing protection for block proposals it performs
diff --git a/validator/slashing-protection/local/standard-protection-format/BUILD.bazel b/validator/slashing-protection/local/standard-protection-format/BUILD.bazel
index 373c91ff9d..6b25ebff49 100644
--- a/validator/slashing-protection/local/standard-protection-format/BUILD.bazel
+++ b/validator/slashing-protection/local/standard-protection-format/BUILD.bazel
@@ -8,6 +8,7 @@ go_library(
         "format.go",
         "helpers.go",
         "import.go",
+        "log.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/slashing-protection/local/standard-protection-format",
     visibility = ["//validator:__subpackages__"],
diff --git a/validator/slashing-protection/local/standard-protection-format/format.go b/validator/slashing-protection/local/standard-protection-format/format.go
index f8b29c4879..06b915c437 100644
--- a/validator/slashing-protection/local/standard-protection-format/format.go
+++ b/validator/slashing-protection/local/standard-protection-format/format.go
@@ -3,10 +3,6 @@
 // is critical to allow safe interoperability between eth2 clients.
 package interchangeformat
 
-import "github.com/sirupsen/logrus"
-
-var log = logrus.WithField("prefix", "slashing-protection-format")
-
 // INTERCHANGE_FORMAT_VERSION specified by https://eips.ethereum.org/EIPS/eip-3076.
 // The version Prysm supports is version 5.
 const INTERCHANGE_FORMAT_VERSION = "5"
diff --git a/validator/slashing-protection/local/standard-protection-format/log.go b/validator/slashing-protection/local/standard-protection-format/log.go
new file mode 100644
index 0000000000..ec6567d6a8
--- /dev/null
+++ b/validator/slashing-protection/local/standard-protection-format/log.go
@@ -0,0 +1,5 @@
+package interchangeformat
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "slashing-protection-format")
diff --git a/validator/slashing-protection/log.go b/validator/slashing-protection/log.go
new file mode 100644
index 0000000000..7802e7a3e5
--- /dev/null
+++ b/validator/slashing-protection/log.go
@@ -0,0 +1,5 @@
+package slashingprotection
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "slashingprotection")
diff --git a/validator/slashing-protection/slasher_client.go b/validator/slashing-protection/slasher_client.go
index e888d6ff53..1741aff4de 100644
--- a/validator/slashing-protection/slasher_client.go
+++ b/validator/slashing-protection/slasher_client.go
@@ -13,7 +13,6 @@ import (
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	ethsl "github.com/prysmaticlabs/prysm/proto/slashing"
 	"github.com/prysmaticlabs/prysm/shared/grpcutils"
-	log "github.com/sirupsen/logrus"
 	"go.opencensus.io/plugin/ocgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
diff --git a/validator/web/BUILD.bazel b/validator/web/BUILD.bazel
index 6ee190977a..bda7cf14e8 100644
--- a/validator/web/BUILD.bazel
+++ b/validator/web/BUILD.bazel
@@ -8,6 +8,7 @@ go_library(
     srcs = [
         "doc.go",
         "handler.go",
+        "log.go",
         ":site_data",  # keep
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/web",
diff --git a/validator/web/handler.go b/validator/web/handler.go
index 8b0fea6ef1..1e11628a8c 100644
--- a/validator/web/handler.go
+++ b/validator/web/handler.go
@@ -5,16 +5,10 @@ import (
 	"net/http"
 	"net/url"
 	"path"
-
-	"github.com/sirupsen/logrus"
 )
 
 const prefix = "external/prysm_web_ui/prysm-web-ui"
 
-var (
-	log = logrus.WithField("prefix", "prysm-web")
-)
-
 // Handler serves web requests from the bundled site data.
 var Handler = func(res http.ResponseWriter, req *http.Request) {
 	u, err := url.ParseRequestURI(req.RequestURI)
diff --git a/validator/web/log.go b/validator/web/log.go
new file mode 100644
index 0000000000..f002b41858
--- /dev/null
+++ b/validator/web/log.go
@@ -0,0 +1,5 @@
+package web
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "prysm-web")