diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim
index c9764990f..381e105da 100644
--- a/apps/wakunode2/wakunode2.nim
+++ b/apps/wakunode2/wakunode2.nim
@@ -41,11 +41,11 @@ import
   ../../waku/v2/protocol/waku_store,
   ../../waku/v2/protocol/waku_filter,
   ../../waku/v2/protocol/waku_lightpush,
+  ../../waku/v2/protocol/waku_enr,
   ../../waku/v2/protocol/waku_dnsdisc,
   ../../waku/v2/protocol/waku_discv5,
   ../../waku/v2/protocol/waku_peer_exchange,
   ../../waku/v2/utils/peers,
-  ../../waku/v2/utils/wakuenr,
   ./wakunode2_setup_rest,
   ./wakunode2_setup_rpc,
   ./config
diff --git a/examples/v2/publisher.nim b/examples/v2/publisher.nim
index 45615ce5d..48bae9128 100644
--- a/examples/v2/publisher.nim
+++ b/examples/v2/publisher.nim
@@ -14,9 +14,9 @@ import
   ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/node/waku_node,
   ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/protocol/waku_enr,
   ../../../waku/v2/protocol/waku_discv5,
-  ../../../waku/v2/utils/time,
-  ../../../waku/v2/utils/wakuenr
+  ../../../waku/v2/utils/time
 
 proc now*(): Timestamp =
   getNanosecondTime(getTime().toUnixFloat())
diff --git a/examples/v2/subscriber.nim b/examples/v2/subscriber.nim
index be9804079..6c1a2556c 100644
--- a/examples/v2/subscriber.nim
+++ b/examples/v2/subscriber.nim
@@ -14,8 +14,8 @@ import
   ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/node/waku_node,
   ../../../waku/v2/protocol/waku_message,
-  ../../../waku/v2/protocol/waku_discv5,
-  ../../../waku/v2/utils/wakuenr
+  ../../../waku/v2/protocol/waku_enr,
+  ../../../waku/v2/protocol/waku_discv5
 
 # An accesible bootstrap node. See wakuv2.prod fleets.status.im
 const bootstrapNodes = @["enr:-Nm4QOdTOKZJKTUUZ4O_W932CXIET-M9NamewDnL78P5u9DOGnZlK0JFZ4k0inkfe6iY-0JAaJVovZXc575VV3njeiABgmlkgnY0gmlwhAjS3ueKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhAo0C-VvfgHiXrxZi3umDiooXMGY9FvYj5_d1Q4EeS7eyg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"]
diff --git a/tests/all_tests_v2.nim b/tests/all_tests_v2.nim
index 480916208..0ef96fda8 100644
--- a/tests/all_tests_v2.nim
+++ b/tests/all_tests_v2.nim
@@ -55,9 +55,9 @@ import
   ./v2/test_peer_manager,
   ./v2/test_peer_storage,
   ./v2/test_waku_keepalive,
+  ./v2/test_waku_enr,
   ./v2/test_waku_dnsdisc,
   ./v2/test_waku_discv5,
-  ./v2/test_enr_utils,
   ./v2/test_peer_exchange,
   ./v2/test_waku_noise,
   ./v2/test_waku_noise_sessions,
diff --git a/tests/v2/test_enr_utils.nim b/tests/v2/test_waku_enr.nim
similarity index 99%
rename from tests/v2/test_enr_utils.nim
rename to tests/v2/test_waku_enr.nim
index 015fb8ed6..147c06b95 100644
--- a/tests/v2/test_enr_utils.nim
+++ b/tests/v2/test_waku_enr.nim
@@ -2,14 +2,13 @@
 
 import
   std/[options, sequtils],
-  chronos,
   stew/byteutils,
   testutils/unittests
 import
-  ../../waku/v2/utils/wakuenr,
+  ../../waku/v2/protocol/waku_enr,
   ./testlib/waku2
 
-procSuite "ENR utils":
+suite "Waku ENR":
 
   test "Parse multiaddr field":
     let
diff --git a/tools/networkmonitor/networkmonitor.nim b/tools/networkmonitor/networkmonitor.nim
index 6fee6f04b..99910c84b 100644
--- a/tools/networkmonitor/networkmonitor.nim
+++ b/tools/networkmonitor/networkmonitor.nim
@@ -23,10 +23,10 @@ import
   ../../waku/v2/node/peer_manager,
   ../../waku/v2/node/waku_node,
   ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/protocol/waku_enr,
   ../../waku/v2/protocol/waku_discv5,
   ../../waku/v2/protocol/waku_dnsdisc,
   ../../waku/v2/utils/peers,
-  ../../waku/v2/utils/wakuenr,
   ./networkmonitor_metrics,
   ./networkmonitor_config,
   ./networkmonitor_utils
diff --git a/waku/v2/node/waku_node.nim b/waku/v2/node/waku_node.nim
index 74cba8a17..d9c6ff620 100644
--- a/waku/v2/node/waku_node.nim
+++ b/waku/v2/node/waku_node.nim
@@ -35,11 +35,11 @@ import
   ../protocol/waku_filter/client as filter_client,
   ../protocol/waku_lightpush,
   ../protocol/waku_lightpush/client as lightpush_client,
+  ../protocol/waku_enr,
   ../protocol/waku_dnsdisc,
   ../protocol/waku_discv5,
   ../protocol/waku_peer_exchange,
   ../utils/peers,
-  ../utils/wakuenr,
   ../utils/time,
   ./peer_manager,
   ./wakuswitch
diff --git a/waku/v2/protocol/waku_discv5.nim b/waku/v2/protocol/waku_discv5.nim
index 5963c5787..de3fcfaf8 100644
--- a/waku/v2/protocol/waku_discv5.nim
+++ b/waku/v2/protocol/waku_discv5.nim
@@ -15,9 +15,9 @@ import
   eth/p2p/discoveryv5/protocol
 import
   ../utils/peers,
-  ../utils/wakuenr
+  ./waku_enr
 
-export protocol, wakuenr
+export protocol, waku_enr
 
 
 declarePublicGauge waku_discv5_discovered, "number of nodes discovered"
diff --git a/waku/v2/utils/wakuenr.nim b/waku/v2/protocol/waku_enr.nim
similarity index 97%
rename from waku/v2/utils/wakuenr.nim
rename to waku/v2/protocol/waku_enr.nim
index 8154377af..e603a92b6 100644
--- a/waku/v2/utils/wakuenr.nim
+++ b/waku/v2/protocol/waku_enr.nim
@@ -2,17 +2,19 @@
 ## Implemented according to the specified Waku v2 ENR usage
 ## More at https://rfc.vac.dev/spec/31/
 
-{.push raises: [Defect]}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[bitops, sequtils],
+  stew/[endians2, results],
+  stew/shims/net,
   eth/keys,
   eth/p2p/discoveryv5/enr,
   libp2p/[multiaddress, multicodec],
-  libp2p/crypto/crypto,
-  stew/[endians2, results],
-  stew/shims/net,
-  std/bitops
+  libp2p/crypto/crypto
 
 export enr, crypto, multiaddress, net