diff --git a/fluffy/tests/beacon_light_client_tests/light_client_test_helpers.nim b/fluffy/tests/beacon_light_client_tests/light_client_test_helpers.nim
index 31aac9b08..92417e0de 100644
--- a/fluffy/tests/beacon_light_client_tests/light_client_test_helpers.nim
+++ b/fluffy/tests/beacon_light_client_tests/light_client_test_helpers.nim
@@ -30,7 +30,7 @@ proc getTestForkDigests*(): ForkDigests =
     altair: ForkDigest([0'u8, 0, 0, 2]),
     bellatrix: ForkDigest([0'u8, 0, 0, 3]),
     capella: ForkDigest([0'u8, 0, 0, 4]),
-    sharding: ForkDigest([0'u8, 0, 0, 5])
+    eip4844: ForkDigest([0'u8, 0, 0, 5])
   )
 
 proc newLCNode*(
diff --git a/fluffy/tests/beacon_light_client_tests/test_beacon_light_client.nim b/fluffy/tests/beacon_light_client_tests/test_beacon_light_client.nim
index bcdb9a6dc..a7885682d 100644
--- a/fluffy/tests/beacon_light_client_tests/test_beacon_light_client.nim
+++ b/fluffy/tests/beacon_light_client_tests/test_beacon_light_client.nim
@@ -14,6 +14,7 @@ import
   eth/common/eth_types_rlp,
   beacon_chain/spec/forks,
   beacon_chain/spec/datatypes/altair,
+  beacon_chain/spec/helpers,
   beacon_chain/beacon_clock,
   beacon_chain/conf,
   ../../network/wire/[portal_protocol, portal_stream],
diff --git a/fluffy/tests/beacon_light_client_tests/test_light_client_content.nim b/fluffy/tests/beacon_light_client_tests/test_light_client_content.nim
index a8cd35bfd..1068dd2c2 100644
--- a/fluffy/tests/beacon_light_client_tests/test_light_client_content.nim
+++ b/fluffy/tests/beacon_light_client_tests/test_light_client_content.nim
@@ -21,7 +21,7 @@ suite "Test light client contentEncodings":
   forks.altair = ForkDigest([0'u8, 0, 0, 2])
   forks.bellatrix = ForkDigest([0'u8, 0, 0, 3])
   forks.capella = ForkDigest([0'u8, 0, 0, 4])
-  forks.sharding = ForkDigest([0'u8, 0, 0, 5])
+  forks.eip4844 = ForkDigest([0'u8, 0, 0, 5])
 
   test "Light client bootstrap correct":
     let
diff --git a/nimbus_verified_proxy/nimbus_verified_proxy.nim b/nimbus_verified_proxy/nimbus_verified_proxy.nim
index dc83afccf..1bb8f1a9f 100644
--- a/nimbus_verified_proxy/nimbus_verified_proxy.nim
+++ b/nimbus_verified_proxy/nimbus_verified_proxy.nim
@@ -189,7 +189,8 @@ proc run() {.raises: [Exception, Defect].} =
       isBehind = not shouldSyncOptimistically(slot)
 
       targetGossipState = getTargetGossipState(
-        slot.epoch, cfg.ALTAIR_FORK_EPOCH, cfg.BELLATRIX_FORK_EPOCH, isBehind)
+        slot.epoch, cfg.ALTAIR_FORK_EPOCH, cfg.BELLATRIX_FORK_EPOCH,
+        cfg.CAPELLA_FORK_EPOCH, cfg.EIP4844_FORK_EPOCH, isBehind)
 
     template currentGossipState(): auto = blocksGossipState
     if currentGossipState == targetGossipState:
diff --git a/vendor/nim-web3 b/vendor/nim-web3
index 1e2e2e6d1..df2ef09c6 160000
--- a/vendor/nim-web3
+++ b/vendor/nim-web3
@@ -1 +1 @@
-Subproject commit 1e2e2e6d16a22cfc33f475b293c3ffbce8c46409
+Subproject commit df2ef09c63f43eb9a2597bdb3e832ddbf1461871
diff --git a/vendor/nimbus-eth2 b/vendor/nimbus-eth2
index 4e71e77da..6b5682df7 160000
--- a/vendor/nimbus-eth2
+++ b/vendor/nimbus-eth2
@@ -1 +1 @@
-Subproject commit 4e71e77da78d2ee1849facc140fcd06be4248a28
+Subproject commit 6b5682df70714ab6f8b91206840176d16e02db0c