diff --git a/build.gradle b/build.gradle
index 9fcd5ca81..e08c032d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,7 @@ targetCompatibility = JavaVersion.VERSION_21
 repositories {
   mavenCentral()
   maven { url "https://artifacts.consensys.net/public/maven/maven/" }
+  mavenLocal()
 }
 
 dependencies {
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index f93472851..657c90f84 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -26,7 +26,7 @@ dependencyManagement {
     dependency 'org.mockito:mockito-core:5.12.0'
 
     dependency 'io.vertx:vertx-core:4.5.9'
-    dependencySet(group: 'io.consensys.tuweni', version: '2.7.0') {
+    dependencySet(group: 'io.consensys.tuweni', version: '2.7.4-EXPERIMENTAL-SNAPSHOT') {
       entry 'tuweni-bytes'
       entry 'tuweni-crypto'
       entry 'tuweni-rlp'
diff --git a/src/main/java/org/ethereum/beacon/discovery/DiscoveryManager.java b/src/main/java/org/ethereum/beacon/discovery/DiscoveryManager.java
index fa3fb02ec..1ab71e413 100644
--- a/src/main/java/org/ethereum/beacon/discovery/DiscoveryManager.java
+++ b/src/main/java/org/ethereum/beacon/discovery/DiscoveryManager.java
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 /**
diff --git a/src/main/java/org/ethereum/beacon/discovery/DiscoveryManagerImpl.java b/src/main/java/org/ethereum/beacon/discovery/DiscoveryManagerImpl.java
index 94e559bd0..45852e16d 100644
--- a/src/main/java/org/ethereum/beacon/discovery/DiscoveryManagerImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/DiscoveryManagerImpl.java
@@ -18,8 +18,8 @@
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.message.FindNodeMessage;
 import org.ethereum.beacon.discovery.message.PingMessage;
 import org.ethereum.beacon.discovery.message.TalkReqMessage;
diff --git a/src/main/java/org/ethereum/beacon/discovery/DiscoverySystem.java b/src/main/java/org/ethereum/beacon/discovery/DiscoverySystem.java
index 7a8d44b56..44d656fb8 100644
--- a/src/main/java/org/ethereum/beacon/discovery/DiscoverySystem.java
+++ b/src/main/java/org/ethereum/beacon/discovery/DiscoverySystem.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.storage.BucketStats;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/DiscoverySystemBuilder.java b/src/main/java/org/ethereum/beacon/discovery/DiscoverySystemBuilder.java
index 3ed1446ba..85f3eea11 100644
--- a/src/main/java/org/ethereum/beacon/discovery/DiscoverySystemBuilder.java
+++ b/src/main/java/org/ethereum/beacon/discovery/DiscoverySystemBuilder.java
@@ -29,7 +29,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker.Pinger;
 import org.ethereum.beacon.discovery.message.handler.DefaultExternalAddressSelector;
diff --git a/src/main/java/org/ethereum/beacon/discovery/DiscoverySystemImpl.java b/src/main/java/org/ethereum/beacon/discovery/DiscoverySystemImpl.java
index 522da1759..3c06a072b 100644
--- a/src/main/java/org/ethereum/beacon/discovery/DiscoverySystemImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/DiscoverySystemImpl.java
@@ -10,8 +10,8 @@
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
 import org.ethereum.beacon.discovery.scheduler.ExpirationSchedulerFactory;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.storage.BucketStats;
diff --git a/src/main/java/org/ethereum/beacon/discovery/MutableDiscoverySystem.java b/src/main/java/org/ethereum/beacon/discovery/MutableDiscoverySystem.java
index 85093995c..665aaaac1 100644
--- a/src/main/java/org/ethereum/beacon/discovery/MutableDiscoverySystem.java
+++ b/src/main/java/org/ethereum/beacon/discovery/MutableDiscoverySystem.java
@@ -4,7 +4,7 @@
 package org.ethereum.beacon.discovery;
 
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 public interface MutableDiscoverySystem extends DiscoverySystem {
diff --git a/src/main/java/org/ethereum/beacon/discovery/TalkHandler.java b/src/main/java/org/ethereum/beacon/discovery/TalkHandler.java
index ab7b5ac1e..5350153f8 100644
--- a/src/main/java/org/ethereum/beacon/discovery/TalkHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/TalkHandler.java
@@ -4,7 +4,7 @@
 package org.ethereum.beacon.discovery;
 
 import java.util.concurrent.CompletableFuture;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 /** The application side TALKREQ messages handler */
diff --git a/src/main/java/org/ethereum/beacon/discovery/liveness/LivenessChecker.java b/src/main/java/org/ethereum/beacon/discovery/liveness/LivenessChecker.java
index 5763bfa22..6680829c1 100644
--- a/src/main/java/org/ethereum/beacon/discovery/liveness/LivenessChecker.java
+++ b/src/main/java/org/ethereum/beacon/discovery/liveness/LivenessChecker.java
@@ -11,7 +11,7 @@
 import java.util.concurrent.CompletableFuture;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.database.ExpirationSet;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/DiscoveryMessageDecoder.java b/src/main/java/org/ethereum/beacon/discovery/message/DiscoveryMessageDecoder.java
index 5bfe306bb..de6545d3d 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/DiscoveryMessageDecoder.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/DiscoveryMessageDecoder.java
@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.message;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.DiscoveryProtocol;
 
 /** Discovery message decoder */
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/DiscoveryV5MessageDecoder.java b/src/main/java/org/ethereum/beacon/discovery/message/DiscoveryV5MessageDecoder.java
index 2e9dcdae0..525dccce7 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/DiscoveryV5MessageDecoder.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/DiscoveryV5MessageDecoder.java
@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.message;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.DiscoveryProtocol;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.ethereum.beacon.discovery.util.DecodeException;
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/FindNodeMessage.java b/src/main/java/org/ethereum/beacon/discovery/message/FindNodeMessage.java
index f960ac4b8..ffc02486c 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/FindNodeMessage.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/FindNodeMessage.java
@@ -9,10 +9,10 @@
 
 import com.google.common.base.Objects;
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.rlp.RLPReader;
-import org.apache.tuweni.rlp.RLPWriter;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.rlp.RLPReader;
+import org.apache.tuweni.v2.rlp.RLPWriter;
 import org.ethereum.beacon.discovery.util.DecodeException;
 import org.ethereum.beacon.discovery.util.RlpDecodeException;
 import org.ethereum.beacon.discovery.util.RlpUtil;
@@ -74,7 +74,7 @@ public List<Integer> getDistances() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/Message.java b/src/main/java/org/ethereum/beacon/discovery/message/Message.java
index 5f83a1a8f..a0a04a6ad 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/Message.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/Message.java
@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.message;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.DiscoveryProtocol;
 
 /** Abstract discovery message */
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/NodesMessage.java b/src/main/java/org/ethereum/beacon/discovery/message/NodesMessage.java
index b81d2b9e7..24ab1fc3b 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/NodesMessage.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/NodesMessage.java
@@ -8,8 +8,8 @@
 
 import java.util.List;
 import java.util.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.ethereum.beacon.discovery.util.RlpUtil;
@@ -58,7 +58,7 @@ public synchronized List<NodeRecord> getNodeRecords() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/PingMessage.java b/src/main/java/org/ethereum/beacon/discovery/message/PingMessage.java
index d1bbbeb19..6cf6db97d 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/PingMessage.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/PingMessage.java
@@ -7,9 +7,9 @@
 import static org.ethereum.beacon.discovery.util.RlpUtil.checkMaxSize;
 
 import com.google.common.base.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
 /**
@@ -47,7 +47,7 @@ public UInt64 getEnrSeq() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/PongMessage.java b/src/main/java/org/ethereum/beacon/discovery/message/PongMessage.java
index 2a6b17af7..23fd186e9 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/PongMessage.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/PongMessage.java
@@ -9,9 +9,9 @@
 import static org.ethereum.beacon.discovery.util.Utils.isPortValid;
 
 import com.google.common.base.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.util.RlpDecodeException;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
@@ -67,7 +67,7 @@ public int getRecipientPort() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/TalkReqMessage.java b/src/main/java/org/ethereum/beacon/discovery/message/TalkReqMessage.java
index 3c5d38567..22c88a93a 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/TalkReqMessage.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/TalkReqMessage.java
@@ -7,8 +7,8 @@
 import static org.ethereum.beacon.discovery.util.RlpUtil.checkMaxSize;
 
 import java.util.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
 /**
@@ -56,7 +56,7 @@ public Bytes getRequest() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/TalkRespMessage.java b/src/main/java/org/ethereum/beacon/discovery/message/TalkRespMessage.java
index 516267d59..0712033df 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/TalkRespMessage.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/TalkRespMessage.java
@@ -7,8 +7,8 @@
 import static org.ethereum.beacon.discovery.util.RlpUtil.checkMaxSize;
 
 import java.util.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
 /** TALKRESP is the response to TALKREQ. */
@@ -45,7 +45,7 @@ public Bytes getResponse() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/V5Message.java b/src/main/java/org/ethereum/beacon/discovery/message/V5Message.java
index a35b4a486..44ef61188 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/V5Message.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/V5Message.java
@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.message;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.DiscoveryProtocol;
 
 /** Message of V5 discovery protocol version */
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTracker.java b/src/main/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTracker.java
index ea0243792..938f0b2fa 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTracker.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTracker.java
@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.message.handler;
 
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.schema.NodeSession;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/handler/PingHandler.java b/src/main/java/org/ethereum/beacon/discovery/message/handler/PingHandler.java
index 6f2da7b45..32d2fd4ed 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/handler/PingHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/handler/PingHandler.java
@@ -5,7 +5,7 @@
 package org.ethereum.beacon.discovery.message.handler;
 
 import java.net.InetSocketAddress;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.message.PingMessage;
 import org.ethereum.beacon.discovery.message.PongMessage;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/handler/PongHandler.java b/src/main/java/org/ethereum/beacon/discovery/message/handler/PongHandler.java
index a140e732b..2d50bb7e9 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/handler/PongHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/handler/PongHandler.java
@@ -11,7 +11,7 @@
 import java.util.Optional;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.message.PongMessage;
 import org.ethereum.beacon.discovery.schema.NodeSession;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/message/handler/TalkReqHandler.java b/src/main/java/org/ethereum/beacon/discovery/message/handler/TalkReqHandler.java
index 041e91e59..e325585ba 100644
--- a/src/main/java/org/ethereum/beacon/discovery/message/handler/TalkReqHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/message/handler/TalkReqHandler.java
@@ -7,7 +7,7 @@
 import java.util.concurrent.CompletableFuture;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.TalkHandler;
 import org.ethereum.beacon.discovery.message.TalkReqMessage;
 import org.ethereum.beacon.discovery.message.TalkRespMessage;
diff --git a/src/main/java/org/ethereum/beacon/discovery/network/DatagramToEnvelope.java b/src/main/java/org/ethereum/beacon/discovery/network/DatagramToEnvelope.java
index 45be93d0a..acadfd1c7 100644
--- a/src/main/java/org/ethereum/beacon/discovery/network/DatagramToEnvelope.java
+++ b/src/main/java/org/ethereum/beacon/discovery/network/DatagramToEnvelope.java
@@ -9,7 +9,7 @@
 import io.netty.channel.socket.DatagramPacket;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.pipeline.Envelope;
 import org.ethereum.beacon.discovery.pipeline.Field;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/network/DiscoveryClient.java b/src/main/java/org/ethereum/beacon/discovery/network/DiscoveryClient.java
index 20eb062fd..38980d84f 100644
--- a/src/main/java/org/ethereum/beacon/discovery/network/DiscoveryClient.java
+++ b/src/main/java/org/ethereum/beacon/discovery/network/DiscoveryClient.java
@@ -5,7 +5,7 @@
 package org.ethereum.beacon.discovery.network;
 
 import java.net.InetSocketAddress;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 
 /** Discovery client sends outgoing messages */
 public interface DiscoveryClient {
diff --git a/src/main/java/org/ethereum/beacon/discovery/network/IncomingMessageSink.java b/src/main/java/org/ethereum/beacon/discovery/network/IncomingMessageSink.java
index 2b7018493..ca445b36f 100644
--- a/src/main/java/org/ethereum/beacon/discovery/network/IncomingMessageSink.java
+++ b/src/main/java/org/ethereum/beacon/discovery/network/IncomingMessageSink.java
@@ -8,7 +8,7 @@
 import io.netty.channel.SimpleChannelInboundHandler;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.pipeline.Envelope;
 import reactor.core.publisher.FluxSink;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/network/NettyDiscoveryClientImpl.java b/src/main/java/org/ethereum/beacon/discovery/network/NettyDiscoveryClientImpl.java
index 280c5051f..4929c1ca3 100644
--- a/src/main/java/org/ethereum/beacon/discovery/network/NettyDiscoveryClientImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/network/NettyDiscoveryClientImpl.java
@@ -12,7 +12,7 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 
@@ -45,7 +45,7 @@ public void stop() {}
   @Override
   public void send(final Bytes data, final InetSocketAddress destination) {
     final DatagramPacket packet =
-        new DatagramPacket(Unpooled.copiedBuffer(data.toArray()), destination);
+        new DatagramPacket(Unpooled.copiedBuffer(data.toArrayUnsafe()), destination);
     final NioDatagramChannel channel =
         channels.get(InternetProtocolFamily.of(destination.getAddress()));
     if (channel == null) {
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/BytesSerializable.java b/src/main/java/org/ethereum/beacon/discovery/packet/BytesSerializable.java
index 3ce2d7e7e..29a61ab26 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/BytesSerializable.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/BytesSerializable.java
@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.packet;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.util.DecodeException;
 
 /** Any class which can be encoded/decoded to/from {@link Bytes} and is backed by {@link Bytes} */
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/HandshakeMessagePacket.java b/src/main/java/org/ethereum/beacon/discovery/packet/HandshakeMessagePacket.java
index 8eada9f12..8e0d82e84 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/HandshakeMessagePacket.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/HandshakeMessagePacket.java
@@ -5,9 +5,8 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket.HandshakeAuthData;
 import org.ethereum.beacon.discovery.packet.impl.HandshakeMessagePacketImpl;
@@ -64,16 +63,16 @@ interface HandshakeAuthData extends AuthData {
     static Bytes signId(
         final Bytes challengeData,
         final Bytes ephemeralPubKey,
-        final Bytes32 destNodeId,
+        final Bytes destNodeId,
         final SecretKey homeNodeSecretKey) {
 
-      Bytes32 idSignatureInput =
+      Bytes idSignatureInput =
           CryptoUtil.sha256(
               Bytes.wrap(ID_SIGNATURE_PREFIX, challengeData, ephemeralPubKey, destNodeId));
       return Functions.sign(homeNodeSecretKey, idSignatureInput);
     }
 
-    Bytes32 getSourceNodeId();
+    Bytes getSourceNodeId();
 
     Bytes getIdSignature();
 
@@ -82,8 +81,8 @@ static Bytes signId(
     Optional<NodeRecord> getNodeRecord(final NodeRecordFactory nodeRecordFactory);
 
     default boolean verify(
-        final Bytes challengeData, final Bytes32 homeNodeId, final Bytes remotePublicKey) {
-      final Bytes32 idSignatureInput =
+        final Bytes challengeData, final Bytes homeNodeId, final Bytes remotePublicKey) {
+      final Bytes idSignatureInput =
           CryptoUtil.sha256(
               Bytes.wrap(ID_SIGNATURE_PREFIX, challengeData, getEphemeralPubKey(), homeNodeId));
       return Functions.verifyECDSASignature(getIdSignature(), idSignatureInput, remotePublicKey);
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/Header.java b/src/main/java/org/ethereum/beacon/discovery/packet/Header.java
index a97380bac..d610973f6 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/Header.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/Header.java
@@ -7,9 +7,8 @@
 import static org.ethereum.beacon.discovery.packet.StaticHeader.VERSION;
 
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket.HandshakeAuthData;
 import org.ethereum.beacon.discovery.packet.OrdinaryMessagePacket.OrdinaryAuthData;
 import org.ethereum.beacon.discovery.packet.StaticHeader.Flag;
@@ -39,7 +38,7 @@ static <TAuthData extends AuthData> Header<TAuthData> create(
     return new HeaderImpl<>(staticHeader, authData);
   }
 
-  static Header<OrdinaryAuthData> createOrdinaryHeader(Bytes32 srcNodeId, Bytes12 gcmNonce) {
+  static Header<OrdinaryAuthData> createOrdinaryHeader(Bytes srcNodeId, Bytes12 gcmNonce) {
     OrdinaryAuthData authData = new OrdinaryAuthDataImpl(srcNodeId);
     return create(Flag.MESSAGE, gcmNonce, authData);
   }
@@ -51,7 +50,7 @@ static Header<WhoAreYouAuthData> createWhoAreYouHeader(
   }
 
   static Header<HandshakeAuthData> createHandshakeHeader(
-      Bytes32 srcNodeId,
+      Bytes srcNodeId,
       Bytes12 nonce,
       Bytes idSignature,
       Bytes ephemeralPubKey,
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/MessagePacket.java b/src/main/java/org/ethereum/beacon/discovery/packet/MessagePacket.java
index 45c25f92c..338e85888 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/MessagePacket.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/MessagePacket.java
@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.packet;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.ethereum.beacon.discovery.type.Bytes16;
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/OrdinaryMessagePacket.java b/src/main/java/org/ethereum/beacon/discovery/packet/OrdinaryMessagePacket.java
index 085e208ad..bfdeaac9f 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/OrdinaryMessagePacket.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/OrdinaryMessagePacket.java
@@ -3,8 +3,8 @@
  */
 package org.ethereum.beacon.discovery.packet;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.packet.OrdinaryMessagePacket.OrdinaryAuthData;
 import org.ethereum.beacon.discovery.packet.impl.OrdinaryMessageImpl;
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/Packet.java b/src/main/java/org/ethereum/beacon/discovery/packet/Packet.java
index 9f00270ed..f43596129 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/Packet.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/Packet.java
@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.packet;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.util.DecodeException;
 
 /**
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/RawPacket.java b/src/main/java/org/ethereum/beacon/discovery/packet/RawPacket.java
index 60c8e9918..43834be82 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/RawPacket.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/RawPacket.java
@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.packet;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.packet.impl.RawPacketImpl;
 import org.ethereum.beacon.discovery.type.Bytes16;
 import org.ethereum.beacon.discovery.util.DecodeException;
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/StaticHeader.java b/src/main/java/org/ethereum/beacon/discovery/packet/StaticHeader.java
index 2e0b0c164..e935d41e0 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/StaticHeader.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/StaticHeader.java
@@ -4,7 +4,7 @@
 package org.ethereum.beacon.discovery.packet;
 
 import java.util.Arrays;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.packet.impl.StaticHeaderImpl;
 import org.ethereum.beacon.discovery.type.Bytes12;
 import org.ethereum.beacon.discovery.type.Bytes2;
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacket.java b/src/main/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacket.java
index 4c584f942..9e22a4b4d 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacket.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacket.java
@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.packet;
 
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.packet.WhoAreYouPacket.WhoAreYouAuthData;
 import org.ethereum.beacon.discovery.packet.impl.WhoAreYouPacketImpl;
 import org.ethereum.beacon.discovery.type.Bytes16;
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/impl/AbstractBytes.java b/src/main/java/org/ethereum/beacon/discovery/packet/impl/AbstractBytes.java
index bec5d01a0..8cad837c5 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/impl/AbstractBytes.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/impl/AbstractBytes.java
@@ -4,7 +4,7 @@
 package org.ethereum.beacon.discovery.packet.impl;
 
 import java.util.Objects;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.packet.BytesSerializable;
 import org.ethereum.beacon.discovery.util.DecodeException;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/impl/HandshakeMessagePacketImpl.java b/src/main/java/org/ethereum/beacon/discovery/packet/impl/HandshakeMessagePacketImpl.java
index 017ce3162..feaf0edbb 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/impl/HandshakeMessagePacketImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/impl/HandshakeMessagePacketImpl.java
@@ -6,8 +6,8 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket.HandshakeAuthData;
@@ -23,14 +23,14 @@ public class HandshakeMessagePacketImpl extends MessagePacketImpl<HandshakeAuthD
   public static class HandshakeAuthDataImpl extends AbstractBytes implements HandshakeAuthData {
 
     public static HandshakeAuthDataImpl create(
-        Bytes32 srcNodeId,
+        Bytes srcNodeId,
         Bytes idSignature,
         Bytes ephemeralPubKey,
         Optional<NodeRecord> nodeRecord) {
       checkArgument(idSignature.size() < 256, "ID signature too large");
       checkArgument(ephemeralPubKey.size() < 256, "Ephemeral pubKey too large");
       return new HandshakeAuthDataImpl(
-          Bytes.concatenate(
+          Bytes.wrap(
               srcNodeId,
               Bytes.of(idSignature.size()),
               Bytes.of(ephemeralPubKey.size()),
@@ -52,8 +52,8 @@ public HandshakeAuthDataImpl(Bytes bytes) {
     private static final int ID_SIG_OFF = EPH_KEY_SIZE_OFF + EPH_KEY_SIZE_SIZE;
 
     @Override
-    public Bytes32 getSourceNodeId() {
-      return Bytes32.wrap(getBytes(), SRC_NODE_ID_OFF);
+    public Bytes getSourceNodeId() {
+      return Bytes32.fromBytes(getBytes(), SRC_NODE_ID_OFF);
     }
 
     private int getSignatureSize() {
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/impl/HeaderImpl.java b/src/main/java/org/ethereum/beacon/discovery/packet/impl/HeaderImpl.java
index 4c0273b66..9f5dc5cf0 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/impl/HeaderImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/impl/HeaderImpl.java
@@ -8,7 +8,7 @@
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.packet.AuthData;
 import org.ethereum.beacon.discovery.packet.Header;
 import org.ethereum.beacon.discovery.packet.StaticHeader;
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/impl/MessagePacketImpl.java b/src/main/java/org/ethereum/beacon/discovery/packet/impl/MessagePacketImpl.java
index 1bd04535a..45360dbfb 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/impl/MessagePacketImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/impl/MessagePacketImpl.java
@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.packet.impl;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.message.DiscoveryV5MessageDecoder;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.packet.AuthData;
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/impl/OrdinaryMessageImpl.java b/src/main/java/org/ethereum/beacon/discovery/packet/impl/OrdinaryMessageImpl.java
index 6f2b1a8d2..4b3c08756 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/impl/OrdinaryMessageImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/impl/OrdinaryMessageImpl.java
@@ -3,8 +3,8 @@
  */
 package org.ethereum.beacon.discovery.packet.impl;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.packet.Header;
 import org.ethereum.beacon.discovery.packet.OrdinaryMessagePacket;
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/impl/PacketImpl.java b/src/main/java/org/ethereum/beacon/discovery/packet/impl/PacketImpl.java
index 294990691..897524b46 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/impl/PacketImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/impl/PacketImpl.java
@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.packet.impl;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.packet.AuthData;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket.HandshakeAuthData;
 import org.ethereum.beacon.discovery.packet.Header;
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/impl/RawPacketImpl.java b/src/main/java/org/ethereum/beacon/discovery/packet/impl/RawPacketImpl.java
index 08b57d580..e2565bd3f 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/impl/RawPacketImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/impl/RawPacketImpl.java
@@ -4,7 +4,7 @@
 package org.ethereum.beacon.discovery.packet.impl;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.packet.Header;
 import org.ethereum.beacon.discovery.packet.Packet;
 import org.ethereum.beacon.discovery.packet.RawPacket;
@@ -26,7 +26,7 @@ static Bytes mask(Packet<?> packet, Bytes16 maskingIV, Bytes16 destNodeId) {
   @VisibleForTesting
   public static Bytes maskHeader(Header<?> header, Bytes16 maskingIV, Bytes16 maskingKey) {
     Bytes headerPlainBytes =
-        Bytes.concatenate(header.getStaticHeader().getBytes(), header.getAuthData().getBytes());
+        Bytes.wrap(header.getStaticHeader().getBytes(), header.getAuthData().getBytes());
     return CryptoUtil.aesctrEncrypt(maskingKey, maskingIV, headerPlainBytes);
   }
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/impl/StaticHeaderImpl.java b/src/main/java/org/ethereum/beacon/discovery/packet/impl/StaticHeaderImpl.java
index 162596942..a493c756d 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/impl/StaticHeaderImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/impl/StaticHeaderImpl.java
@@ -8,7 +8,7 @@
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.packet.StaticHeader;
 import org.ethereum.beacon.discovery.type.Bytes12;
 import org.ethereum.beacon.discovery.type.Bytes2;
@@ -37,7 +37,7 @@ public static StaticHeaderImpl create(
     checkArgument(protocolId.length() == 6, "ProtocolId should be of length 6");
     checkArgument(authDataSize < 1 << 16, "Auth data size should be < 65536");
     Bytes headerBytes =
-        Bytes.concatenate(
+        Bytes.wrap(
             Bytes.wrap(protocolId.getBytes(StaticHeaderImpl.PROTOCOL_ID_ENCODING)),
             version,
             Bytes.of(flag.getCode()),
diff --git a/src/main/java/org/ethereum/beacon/discovery/packet/impl/WhoAreYouPacketImpl.java b/src/main/java/org/ethereum/beacon/discovery/packet/impl/WhoAreYouPacketImpl.java
index e948ff69f..5b9c7d0d5 100644
--- a/src/main/java/org/ethereum/beacon/discovery/packet/impl/WhoAreYouPacketImpl.java
+++ b/src/main/java/org/ethereum/beacon/discovery/packet/impl/WhoAreYouPacketImpl.java
@@ -3,8 +3,8 @@
  */
 package org.ethereum.beacon.discovery.packet.impl;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.packet.Header;
 import org.ethereum.beacon.discovery.packet.WhoAreYouPacket;
 import org.ethereum.beacon.discovery.packet.WhoAreYouPacket.WhoAreYouAuthData;
@@ -24,7 +24,7 @@ public static class WhoAreYouAuthDataImpl extends AbstractBytes implements WhoAr
     private static final int AUTH_DATA_SIZE = ENR_SEQ_OFF + ENR_SEQ_SIZE;
 
     public WhoAreYouAuthDataImpl(Bytes16 idNonce, UInt64 enrSeq) {
-      this(Bytes.concatenate(idNonce, enrSeq.toBytes()));
+      this(Bytes.wrap(idNonce, enrSeq.toBytes()));
     }
 
     public WhoAreYouAuthDataImpl(Bytes bytes) {
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/HandshakeMessagePacketHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/HandshakeMessagePacketHandler.java
index 0013ae847..4e4927163 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/HandshakeMessagePacketHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/HandshakeMessagePacketHandler.java
@@ -9,7 +9,7 @@
 import java.util.Optional;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.AddressAccessPolicy;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket;
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/IncomingDataPacker.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/IncomingDataPacker.java
index f28ea8746..1e64e2524 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/IncomingDataPacker.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/IncomingDataPacker.java
@@ -6,7 +6,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.packet.Packet;
 import org.ethereum.beacon.discovery.packet.RawPacket;
 import org.ethereum.beacon.discovery.pipeline.Envelope;
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NextTaskHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NextTaskHandler.java
index 041599713..b639a2d40 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NextTaskHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NextTaskHandler.java
@@ -9,7 +9,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.pipeline.Envelope;
 import org.ethereum.beacon.discovery.pipeline.EnvelopeHandler;
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManager.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManager.java
index 6cb2f6926..a365458d5 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManager.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManager.java
@@ -17,8 +17,8 @@
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.pipeline.Envelope;
 import org.ethereum.beacon.discovery.pipeline.EnvelopeHandler;
 import org.ethereum.beacon.discovery.pipeline.Field;
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/PacketDispatcherHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/PacketDispatcherHandler.java
index 576b4c691..debe33a6a 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/PacketDispatcherHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/PacketDispatcherHandler.java
@@ -6,7 +6,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes32;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket;
 import org.ethereum.beacon.discovery.packet.OrdinaryMessagePacket;
 import org.ethereum.beacon.discovery.packet.Packet;
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/SessionLookup.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/SessionLookup.java
index dd725a033..4afad6226 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/SessionLookup.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/SessionLookup.java
@@ -4,7 +4,7 @@
 package org.ethereum.beacon.discovery.pipeline.handler;
 
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 public class SessionLookup {
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnauthorizedMessagePacketHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnauthorizedMessagePacketHandler.java
index b314639f1..f479bfce3 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnauthorizedMessagePacketHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnauthorizedMessagePacketHandler.java
@@ -6,7 +6,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.packet.Header;
 import org.ethereum.beacon.discovery.packet.OrdinaryMessagePacket;
 import org.ethereum.beacon.discovery.packet.WhoAreYouPacket;
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnknownPacketTagToSender.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnknownPacketTagToSender.java
index c82ac9a8c..e216b312d 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnknownPacketTagToSender.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnknownPacketTagToSender.java
@@ -6,7 +6,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket;
 import org.ethereum.beacon.discovery.packet.OrdinaryMessagePacket;
 import org.ethereum.beacon.discovery.packet.Packet;
@@ -39,7 +39,7 @@ public void handle(Envelope envelope) {
                 envelope.getIdString()));
 
     Packet<?> packet = envelope.get(Field.PACKET);
-    Bytes32 nodeId;
+    Bytes nodeId;
     if (packet instanceof HandshakeMessagePacket) {
       nodeId = ((HandshakeMessagePacket) packet).getHeader().getAuthData().getSourceNodeId();
     } else {
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/WhoAreYouPacketHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/WhoAreYouPacketHandler.java
index e0cdb3066..79e46b784 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/WhoAreYouPacketHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/WhoAreYouPacketHandler.java
@@ -7,10 +7,10 @@
 import java.util.Optional;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket.HandshakeAuthData;
 import org.ethereum.beacon.discovery.packet.Header;
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/info/Request.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/info/Request.java
index 2a23095d3..e475a176c 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/info/Request.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/info/Request.java
@@ -5,7 +5,7 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.message.V5Message;
 
 public class Request<TResponse> {
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/info/RequestInfo.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/info/RequestInfo.java
index 5c3c99b14..4ed86eef9 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/info/RequestInfo.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/info/RequestInfo.java
@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.pipeline.info;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.task.TaskStatus;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/schema/EnrFieldInterpreter.java b/src/main/java/org/ethereum/beacon/discovery/schema/EnrFieldInterpreter.java
index 44f6370f4..78d18e91b 100644
--- a/src/main/java/org/ethereum/beacon/discovery/schema/EnrFieldInterpreter.java
+++ b/src/main/java/org/ethereum/beacon/discovery/schema/EnrFieldInterpreter.java
@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.schema;
 
-import org.apache.tuweni.rlp.RLPWriter;
+import org.apache.tuweni.v2.rlp.RLPWriter;
 
 /** Encoder/decoder for fields of ethereum node record */
 public interface EnrFieldInterpreter {
diff --git a/src/main/java/org/ethereum/beacon/discovery/schema/EnrFieldInterpreterV4.java b/src/main/java/org/ethereum/beacon/discovery/schema/EnrFieldInterpreterV4.java
index 81afa219d..a8c28d64b 100644
--- a/src/main/java/org/ethereum/beacon/discovery/schema/EnrFieldInterpreterV4.java
+++ b/src/main/java/org/ethereum/beacon/discovery/schema/EnrFieldInterpreterV4.java
@@ -9,8 +9,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLPWriter;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLPWriter;
 import org.ethereum.beacon.discovery.util.RlpDecodeException;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/schema/IdentitySchemaInterpreter.java b/src/main/java/org/ethereum/beacon/discovery/schema/IdentitySchemaInterpreter.java
index 77c415f4f..7427e5d23 100644
--- a/src/main/java/org/ethereum/beacon/discovery/schema/IdentitySchemaInterpreter.java
+++ b/src/main/java/org/ethereum/beacon/discovery/schema/IdentitySchemaInterpreter.java
@@ -6,8 +6,8 @@
 
 import java.net.InetSocketAddress;
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 
 /**
  * Interprets identity schema of ethereum node record:
diff --git a/src/main/java/org/ethereum/beacon/discovery/schema/IdentitySchemaV4Interpreter.java b/src/main/java/org/ethereum/beacon/discovery/schema/IdentitySchemaV4Interpreter.java
index da45ff21e..5ab1166c2 100644
--- a/src/main/java/org/ethereum/beacon/discovery/schema/IdentitySchemaV4Interpreter.java
+++ b/src/main/java/org/ethereum/beacon/discovery/schema/IdentitySchemaV4Interpreter.java
@@ -24,8 +24,8 @@
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.bouncycastle.math.ec.ECPoint;
 import org.ethereum.beacon.discovery.util.Functions;
 import org.ethereum.beacon.discovery.util.Utils;
@@ -82,7 +82,7 @@ private static Bytes calculateNodeIdImpl(final Bytes publicKey) {
     Bytes yPart =
         Bytes.wrap(
             Utils.extractBytesFromUnsignedBigInt(pudDestPoint.getYCoord().toBigInteger(), 32));
-    return Functions.hashKeccak(Bytes.concatenate(xPart, yPart));
+    return Functions.hashKeccak(Bytes.wrap(xPart, yPart));
   }
 
   @Override
diff --git a/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecord.java b/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecord.java
index 8d7f0e553..ee8aff434 100644
--- a/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecord.java
+++ b/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecord.java
@@ -17,12 +17,12 @@
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.MutableBytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.rlp.RLPWriter;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.MutableBytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.rlp.RLPWriter;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 
 /**
  * Ethereum Node Record V4
@@ -92,7 +92,7 @@ public static NodeRecord fromRawFields(
   }
 
   public String asBase64() {
-    return Base64.getUrlEncoder().withoutPadding().encodeToString(serialize().toArray());
+    return Base64.getUrlEncoder().withoutPadding().encodeToString(serialize().toArrayUnsafe());
   }
 
   public String asEnr() {
diff --git a/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecordBuilder.java b/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecordBuilder.java
index b84baaa34..cfefc6f28 100644
--- a/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecordBuilder.java
+++ b/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecordBuilder.java
@@ -11,9 +11,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.util.Functions;
 
 public class NodeRecordBuilder {
diff --git a/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecordFactory.java b/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecordFactory.java
index 0f9dc426f..9be122538 100644
--- a/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecordFactory.java
+++ b/src/main/java/org/ethereum/beacon/discovery/schema/NodeRecordFactory.java
@@ -13,10 +13,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.rlp.RLPReader;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.rlp.RLPReader;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.util.DecodeException;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
@@ -70,7 +70,7 @@ public NodeRecord fromEnr(String enr) {
   }
 
   public NodeRecord fromBytes(Bytes bytes) {
-    return fromBytes(bytes.toArray());
+    return fromBytes(bytes.toArrayUnsafe());
   }
 
   public NodeRecord fromRlp(final RLPReader reader) {
diff --git a/src/main/java/org/ethereum/beacon/discovery/schema/NodeSession.java b/src/main/java/org/ethereum/beacon/discovery/schema/NodeSession.java
index bc5b2c8da..63ae7604d 100644
--- a/src/main/java/org/ethereum/beacon/discovery/schema/NodeSession.java
+++ b/src/main/java/org/ethereum/beacon/discovery/schema/NodeSession.java
@@ -21,9 +21,9 @@
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.network.NetworkParcel;
 import org.ethereum.beacon.discovery.network.NetworkParcelV5;
diff --git a/src/main/java/org/ethereum/beacon/discovery/schema/NonceGenerator.java b/src/main/java/org/ethereum/beacon/discovery/schema/NonceGenerator.java
index c4cb2f9b1..5aaf452bb 100644
--- a/src/main/java/org/ethereum/beacon/discovery/schema/NonceGenerator.java
+++ b/src/main/java/org/ethereum/beacon/discovery/schema/NonceGenerator.java
@@ -5,7 +5,7 @@
 
 import java.util.Random;
 import java.util.function.Function;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.type.Bytes12;
 
 public class NonceGenerator implements Function<Random, Bytes12> {
diff --git a/src/main/java/org/ethereum/beacon/discovery/storage/BucketEntry.java b/src/main/java/org/ethereum/beacon/discovery/storage/BucketEntry.java
index ab38e4365..0578e9c69 100644
--- a/src/main/java/org/ethereum/beacon/discovery/storage/BucketEntry.java
+++ b/src/main/java/org/ethereum/beacon/discovery/storage/BucketEntry.java
@@ -6,7 +6,7 @@
 import com.google.common.base.MoreObjects;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/storage/KBucket.java b/src/main/java/org/ethereum/beacon/discovery/storage/KBucket.java
index 80d873aa0..7fc14498f 100644
--- a/src/main/java/org/ethereum/beacon/discovery/storage/KBucket.java
+++ b/src/main/java/org/ethereum/beacon/discovery/storage/KBucket.java
@@ -9,7 +9,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/storage/KBuckets.java b/src/main/java/org/ethereum/beacon/discovery/storage/KBuckets.java
index 319688fc7..3d0cc4a19 100644
--- a/src/main/java/org/ethereum/beacon/discovery/storage/KBuckets.java
+++ b/src/main/java/org/ethereum/beacon/discovery/storage/KBuckets.java
@@ -14,7 +14,7 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.util.Functions;
diff --git a/src/main/java/org/ethereum/beacon/discovery/storage/KBucketsIterator.java b/src/main/java/org/ethereum/beacon/discovery/storage/KBucketsIterator.java
index 7e43815b5..1e8320adf 100644
--- a/src/main/java/org/ethereum/beacon/discovery/storage/KBucketsIterator.java
+++ b/src/main/java/org/ethereum/beacon/discovery/storage/KBucketsIterator.java
@@ -11,7 +11,7 @@
 import java.util.Iterator;
 import java.util.TreeSet;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.util.Functions;
 
diff --git a/src/main/java/org/ethereum/beacon/discovery/storage/LocalNodeRecordStore.java b/src/main/java/org/ethereum/beacon/discovery/storage/LocalNodeRecordStore.java
index 6181a4fed..869f6bdcd 100644
--- a/src/main/java/org/ethereum/beacon/discovery/storage/LocalNodeRecordStore.java
+++ b/src/main/java/org/ethereum/beacon/discovery/storage/LocalNodeRecordStore.java
@@ -5,8 +5,8 @@
 package org.ethereum.beacon.discovery.storage;
 
 import java.net.InetSocketAddress;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 public class LocalNodeRecordStore {
diff --git a/src/main/java/org/ethereum/beacon/discovery/task/DiscoveryTaskManager.java b/src/main/java/org/ethereum/beacon/discovery/task/DiscoveryTaskManager.java
index f077bd591..9a38e54d3 100644
--- a/src/main/java/org/ethereum/beacon/discovery/task/DiscoveryTaskManager.java
+++ b/src/main/java/org/ethereum/beacon/discovery/task/DiscoveryTaskManager.java
@@ -14,8 +14,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 import java.util.function.Function;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.DiscoveryManager;
 import org.ethereum.beacon.discovery.scheduler.ExpirationSchedulerFactory;
 import org.ethereum.beacon.discovery.scheduler.Scheduler;
@@ -95,7 +94,7 @@ private CompletableFuture<Collection<NodeRecord>> performSearchForNewPeers() {
             nodeBucketStorage,
             this::findNodes,
             RECURSIVE_SEARCH_QUERY_LIMIT,
-            Bytes32.random(),
+            Bytes.random(32),
             homeNodeId)
         .execute();
   }
diff --git a/src/main/java/org/ethereum/beacon/discovery/task/RecursiveLookupTask.java b/src/main/java/org/ethereum/beacon/discovery/task/RecursiveLookupTask.java
index 7dff9f091..d1883b9a0 100644
--- a/src/main/java/org/ethereum/beacon/discovery/task/RecursiveLookupTask.java
+++ b/src/main/java/org/ethereum/beacon/discovery/task/RecursiveLookupTask.java
@@ -19,7 +19,7 @@
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.storage.KBuckets;
 import org.ethereum.beacon.discovery.util.Functions;
diff --git a/src/main/java/org/ethereum/beacon/discovery/task/RecursiveLookupTasks.java b/src/main/java/org/ethereum/beacon/discovery/task/RecursiveLookupTasks.java
index 8ffa87c4f..544d6bafe 100644
--- a/src/main/java/org/ethereum/beacon/discovery/task/RecursiveLookupTasks.java
+++ b/src/main/java/org/ethereum/beacon/discovery/task/RecursiveLookupTasks.java
@@ -13,7 +13,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.DiscoveryManager;
 import org.ethereum.beacon.discovery.scheduler.ExpirationScheduler;
 import org.ethereum.beacon.discovery.scheduler.ExpirationSchedulerFactory;
diff --git a/src/main/java/org/ethereum/beacon/discovery/type/Bytes12.java b/src/main/java/org/ethereum/beacon/discovery/type/Bytes12.java
index e50f19468..074fcc54f 100644
--- a/src/main/java/org/ethereum/beacon/discovery/type/Bytes12.java
+++ b/src/main/java/org/ethereum/beacon/discovery/type/Bytes12.java
@@ -6,8 +6,8 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import java.util.Random;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.DelegatingBytes;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.DelegatingBytes;
 
 public class Bytes12 extends DelegatingBytes {
 
@@ -32,7 +32,7 @@ public static Bytes12 random(Random random) {
   }
 
   private Bytes12(Bytes delegate) {
-    super(delegate);
+    super(delegate, 12);
     checkArgument(delegate.size() == 12, "Expected Bytes of size 12");
   }
 }
diff --git a/src/main/java/org/ethereum/beacon/discovery/type/Bytes16.java b/src/main/java/org/ethereum/beacon/discovery/type/Bytes16.java
index 749952e5b..93c6f5b54 100644
--- a/src/main/java/org/ethereum/beacon/discovery/type/Bytes16.java
+++ b/src/main/java/org/ethereum/beacon/discovery/type/Bytes16.java
@@ -6,8 +6,8 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import java.util.Random;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.DelegatingBytes;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.DelegatingBytes;
 
 public class Bytes16 extends DelegatingBytes {
 
@@ -32,7 +32,7 @@ public static Bytes16 random(Random random) {
   }
 
   private Bytes16(Bytes delegate) {
-    super(delegate);
+    super(delegate, 16);
     checkArgument(delegate.size() == 16, "Expected Bytes of size 16");
   }
 }
diff --git a/src/main/java/org/ethereum/beacon/discovery/type/Bytes2.java b/src/main/java/org/ethereum/beacon/discovery/type/Bytes2.java
index 2398d8bf8..fac7a6cb9 100644
--- a/src/main/java/org/ethereum/beacon/discovery/type/Bytes2.java
+++ b/src/main/java/org/ethereum/beacon/discovery/type/Bytes2.java
@@ -5,8 +5,8 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.DelegatingBytes;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.DelegatingBytes;
 
 public class Bytes2 extends DelegatingBytes {
 
@@ -19,7 +19,7 @@ public static Bytes2 wrap(Bytes bytes) {
   }
 
   private Bytes2(Bytes delegate) {
-    super(delegate);
+    super(delegate, 2);
     checkArgument(delegate.size() == 2, "Expected Bytes of size 2");
   }
 }
diff --git a/src/main/java/org/ethereum/beacon/discovery/util/CryptoUtil.java b/src/main/java/org/ethereum/beacon/discovery/util/CryptoUtil.java
index c48007bd0..35fc69ac9 100644
--- a/src/main/java/org/ethereum/beacon/discovery/util/CryptoUtil.java
+++ b/src/main/java/org/ethereum/beacon/discovery/util/CryptoUtil.java
@@ -16,18 +16,18 @@
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 public class CryptoUtil {
 
   private static final BouncyCastleProvider SECURITY_PROVIDER = new BouncyCastleProvider();
 
-  public static Bytes32 sha256(final Bytes indexBytes) {
+  public static Bytes sha256(final Bytes indexBytes) {
     final MessageDigest sha256Digest = getSha256Digest();
     indexBytes.update(sha256Digest);
-    return Bytes32.wrap(sha256Digest.digest());
+    return Bytes32.fromArray(sha256Digest.digest());
   }
 
   @SuppressWarnings("DoNotInvokeMessageDigestDirectly")
@@ -87,10 +87,10 @@ public static Bytes aesgcmEncrypt(Bytes privateKey, Bytes nonce, Bytes message,
       Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
       cipher.init(
           Cipher.ENCRYPT_MODE,
-          new SecretKeySpec(privateKey.toArray(), "AES"),
-          new GCMParameterSpec(128, nonce.toArray()));
-      cipher.updateAAD(aad.toArray());
-      return Bytes.wrap(cipher.doFinal(message.toArray()));
+          new SecretKeySpec(privateKey.mutableCopy().toArrayUnsafe(), "AES"),
+          new GCMParameterSpec(128, nonce.mutableCopy().toArrayUnsafe()));
+      cipher.updateAAD(aad.toArrayUnsafe());
+      return Bytes.wrap(cipher.doFinal(message.toArrayUnsafe()));
     } catch (Exception e) {
       throw new RuntimeException("No AES/GCM cipher provider", e);
     }
@@ -105,10 +105,10 @@ public static Bytes aesgcmDecrypt(Bytes privateKey, Bytes nonce, Bytes encoded,
       Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
       cipher.init(
           Cipher.DECRYPT_MODE,
-          new SecretKeySpec(privateKey.toArray(), "AES"),
-          new GCMParameterSpec(128, nonce.toArray()));
-      cipher.updateAAD(aad.toArray());
-      return Bytes.wrap(cipher.doFinal(encoded.toArray()));
+          new SecretKeySpec(privateKey.mutableCopy().toArrayUnsafe(), "AES"),
+          new GCMParameterSpec(128, nonce.toArrayUnsafe()));
+      cipher.updateAAD(aad.toArrayUnsafe());
+      return Bytes.wrap(cipher.doFinal(encoded.toArrayUnsafe()));
     } catch (NoSuchAlgorithmException
         | InvalidKeyException
         | InvalidAlgorithmParameterException
diff --git a/src/main/java/org/ethereum/beacon/discovery/util/Functions.java b/src/main/java/org/ethereum/beacon/discovery/util/Functions.java
index 9006b30e7..771a6b754 100644
--- a/src/main/java/org/ethereum/beacon/discovery/util/Functions.java
+++ b/src/main/java/org/ethereum/beacon/discovery/util/Functions.java
@@ -15,15 +15,15 @@
 import java.util.Random;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.Hash;
-import org.apache.tuweni.crypto.SECP256K1;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
-import org.apache.tuweni.crypto.SECP256K1.Parameters;
-import org.apache.tuweni.crypto.SECP256K1.PublicKey;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
-import org.apache.tuweni.crypto.SECP256K1.Signature;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.Hash;
+import org.apache.tuweni.v2.crypto.SECP256K1;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.crypto.SECP256K1.Parameters;
+import org.apache.tuweni.v2.crypto.SECP256K1.PublicKey;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.crypto.SECP256K1.Signature;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.SHA256Digest;
 import org.bouncycastle.crypto.generators.HKDFBytesGenerator;
@@ -49,12 +49,12 @@ public class Functions {
   }
 
   /** SHA2 (SHA256) */
-  public static Bytes32 hash(final Bytes value) {
+  public static Bytes hash(final Bytes value) {
     return Hashes.sha256(value);
   }
 
   /** SHA3 (Keccak256) */
-  public static Bytes32 hashKeccak(final Bytes value) {
+  public static Bytes hashKeccak(final Bytes value) {
     return Hash.keccak256(value);
   }
 
@@ -65,7 +65,7 @@ public static Bytes32 hashKeccak(final Bytes value) {
    * @param messageHash message, hashed
    * @return ECDSA signature with properties merged together: r || s
    */
-  public static Bytes sign(final SecretKey secretKey, final Bytes32 messageHash) {
+  public static Bytes sign(final SecretKey secretKey, final Bytes messageHash) {
     final KeyPair keyPair = KeyPair.fromSecretKey(secretKey);
     final Signature signature = SECP256K1.signHashed(messageHash, keyPair);
     // cutting v
@@ -81,7 +81,7 @@ public static Bytes sign(final SecretKey secretKey, final Bytes32 messageHash) {
    * @return whether `signature` reflects message `x` signed with `pubkey`
    */
   public static boolean verifyECDSASignature(
-      final Bytes signature, final Bytes32 hashedMessage, final Bytes pubKey) {
+      final Bytes signature, final Bytes hashedMessage, final Bytes pubKey) {
     if (signature.size() != SIGNATURE_SIZE) {
       LOG.trace("Invalid signature size, should be {} bytes", SIGNATURE_SIZE);
       return false;
@@ -114,18 +114,18 @@ public static SECP256K1.KeyPair randomKeyPair() {
   public static SECP256K1.KeyPair randomKeyPair(final Random rnd) {
     final byte[] privKeyBytes = new byte[PRIVKEY_SIZE];
     rnd.nextBytes(privKeyBytes);
-    return createKeyPairFromSecretBytes(Bytes32.wrap(privKeyBytes));
+    return createKeyPairFromSecretBytes(Bytes32.fromArray(privKeyBytes));
   }
 
-  /** Maps public key to point on {@link org.apache.tuweni.crypto.SECP256K1.Parameters#CURVE} */
+  /** Maps public key to point on {@link org.apache.tuweni.v2.crypto.SECP256K1.Parameters#CURVE} */
   public static ECPoint publicKeyToPoint(final Bytes pkey) {
     final byte[] destPubPointBytes;
     if (pkey.size() == 64) { // uncompressed
       destPubPointBytes = new byte[pkey.size() + 1];
       destPubPointBytes[0] = 0x04; // default prefix
-      System.arraycopy(pkey.toArray(), 0, destPubPointBytes, 1, pkey.size());
+      System.arraycopy(pkey.toArrayUnsafe(), 0, destPubPointBytes, 1, pkey.size());
     } else {
-      destPubPointBytes = pkey.toArray();
+      destPubPointBytes = pkey.toArrayUnsafe();
     }
     return Parameters.CURVE.getCurve().decodePoint(destPubPointBytes);
   }
@@ -149,15 +149,16 @@ public static Bytes deriveCompressedPublicKeyFromPrivate(final SecretKey secretK
   /** Derives key agreement ECDH by multiplying private key by public */
   public static Bytes deriveECDHKeyAgreement(final SecretKey srcSecretKey, final Bytes destPubKey) {
     final ECPoint pudDestPoint = publicKeyToPoint(destPubKey);
-    final ECPoint mult = pudDestPoint.multiply(new BigInteger(1, srcSecretKey.bytes().toArray()));
+    final ECPoint mult =
+        pudDestPoint.multiply(new BigInteger(1, srcSecretKey.bytes().toArrayUnsafe()));
     return Bytes.wrap(mult.getEncoded(true));
   }
 
-  public static KeyPair createKeyPairFromSecretBytes(final Bytes32 privateKey) {
+  public static KeyPair createKeyPairFromSecretBytes(final Bytes privateKey) {
     return KeyPair.fromSecretKey(createSecretKey(privateKey));
   }
 
-  public static SecretKey createSecretKey(final Bytes32 privateKey) {
+  public static SecretKey createSecretKey(final Bytes privateKey) {
     return SecretKey.fromBytes(privateKey);
   }
 
@@ -196,10 +197,12 @@ public static HKDFKeys hkdfExpand(
       final Bytes idNonce) {
     try {
       Bytes info =
-          Bytes.concatenate(
-              Bytes.wrap("discovery v5 key agreement".getBytes()), srcNodeId, destNodeId);
+          Bytes.wrap(Bytes.wrap("discovery v5 key agreement".getBytes()), srcNodeId, destNodeId);
       HKDFParameters hkdfParameters =
-          new HKDFParameters(keyAgreement.toArray(), idNonce.toArray(), info.toArray());
+          new HKDFParameters(
+              keyAgreement.mutableCopy().toArrayUnsafe(),
+              idNonce.mutableCopy().toArrayUnsafe(),
+              info.mutableCopy().toArrayUnsafe());
       Digest digest = new SHA256Digest();
       HKDFBytesGenerator hkdfBytesGenerator = new HKDFBytesGenerator(digest);
       hkdfBytesGenerator.init(hkdfParameters);
@@ -237,12 +240,12 @@ public static SecureRandom getRandom() {
    * in XOR)
    */
   public static int logDistance(final Bytes nodeId1, final Bytes nodeId2) {
-    Bytes distance = nodeId1.xor(nodeId2);
+    Bytes distance = nodeId1.mutableCopy().xor(nodeId2);
     return 256 - distance.numberOfLeadingZeros();
   }
 
   public static BigInteger distance(final Bytes nodeId1, final Bytes nodeId2) {
-    return nodeId1.xor(nodeId2).toUnsignedBigInteger(ByteOrder.LITTLE_ENDIAN);
+    return nodeId1.mutableCopy().xor(nodeId2).toUnsignedBigInteger(ByteOrder.LITTLE_ENDIAN);
   }
 
   /**
diff --git a/src/main/java/org/ethereum/beacon/discovery/util/Hashes.java b/src/main/java/org/ethereum/beacon/discovery/util/Hashes.java
index 5ff67fc86..69b1076b1 100644
--- a/src/main/java/org/ethereum/beacon/discovery/util/Hashes.java
+++ b/src/main/java/org/ethereum/beacon/discovery/util/Hashes.java
@@ -5,8 +5,8 @@
 package org.ethereum.beacon.discovery.util;
 
 import java.security.MessageDigest;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
 import org.bouncycastle.jcajce.provider.digest.SHA256.Digest;
 
 /** Utility methods to calculate message hashes */
diff --git a/src/main/java/org/ethereum/beacon/discovery/util/RlpUtil.java b/src/main/java/org/ethereum/beacon/discovery/util/RlpUtil.java
index 9a6350374..046151784 100644
--- a/src/main/java/org/ethereum/beacon/discovery/util/RlpUtil.java
+++ b/src/main/java/org/ethereum/beacon/discovery/util/RlpUtil.java
@@ -5,9 +5,9 @@
 package org.ethereum.beacon.discovery.util;
 
 import java.util.function.Function;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.rlp.RLPReader;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.rlp.RLPReader;
 
 /** Handy utilities used for RLP encoding and decoding. */
 public class RlpUtil {
diff --git a/src/main/java/org/ethereum/beacon/discovery/util/Utils.java b/src/main/java/org/ethereum/beacon/discovery/util/Utils.java
index 012b21bba..2159f1b8e 100644
--- a/src/main/java/org/ethereum/beacon/discovery/util/Utils.java
+++ b/src/main/java/org/ethereum/beacon/discovery/util/Utils.java
@@ -5,7 +5,6 @@
 package org.ethereum.beacon.discovery.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.math.BigInteger;
 import java.util.Optional;
@@ -13,10 +12,8 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.MutableBytes;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import reactor.core.Exceptions;
 
 public class Utils {
@@ -88,27 +85,12 @@ public static byte[] extractBytesFromUnsignedBigInt(BigInteger bigInteger, int s
     }
   }
 
-  /**
-   * Left pad a {@link Bytes} value with zero bytes to create a {@link Bytes}.
-   *
-   * @param value The bytes value pad.
-   * @return A {@link Bytes} that exposes the left-padded bytes of {@code value}.
-   * @throws IllegalArgumentException if { @code value.size() &gt; 4}.
-   */
-  public static Bytes leftPad(Bytes value, int length) {
-    checkNotNull(value);
-    checkArgument(value.size() <= length, "Expected at most %s bytes but got %s", 4, value.size());
-    MutableBytes result = MutableBytes.create(length);
-    value.copyTo(result, length - value.size());
-    return result;
-  }
-
   public static UInt64 toUInt64(Bytes bytes) throws IllegalArgumentException {
     checkArgument(bytes.size() <= 8);
-    return UInt64.fromBytes(Utils.leftPad(bytes, 8));
+    return UInt64.fromBytes(bytes.mutableCopy().leftPad(8));
   }
 
-  public static int compareBytes(Bytes32 b1, Bytes32 b2) {
+  public static int compareBytes(Bytes b1, Bytes b2) {
     for (int i = 0; i < b1.size(); i++) {
       int res = (b1.get(i) & 0xFF) - (b2.get(i) & 0xFF);
       if (res != 0) {
diff --git a/src/test/java/org/ethereum/beacon/discovery/DiscoveryManagerTest.java b/src/test/java/org/ethereum/beacon/discovery/DiscoveryManagerTest.java
index ecc40567c..7bdf289f8 100644
--- a/src/test/java/org/ethereum/beacon/discovery/DiscoveryManagerTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/DiscoveryManagerTest.java
@@ -8,9 +8,9 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.TestManagerWrapper.TestMessage;
 import org.ethereum.beacon.discovery.message.PingMessage;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket;
diff --git a/src/test/java/org/ethereum/beacon/discovery/FunctionsTest.java b/src/test/java/org/ethereum/beacon/discovery/FunctionsTest.java
index d879d4bb4..46e12a54c 100644
--- a/src/test/java/org/ethereum/beacon/discovery/FunctionsTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/FunctionsTest.java
@@ -7,9 +7,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
 import org.bouncycastle.math.ec.ECPoint;
 import org.ethereum.beacon.discovery.util.CryptoUtil;
 import org.ethereum.beacon.discovery.util.Functions;
@@ -82,7 +82,7 @@ public void specTestVector_ecdh() {
     final Bytes publicKey =
         Bytes.fromHexString(
             "0x9961e4c2356d61bedb83052c115d311acb3a96f5777296dcf297351130266231503061ac4aaee666073d7e5bc2c80c3f5c5b500c1cb5fd0a76abbb6b675ad157");
-    final Bytes32 secretKey =
+    final Bytes secretKey =
         Bytes32.fromHexString("0xfb757dc581730490a1d7a00deea65e9b1936924caaea8f44d476014856b68736");
     final Bytes result =
         Functions.deriveECDHKeyAgreement(
@@ -143,8 +143,7 @@ public void testRecoverFromSignature() {
                 "0xfb757dc581730490a1d7a00deea65e9b1936924caaea8f44d476014856b68736"));
     Bytes pubKey = Functions.deriveCompressedPublicKeyFromPrivate(keyPair.secretKey());
 
-    Bytes message =
-        Bytes.concatenate(Bytes.wrap("discovery-id-nonce".getBytes()), nonce, ephemeralKey);
+    Bytes message = Bytes.wrap(Bytes.wrap("discovery-id-nonce".getBytes()), nonce, ephemeralKey);
     assertTrue(Functions.verifyECDSASignature(idNonceSig, Functions.hash(message), pubKey));
   }
 
diff --git a/src/test/java/org/ethereum/beacon/discovery/HandshakeHandlersTest.java b/src/test/java/org/ethereum/beacon/discovery/HandshakeHandlersTest.java
index 27b3effa8..0639069f4 100644
--- a/src/test/java/org/ethereum/beacon/discovery/HandshakeHandlersTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/HandshakeHandlersTest.java
@@ -27,8 +27,8 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.TestUtil.NodeInfo;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker;
 import org.ethereum.beacon.discovery.message.FindNodeMessage;
diff --git a/src/test/java/org/ethereum/beacon/discovery/NodeRecordTest.java b/src/test/java/org/ethereum/beacon/discovery/NodeRecordTest.java
index 3a2c4f3ac..6b934d673 100644
--- a/src/test/java/org/ethereum/beacon/discovery/NodeRecordTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/NodeRecordTest.java
@@ -16,10 +16,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.schema.EnrField;
 import org.ethereum.beacon.discovery.schema.IdentitySchema;
 import org.ethereum.beacon.discovery.schema.IdentitySchemaInterpreter;
@@ -58,7 +58,7 @@ public void testLocalhostV4() throws Exception {
     assertEquals(IdentitySchema.V4, nodeRecord.getIdentityScheme());
     assertArrayEquals(
         InetAddress.getByName(expectedHost).getAddress(),
-        ((Bytes) nodeRecord.get(EnrField.IP_V4)).toArray());
+        ((Bytes) nodeRecord.get(EnrField.IP_V4)).toArrayUnsafe());
     assertEquals(expectedUdpPort, nodeRecord.get(EnrField.UDP));
     //    assertEquals(expectedTcpPort, nodeRecord.get(EnrField.TCP_V4));
     assertEquals(expectedSeqNumber, nodeRecord.getSeq());
@@ -72,7 +72,7 @@ public void testLocalhostV4() throws Exception {
     assertEquals(IdentitySchema.V4, nodeRecordRestored.getIdentityScheme());
     assertArrayEquals(
         InetAddress.getByName(expectedHost).getAddress(),
-        ((Bytes) nodeRecordRestored.get(EnrField.IP_V4)).toArray());
+        ((Bytes) nodeRecordRestored.get(EnrField.IP_V4)).toArrayUnsafe());
     assertEquals(expectedUdpPort, nodeRecordRestored.get(EnrField.UDP));
     //    assertEquals(expectedTcpPort, nodeRecordRestored.get(EnrField.TCP_V4));
     assertEquals(expectedSeqNumber, nodeRecordRestored.getSeq());
diff --git a/src/test/java/org/ethereum/beacon/discovery/SimpleIdentitySchemaInterpreter.java b/src/test/java/org/ethereum/beacon/discovery/SimpleIdentitySchemaInterpreter.java
index 827ecb716..4d0e6e04c 100644
--- a/src/test/java/org/ethereum/beacon/discovery/SimpleIdentitySchemaInterpreter.java
+++ b/src/test/java/org/ethereum/beacon/discovery/SimpleIdentitySchemaInterpreter.java
@@ -10,11 +10,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.MutableBytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.MutableBytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.schema.EnrField;
 import org.ethereum.beacon.discovery.schema.IdentitySchema;
 import org.ethereum.beacon.discovery.schema.IdentitySchemaInterpreter;
@@ -64,7 +63,7 @@ public Bytes getNodeId(final NodeRecord nodeRecord) {
     Bytes prototype = (Bytes) nodeRecord.get(EnrField.PKEY_SECP256K1);
     // Aligning it for correct 32 bytes
     if (prototype.size() <= 32) {
-      return Bytes32.leftPad(prototype);
+      return prototype.mutableCopy().leftPad(32);
     } else {
       return prototype.slice(0, 32);
     }
diff --git a/src/test/java/org/ethereum/beacon/discovery/TestManagerWrapper.java b/src/test/java/org/ethereum/beacon/discovery/TestManagerWrapper.java
index e49841b50..de4f00e1d 100644
--- a/src/test/java/org/ethereum/beacon/discovery/TestManagerWrapper.java
+++ b/src/test/java/org/ethereum/beacon/discovery/TestManagerWrapper.java
@@ -11,8 +11,8 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.network.NettyDiscoveryServer;
 import org.ethereum.beacon.discovery.network.NetworkParcel;
 import org.ethereum.beacon.discovery.network.NetworkParcelV5;
diff --git a/src/test/java/org/ethereum/beacon/discovery/TestUtil.java b/src/test/java/org/ethereum/beacon/discovery/TestUtil.java
index 5f73320be..ea46393aa 100644
--- a/src/test/java/org/ethereum/beacon/discovery/TestUtil.java
+++ b/src/test/java/org/ethereum/beacon/discovery/TestUtil.java
@@ -12,10 +12,10 @@
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.message.DiscoveryV5MessageDecoder;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.mock.IdentitySchemaV4InterpreterMock;
@@ -165,12 +165,12 @@ public static void waitFor(final ThrowingRunnable assertion) throws Exception {
   }
 
   public static NodeRecord createNodeAtDistance(final Bytes sourceNode, final int distance) {
-    final BitSet bits = BitSet.valueOf(sourceNode.reverse().toArray());
+    final BitSet bits = BitSet.valueOf(sourceNode.mutableCopy().reverse().toArray());
     bits.flip(distance - 1);
     final byte[] targetNodeId = new byte[sourceNode.size()];
     final byte[] src = bits.toByteArray();
     System.arraycopy(src, 0, targetNodeId, 0, src.length);
-    final Bytes nodeId = Bytes.wrap(targetNodeId).reverse();
+    final Bytes nodeId = Bytes.wrap(targetNodeId).mutableCopy().reverse();
     return SimpleIdentitySchemaInterpreter.createNodeRecord(
         nodeId, new InetSocketAddress("127.0.0.1", 2));
   }
@@ -191,7 +191,7 @@ public static <M extends V5Message> void assertRoundTrip(
 
   public static <M extends V5Message> void assertRejectTrailingBytes(
       final DiscoveryV5MessageDecoder decoder, final M message) {
-    final Bytes rlp = Bytes.concatenate(message.getBytes(), Bytes.fromHexString("0x1234"));
+    final Bytes rlp = Bytes.wrap(message.getBytes(), Bytes.fromHexString("0x1234"));
     assertThatThrownBy(() -> decoder.decode(rlp)).isInstanceOf(RlpDecodeException.class);
   }
 }
diff --git a/src/test/java/org/ethereum/beacon/discovery/UtilsTests.java b/src/test/java/org/ethereum/beacon/discovery/UtilsTests.java
index 5a6b7fcc9..2d0316d35 100644
--- a/src/test/java/org/ethereum/beacon/discovery/UtilsTests.java
+++ b/src/test/java/org/ethereum/beacon/discovery/UtilsTests.java
@@ -7,8 +7,9 @@
 import static org.ethereum.beacon.discovery.util.Functions.PUBKEY_SIZE;
 
 import java.math.BigInteger;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
 import org.ethereum.beacon.discovery.util.Functions;
 import org.ethereum.beacon.discovery.util.Utils;
 import org.junit.jupiter.api.Assertions;
@@ -21,7 +22,7 @@ public class UtilsTests {
    */
   @Test
   public void testPubKeyBadPrefix() {
-    Bytes32 privKey =
+    Bytes privKey =
         Bytes32.fromHexString("0xade78b68f25611ea57532f86bf01da909cc463465ed9efce9395403ff7fc99b5");
     KeyPair badKey = Functions.createKeyPairFromSecretBytes(privKey);
     // Straightforward way to notice the issue
diff --git a/src/test/java/org/ethereum/beacon/discovery/app/DiscoveryTestServer.java b/src/test/java/org/ethereum/beacon/discovery/app/DiscoveryTestServer.java
index b0a7bc418..77bd6a3ab 100644
--- a/src/test/java/org/ethereum/beacon/discovery/app/DiscoveryTestServer.java
+++ b/src/test/java/org/ethereum/beacon/discovery/app/DiscoveryTestServer.java
@@ -14,7 +14,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
 import org.ethereum.beacon.discovery.DiscoverySystem;
 import org.ethereum.beacon.discovery.DiscoverySystemBuilder;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
diff --git a/src/test/java/org/ethereum/beacon/discovery/community/CryptoTest.java b/src/test/java/org/ethereum/beacon/discovery/community/CryptoTest.java
index 33987e44f..032724ac8 100644
--- a/src/test/java/org/ethereum/beacon/discovery/community/CryptoTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/community/CryptoTest.java
@@ -4,9 +4,9 @@
 
 package org.ethereum.beacon.discovery.community;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket.HandshakeAuthData;
 import org.ethereum.beacon.discovery.util.CryptoUtil;
 import org.ethereum.beacon.discovery.util.Functions;
@@ -74,12 +74,12 @@ public void testHKDFExpand() {
    */
   @Test
   public void testIdNonceSigning() {
-    Bytes32 idNonce =
+    Bytes idNonce =
         Bytes32.fromHexString("0xa77e3aa0c144ae7c0a3af73692b7d6e5b7a2fdc0eda16e8d5e6cb0d08e88dd04");
     Bytes ephemeralPubKey =
         Bytes.fromHexString(
             "0x9961e4c2356d61bedb83052c115d311acb3a96f5777296dcf297351130266231503061ac4aaee666073d7e5bc2c80c3f5c5b500c1cb5fd0a76abbb6b675ad157");
-    Bytes32 nodeIdB =
+    Bytes nodeIdB =
         Bytes32.fromHexString("0x885bba8dfeddd49855459df852ad5b63d13a3fae593f3f9fa7e317fd43651409");
 
     Bytes expectedIdNonceSig =
diff --git a/src/test/java/org/ethereum/beacon/discovery/community/MessageEncodingTest.java b/src/test/java/org/ethereum/beacon/discovery/community/MessageEncodingTest.java
index ef9b1438d..894125711 100644
--- a/src/test/java/org/ethereum/beacon/discovery/community/MessageEncodingTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/community/MessageEncodingTest.java
@@ -7,8 +7,8 @@
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.message.FindNodeMessage;
 import org.ethereum.beacon.discovery.message.NodesMessage;
 import org.ethereum.beacon.discovery.message.PingMessage;
diff --git a/src/test/java/org/ethereum/beacon/discovery/integration/DiscoveryIntegrationTest.java b/src/test/java/org/ethereum/beacon/discovery/integration/DiscoveryIntegrationTest.java
index 6c6efc962..ff97a550d 100644
--- a/src/test/java/org/ethereum/beacon/discovery/integration/DiscoveryIntegrationTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/integration/DiscoveryIntegrationTest.java
@@ -37,9 +37,9 @@
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
-import org.apache.tuweni.rlp.RLPReader;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.rlp.RLPReader;
 import org.ethereum.beacon.discovery.DiscoverySystem;
 import org.ethereum.beacon.discovery.DiscoverySystemBuilder;
 import org.ethereum.beacon.discovery.TalkHandler;
@@ -430,19 +430,23 @@ public void shouldLookupNodes() throws Exception {
               .contains(node1.getLocalNodeRecord());
           assertThat(bootnode.lookupNode(node2.getLocalNodeRecord().getNodeId()))
               .contains(node2.getLocalNodeRecord());
-          assertThat(bootnode.lookupNode(node1.getLocalNodeRecord().getNodeId().not())).isEmpty();
+          assertThat(
+                  bootnode.lookupNode(node1.getLocalNodeRecord().getNodeId().mutableCopy().not()))
+              .isEmpty();
 
           assertThat(node1.lookupNode(bootnode.getLocalNodeRecord().getNodeId()))
               .contains(bootnode.getLocalNodeRecord());
           assertThat(node1.lookupNode(node2.getLocalNodeRecord().getNodeId()))
               .contains(node2.getLocalNodeRecord());
-          assertThat(node1.lookupNode(node1.getLocalNodeRecord().getNodeId().not())).isEmpty();
+          assertThat(node1.lookupNode(node1.getLocalNodeRecord().getNodeId().mutableCopy().not()))
+              .isEmpty();
 
           assertThat(node2.lookupNode(node1.getLocalNodeRecord().getNodeId()))
               .contains(node1.getLocalNodeRecord());
           assertThat(node2.lookupNode(bootnode.getLocalNodeRecord().getNodeId()))
               .contains(bootnode.getLocalNodeRecord());
-          assertThat(node2.lookupNode(node1.getLocalNodeRecord().getNodeId().not())).isEmpty();
+          assertThat(node2.lookupNode(node1.getLocalNodeRecord().getNodeId().mutableCopy().not()))
+              .isEmpty();
         });
   }
 
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/FindNodeMessageTest.java b/src/test/java/org/ethereum/beacon/discovery/message/FindNodeMessageTest.java
index def0d8afa..bbe711301 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/FindNodeMessageTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/FindNodeMessageTest.java
@@ -9,7 +9,7 @@
 import static org.ethereum.beacon.discovery.TestUtil.assertRoundTrip;
 
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.SimpleIdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.ethereum.beacon.discovery.util.RlpDecodeException;
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/NodesMessageTest.java b/src/test/java/org/ethereum/beacon/discovery/message/NodesMessageTest.java
index 8663b5d0d..75158dd58 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/NodesMessageTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/NodesMessageTest.java
@@ -8,7 +8,7 @@
 import static org.ethereum.beacon.discovery.TestUtil.assertRoundTrip;
 
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/PingMessageTest.java b/src/test/java/org/ethereum/beacon/discovery/message/PingMessageTest.java
index 992c8427d..5dadadce3 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/PingMessageTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/PingMessageTest.java
@@ -7,8 +7,8 @@
 import static org.ethereum.beacon.discovery.TestUtil.assertRejectTrailingBytes;
 import static org.ethereum.beacon.discovery.TestUtil.assertRoundTrip;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/PongMessageTest.java b/src/test/java/org/ethereum/beacon/discovery/message/PongMessageTest.java
index 8482bf7dc..4c812c657 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/PongMessageTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/PongMessageTest.java
@@ -8,8 +8,8 @@
 import static org.ethereum.beacon.discovery.TestUtil.assertRejectTrailingBytes;
 import static org.ethereum.beacon.discovery.TestUtil.assertRoundTrip;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.ethereum.beacon.discovery.util.RlpDecodeException;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/TalkReqMessageTest.java b/src/test/java/org/ethereum/beacon/discovery/message/TalkReqMessageTest.java
index b5e1414d8..9456cac74 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/TalkReqMessageTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/TalkReqMessageTest.java
@@ -7,7 +7,7 @@
 import static org.ethereum.beacon.discovery.TestUtil.assertRejectTrailingBytes;
 import static org.ethereum.beacon.discovery.TestUtil.assertRoundTrip;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/TalkRespMessageTest.java b/src/test/java/org/ethereum/beacon/discovery/message/TalkRespMessageTest.java
index e3f25b7a0..8661baf16 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/TalkRespMessageTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/TalkRespMessageTest.java
@@ -7,7 +7,7 @@
 import static org.ethereum.beacon.discovery.TestUtil.assertRejectTrailingBytes;
 import static org.ethereum.beacon.discovery.TestUtil.assertRoundTrip;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/handler/DefaultExternalAddressSelectorTest.java b/src/test/java/org/ethereum/beacon/discovery/message/handler/DefaultExternalAddressSelectorTest.java
index fc32af89e..1be5363ce 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/handler/DefaultExternalAddressSelectorTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/handler/DefaultExternalAddressSelectorTest.java
@@ -12,7 +12,7 @@
 import java.net.InetSocketAddress;
 import java.time.Instant;
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.SimpleIdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.storage.LocalNodeRecordStore;
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTrackerTest.java b/src/test/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTrackerTest.java
index f96fedc3c..47aa071a7 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTrackerTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTrackerTest.java
@@ -11,9 +11,9 @@
 import static org.mockito.Mockito.when;
 
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.TestUtil;
 import org.ethereum.beacon.discovery.message.handler.EnrUpdateTracker.EnrUpdater;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/handler/FindNodeHandlerTest.java b/src/test/java/org/ethereum/beacon/discovery/message/handler/FindNodeHandlerTest.java
index 5a236e3a9..d6df9197f 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/handler/FindNodeHandlerTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/handler/FindNodeHandlerTest.java
@@ -23,7 +23,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.TestUtil;
 import org.ethereum.beacon.discovery.TestUtil.NodeInfo;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker;
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/handler/NodesHandlerTest.java b/src/test/java/org/ethereum/beacon/discovery/message/handler/NodesHandlerTest.java
index 318407e91..6085374d8 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/handler/NodesHandlerTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/handler/NodesHandlerTest.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.assertj.core.api.Assertions;
 import org.ethereum.beacon.discovery.SimpleIdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.message.FindNodeMessage;
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/handler/PingHandlerTest.java b/src/test/java/org/ethereum/beacon/discovery/message/handler/PingHandlerTest.java
index 5b74b526b..07bb28318 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/handler/PingHandlerTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/handler/PingHandlerTest.java
@@ -9,8 +9,8 @@
 import static org.mockito.Mockito.when;
 
 import java.net.InetSocketAddress;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.TestUtil;
 import org.ethereum.beacon.discovery.TestUtil.NodeInfo;
 import org.ethereum.beacon.discovery.message.PingMessage;
diff --git a/src/test/java/org/ethereum/beacon/discovery/message/handler/PongHandlerTest.java b/src/test/java/org/ethereum/beacon/discovery/message/handler/PongHandlerTest.java
index e25e7334c..bb40b6777 100644
--- a/src/test/java/org/ethereum/beacon/discovery/message/handler/PongHandlerTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/message/handler/PongHandlerTest.java
@@ -7,8 +7,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.message.PongMessage;
 import org.ethereum.beacon.discovery.schema.NodeSession;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/ethereum/beacon/discovery/mock/IdentitySchemaV4InterpreterMock.java b/src/test/java/org/ethereum/beacon/discovery/mock/IdentitySchemaV4InterpreterMock.java
index b56442474..e801e06e1 100644
--- a/src/test/java/org/ethereum/beacon/discovery/mock/IdentitySchemaV4InterpreterMock.java
+++ b/src/test/java/org/ethereum/beacon/discovery/mock/IdentitySchemaV4InterpreterMock.java
@@ -4,8 +4,8 @@
 
 package org.ethereum.beacon.discovery.mock;
 
-import org.apache.tuweni.bytes.MutableBytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.MutableBytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.schema.IdentitySchemaV4Interpreter;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
diff --git a/src/test/java/org/ethereum/beacon/discovery/packet/HandshakePacketTest.java b/src/test/java/org/ethereum/beacon/discovery/packet/HandshakePacketTest.java
index 871ef4abc..681bdc1a7 100644
--- a/src/test/java/org/ethereum/beacon/discovery/packet/HandshakePacketTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/packet/HandshakePacketTest.java
@@ -8,10 +8,10 @@
 
 import java.util.List;
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.message.PingMessage;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket.HandshakeAuthData;
 import org.ethereum.beacon.discovery.packet.StaticHeader.Flag;
@@ -28,20 +28,20 @@
 
 public class HandshakePacketTest {
 
-  private final Bytes32 srcNodeId =
+  private final Bytes srcNodeId =
       Bytes32.fromHexString("0xaaaa8419e9f49d0083561b48287df592939a8d19947d8c0ef88f2a4856a69fbb");
   private final SecretKey srcStaticPrivateKey =
       Functions.createSecretKey(
           Bytes32.fromHexString(
               "0x66fb62bfbd66b9177a138c1e5cddbe4f7c30c343e94e68df8769459cb1cde628"));
 
-  private final Bytes32 destNodeId =
+  private final Bytes destNodeId =
       Bytes32.fromHexString("0xbbbb9d047f0488c0b5a93c1c3f2d8bafc7c8ff337024a55434a0d0555de64db9");
   private final Bytes16 headerMaskingKey = Bytes16.wrap(destNodeId, 0);
   private final Bytes12 aesGcmNonce = Bytes12.fromHexString("0xffffffffffffffffffffffff");
   private final Bytes secretKey = Bytes.fromHexString("0x00000000000000000000000000000000");
   private final Bytes16 aesCtrIV = Bytes16.fromHexString("0x00000000000000000000000000000000");
-  private final Bytes32 idNonce =
+  private final Bytes idNonce =
       Bytes32.fromHexString("0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd");
   private final Bytes ephemeralPubKey =
       Bytes.fromHexString(
@@ -96,7 +96,7 @@ void testWrongVersionFails() {
 
     HandshakeAuthDataImpl authData =
         new HandshakeAuthDataImpl(
-            Bytes.concatenate(
+            Bytes.wrap(
                 Bytes.of(77), // invalid version
                 aesGcmNonce,
                 Bytes.of(idSignature.size()),
@@ -123,7 +123,7 @@ void testTooLargeSigSizeFails() {
 
     HandshakeAuthDataImpl authData =
         new HandshakeAuthDataImpl(
-            Bytes.concatenate(
+            Bytes.wrap(
                 Bytes.of(HandshakeMessagePacket.HANDSHAKE_VERSION),
                 aesGcmNonce,
                 Bytes.of(255), // invalid sig size
@@ -150,7 +150,7 @@ void testTooLargeEphKeySizeFails() {
 
     HandshakeAuthDataImpl authData =
         new HandshakeAuthDataImpl(
-            Bytes.concatenate(
+            Bytes.wrap(
                 Bytes.of(HandshakeMessagePacket.HANDSHAKE_VERSION),
                 aesGcmNonce,
                 Bytes.of(idSignature.size()),
diff --git a/src/test/java/org/ethereum/beacon/discovery/packet/OrdinaryMessagePacketTest.java b/src/test/java/org/ethereum/beacon/discovery/packet/OrdinaryMessagePacketTest.java
index 1ab1d9c81..c48c8965d 100644
--- a/src/test/java/org/ethereum/beacon/discovery/packet/OrdinaryMessagePacketTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/packet/OrdinaryMessagePacketTest.java
@@ -10,11 +10,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.rlp.RLPWriter;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.rlp.RLPWriter;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.message.FindNodeMessage;
 import org.ethereum.beacon.discovery.message.MessageCode;
 import org.ethereum.beacon.discovery.message.NodesMessage;
@@ -42,9 +42,9 @@
 
 public class OrdinaryMessagePacketTest {
 
-  private final Bytes32 srcNodeId =
+  private final Bytes srcNodeId =
       Bytes32.fromHexString("0xaaaa8419e9f49d0083561b48287df592939a8d19947d8c0ef88f2a4856a69fbb");
-  private final Bytes32 destNodeId =
+  private final Bytes destNodeId =
       Bytes32.fromHexString("0xbbbb9d047f0488c0b5a93c1c3f2d8bafc7c8ff337024a55434a0d0555de64db9");
   private final Bytes16 headerMaskingKey = Bytes16.wrap(destNodeId, 0);
   private final Bytes12 aesGcmNonce = Bytes12.fromHexString("0xffffffffffffffffffffffff");
@@ -208,7 +208,7 @@ void testDecryptingWithInvalidMessageRlpFails(V5Message message, String name) {
   void testDecryptingWithInvalidMessageRequestIdRlpFails() {
     Header<OrdinaryAuthData> header = Header.createOrdinaryHeader(srcNodeId, aesGcmNonce);
     Bytes invalidMessageBytes =
-        Bytes.concatenate(
+        Bytes.wrap(
             Bytes.of(MessageCode.PING.byteCode()),
             RLP.encodeList(
                 writer -> {
diff --git a/src/test/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacketTest.java b/src/test/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacketTest.java
index 9a75849c0..5ba43ce3d 100644
--- a/src/test/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacketTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacketTest.java
@@ -6,9 +6,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.packet.WhoAreYouPacket.WhoAreYouAuthData;
 import org.ethereum.beacon.discovery.packet.impl.RawPacketImpl;
 import org.ethereum.beacon.discovery.type.Bytes12;
@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.Test;
 
 public class WhoAreYouPacketTest {
-  private final Bytes32 destNodeId =
+  private final Bytes destNodeId =
       Bytes32.fromHexString("0xbbbb9d047f0488c0b5a93c1c3f2d8bafc7c8ff337024a55434a0d0555de64db9");
   private final Bytes16 headerMaskingKey = Bytes16.wrap(destNodeId, 0);
   private final Bytes12 aesGcmNonce = Bytes12.fromHexString("0xffffffffffffffffffffffff");
diff --git a/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManagerTest.java b/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManagerTest.java
index dbe6afa74..7d8d7863a 100644
--- a/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManagerTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManagerTest.java
@@ -9,9 +9,9 @@
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.SimpleIdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.TestUtil;
 import org.ethereum.beacon.discovery.TestUtil.NodeInfo;
diff --git a/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/OutgoingParcelHandlerTest.java b/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/OutgoingParcelHandlerTest.java
index 3d64eb606..020181c37 100644
--- a/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/OutgoingParcelHandlerTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/OutgoingParcelHandlerTest.java
@@ -10,7 +10,7 @@
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.AddressAccessPolicy;
 import org.ethereum.beacon.discovery.network.NetworkParcel;
 import org.ethereum.beacon.discovery.network.NetworkParcelV5;
diff --git a/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/PacketSourceFilterTest.java b/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/PacketSourceFilterTest.java
index 677330d22..cccbda7fb 100644
--- a/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/PacketSourceFilterTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/pipeline/handler/PacketSourceFilterTest.java
@@ -8,7 +8,7 @@
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.AddressAccessPolicy;
 import org.ethereum.beacon.discovery.pipeline.Envelope;
 import org.ethereum.beacon.discovery.pipeline.Field;
diff --git a/src/test/java/org/ethereum/beacon/discovery/pipeline/info/FindNodeResponseHandlerTest.java b/src/test/java/org/ethereum/beacon/discovery/pipeline/info/FindNodeResponseHandlerTest.java
index 650c89d25..b29cc5955 100644
--- a/src/test/java/org/ethereum/beacon/discovery/pipeline/info/FindNodeResponseHandlerTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/pipeline/info/FindNodeResponseHandlerTest.java
@@ -15,7 +15,7 @@
 import static org.mockito.Mockito.when;
 
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.AddressAccessPolicy;
 import org.ethereum.beacon.discovery.TestUtil;
 import org.ethereum.beacon.discovery.TestUtil.NodeInfo;
diff --git a/src/test/java/org/ethereum/beacon/discovery/reference/CryptoTests.java b/src/test/java/org/ethereum/beacon/discovery/reference/CryptoTests.java
index 3d7bac115..15ee7b3af 100644
--- a/src/test/java/org/ethereum/beacon/discovery/reference/CryptoTests.java
+++ b/src/test/java/org/ethereum/beacon/discovery/reference/CryptoTests.java
@@ -5,9 +5,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket.HandshakeAuthData;
 import org.ethereum.beacon.discovery.util.CryptoUtil;
 import org.ethereum.beacon.discovery.util.Functions;
@@ -60,7 +60,7 @@ void testChallengeSign() {
             "0x000000000000000000000000000000006469736376350001010102030405060708090a0b0c00180102030405060708090a0b0c0d0e0f100000000000000000");
     Bytes ephemeralPubkeyBytes =
         Bytes.fromHexString("0x039961e4c2356d61bedb83052c115d311acb3a96f5777296dcf297351130266231");
-    Bytes32 nodeIdBBytes =
+    Bytes nodeIdBBytes =
         Bytes32.fromHexString("0xbbbb9d047f0488c0b5a93c1c3f2d8bafc7c8ff337024a55434a0d0555de64db9");
 
     Bytes expectedSignatureBytes =
diff --git a/src/test/java/org/ethereum/beacon/discovery/reference/SanityTestVectorsTests.java b/src/test/java/org/ethereum/beacon/discovery/reference/SanityTestVectorsTests.java
index 8f131f8fa..664495918 100644
--- a/src/test/java/org/ethereum/beacon/discovery/reference/SanityTestVectorsTests.java
+++ b/src/test/java/org/ethereum/beacon/discovery/reference/SanityTestVectorsTests.java
@@ -8,10 +8,10 @@
 
 import java.util.List;
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.message.PingMessage;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket;
@@ -42,9 +42,9 @@ public class SanityTestVectorsTests {
 
   @Test
   void testOrdinaryPingPacket() {
-    Bytes32 srcNodeId =
+    Bytes srcNodeId =
         Bytes32.fromHexString("0xaaaa8419e9f49d0083561b48287df592939a8d19947d8c0ef88f2a4856a69fbb");
-    Bytes32 destNodeId =
+    Bytes destNodeId =
         Bytes32.fromHexString("0xbbbb9d047f0488c0b5a93c1c3f2d8bafc7c8ff337024a55434a0d0555de64db9");
     Bytes12 nonce = Bytes12.fromHexString("0xffffffffffffffffffffffff");
     Bytes16 readKey = Bytes16.fromHexString("0x00000000000000000000000000000000");
@@ -79,7 +79,7 @@ void testOrdinaryPingPacket() {
 
   @Test
   void testWhoAreYouPacket() {
-    Bytes32 destNodeId =
+    Bytes destNodeId =
         Bytes32.fromHexString("0xbbbb9d047f0488c0b5a93c1c3f2d8bafc7c8ff337024a55434a0d0555de64db9");
     Bytes16 maskingIV = Bytes16.fromHexString("0x00000000000000000000000000000000");
     Bytes12 whoareyouRequestNonce = Bytes12.fromHexString("0x0102030405060708090a0b0c");
@@ -116,9 +116,9 @@ void testWhoAreYouPacket() {
   @Test
   void testHandshakePacket() {
 
-    Bytes32 srcNodeId =
+    Bytes srcNodeId =
         Bytes32.fromHexString("0xaaaa8419e9f49d0083561b48287df592939a8d19947d8c0ef88f2a4856a69fbb");
-    Bytes32 destNodeId =
+    Bytes destNodeId =
         Bytes32.fromHexString("0xbbbb9d047f0488c0b5a93c1c3f2d8bafc7c8ff337024a55434a0d0555de64db9");
     Bytes16 maskingIV = Bytes16.fromHexString("0x00000000000000000000000000000000");
     Bytes12 nonce = Bytes12.fromHexString("0xffffffffffffffffffffffff");
@@ -177,9 +177,9 @@ void testHandshakePacket() {
   @Test
   void testHandshakeWithEnrPacket() {
 
-    Bytes32 srcNodeId =
+    Bytes srcNodeId =
         Bytes32.fromHexString("0xaaaa8419e9f49d0083561b48287df592939a8d19947d8c0ef88f2a4856a69fbb");
-    Bytes32 destNodeId =
+    Bytes destNodeId =
         Bytes32.fromHexString("0xbbbb9d047f0488c0b5a93c1c3f2d8bafc7c8ff337024a55434a0d0555de64db9");
     Bytes16 maskingIV = Bytes16.fromHexString("0x00000000000000000000000000000000");
     Bytes12 nonce = Bytes12.fromHexString("0xffffffffffffffffffffffff");
diff --git a/src/test/java/org/ethereum/beacon/discovery/schema/IdentitySchemaV4InterpreterTest.java b/src/test/java/org/ethereum/beacon/discovery/schema/IdentitySchemaV4InterpreterTest.java
index 73ba7ddf3..6ca891c1d 100644
--- a/src/test/java/org/ethereum/beacon/discovery/schema/IdentitySchemaV4InterpreterTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/schema/IdentitySchemaV4InterpreterTest.java
@@ -15,11 +15,11 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.util.DecodeException;
 import org.ethereum.beacon.discovery.util.Functions;
 import org.junit.jupiter.api.Test;
@@ -28,7 +28,7 @@ class IdentitySchemaV4InterpreterTest {
 
   private static final Bytes PUB_KEY =
       Bytes.fromHexString("0x02197B9014C6C0500CF168BD1F17A3B4A1307251849A5ECEEE0B5EBC76A7EBDB37");
-  private static final Bytes32 PRIV_KEY =
+  private static final Bytes PRIV_KEY =
       Bytes32.fromHexString("0x2E953344686E18C99CDE5292D822D4427BDC5B473F3A6D69D6D0D897D9595110");
   private static final SecretKey SECRET_KEY = Functions.createSecretKey(PRIV_KEY);
   private static final Bytes IPV6_LOCALHOST =
diff --git a/src/test/java/org/ethereum/beacon/discovery/schema/NodeSessionTest.java b/src/test/java/org/ethereum/beacon/discovery/schema/NodeSessionTest.java
index 7c4ac0567..39c7c60b9 100644
--- a/src/test/java/org/ethereum/beacon/discovery/schema/NodeSessionTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/schema/NodeSessionTest.java
@@ -20,9 +20,9 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.SimpleIdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.network.NetworkParcel;
@@ -45,7 +45,7 @@
 public class NodeSessionTest {
   private static final SecretKey SECRET_KEY = Functions.randomKeyPair().secretKey();
   private final NodeSessionManager nodeSessionManager = mock(NodeSessionManager.class);
-  private final Bytes32 nodeId = Bytes32.ZERO;
+  private final Bytes nodeId = Bytes32.ZERO;
 
   @SuppressWarnings("unchecked")
   private final Consumer<NetworkParcel> outgoingPipeline = mock(Consumer.class);
diff --git a/src/test/java/org/ethereum/beacon/discovery/storage/KBucketTest.java b/src/test/java/org/ethereum/beacon/discovery/storage/KBucketTest.java
index 7513ddeca..abb93d635 100644
--- a/src/test/java/org/ethereum/beacon/discovery/storage/KBucketTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/storage/KBucketTest.java
@@ -11,8 +11,8 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.KeyPair;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.KeyPair;
 import org.ethereum.beacon.discovery.SimpleIdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.StubClock;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker;
diff --git a/src/test/java/org/ethereum/beacon/discovery/storage/KBucketsTest.java b/src/test/java/org/ethereum/beacon/discovery/storage/KBucketsTest.java
index 2737a5a88..992f44392 100644
--- a/src/test/java/org/ethereum/beacon/discovery/storage/KBucketsTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/storage/KBucketsTest.java
@@ -12,7 +12,7 @@
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes32;
 import org.ethereum.beacon.discovery.SimpleIdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.StubClock;
 import org.ethereum.beacon.discovery.TestUtil;
diff --git a/src/test/java/org/ethereum/beacon/discovery/storage/LocalNodeRecordStoreTest.java b/src/test/java/org/ethereum/beacon/discovery/storage/LocalNodeRecordStoreTest.java
index b976ba79a..0a9aa0cd7 100644
--- a/src/test/java/org/ethereum/beacon/discovery/storage/LocalNodeRecordStoreTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/storage/LocalNodeRecordStoreTest.java
@@ -9,7 +9,7 @@
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.SimpleIdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/ethereum/beacon/discovery/task/RecursiveLookupTaskTest.java b/src/test/java/org/ethereum/beacon/discovery/task/RecursiveLookupTaskTest.java
index b1392078f..a522c9793 100644
--- a/src/test/java/org/ethereum/beacon/discovery/task/RecursiveLookupTaskTest.java
+++ b/src/test/java/org/ethereum/beacon/discovery/task/RecursiveLookupTaskTest.java
@@ -19,8 +19,8 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.SimpleIdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.schema.EnrField;
 import org.ethereum.beacon.discovery.schema.IdentitySchema;