diff --git a/.mockery.yaml b/.mockery.yaml
index e4efc43af5..6006c28598 100644
--- a/.mockery.yaml
+++ b/.mockery.yaml
@@ -27,6 +27,8 @@ dir: "{{.InterfaceDir}}/mocks"
 mockname: "{{.InterfaceNameCamel}}"
 filename: "{{.InterfaceNameSnake}}.mock.go"
 outpkg: "mocks"
+resolve-type-alias: False # see https://vektra.github.io/mockery/latest/deprecations/#resolve-type-alias
+issue-845-fix: True # see https://vektra.github.io/mockery/latest/deprecations/#issue-845-fix
 packages:
   github.com/berachain/beacon-kit/mod/execution/pkg/client/ethclient:
     config:
diff --git a/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go b/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go
index 67afc56b70..a9755a8c7a 100644
--- a/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go
+++ b/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go b/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go
index df3a200894..2eb2e63c66 100644
--- a/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go
+++ b/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go b/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go
index 0edbc8091a..ce712b7f28 100644
--- a/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go
+++ b/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/availability_store.mock.go b/mod/node-api/backend/mocks/availability_store.mock.go
index 20eb2e5b6e..26ab51f6ca 100644
--- a/mod/node-api/backend/mocks/availability_store.mock.go
+++ b/mod/node-api/backend/mocks/availability_store.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/beacon_block_header.mock.go b/mod/node-api/backend/mocks/beacon_block_header.mock.go
index eb238bac1e..db5cfc4192 100644
--- a/mod/node-api/backend/mocks/beacon_block_header.mock.go
+++ b/mod/node-api/backend/mocks/beacon_block_header.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/beacon_state.mock.go b/mod/node-api/backend/mocks/beacon_state.mock.go
index 6d9fb92e2b..ef3004fd8d 100644
--- a/mod/node-api/backend/mocks/beacon_state.mock.go
+++ b/mod/node-api/backend/mocks/beacon_state.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/block_store.mock.go b/mod/node-api/backend/mocks/block_store.mock.go
index df70ab86b5..c5bc5b8467 100644
--- a/mod/node-api/backend/mocks/block_store.mock.go
+++ b/mod/node-api/backend/mocks/block_store.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/deposit_store.mock.go b/mod/node-api/backend/mocks/deposit_store.mock.go
index 32e8381059..a226184c72 100644
--- a/mod/node-api/backend/mocks/deposit_store.mock.go
+++ b/mod/node-api/backend/mocks/deposit_store.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/node.mock.go b/mod/node-api/backend/mocks/node.mock.go
index b806434428..45a53055be 100644
--- a/mod/node-api/backend/mocks/node.mock.go
+++ b/mod/node-api/backend/mocks/node.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/state_processor.mock.go b/mod/node-api/backend/mocks/state_processor.mock.go
index ac2b23b03a..0314009602 100644
--- a/mod/node-api/backend/mocks/state_processor.mock.go
+++ b/mod/node-api/backend/mocks/state_processor.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/storage_backend.mock.go b/mod/node-api/backend/mocks/storage_backend.mock.go
index dd28160b49..2992bb6e90 100644
--- a/mod/node-api/backend/mocks/storage_backend.mock.go
+++ b/mod/node-api/backend/mocks/storage_backend.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/validator.mock.go b/mod/node-api/backend/mocks/validator.mock.go
index 3f904a98e8..997eae07ac 100644
--- a/mod/node-api/backend/mocks/validator.mock.go
+++ b/mod/node-api/backend/mocks/validator.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/withdrawal.mock.go b/mod/node-api/backend/mocks/withdrawal.mock.go
index 654d5f85e2..d0ef6cff94 100644
--- a/mod/node-api/backend/mocks/withdrawal.mock.go
+++ b/mod/node-api/backend/mocks/withdrawal.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-api/backend/mocks/withdrawal_credentials.mock.go b/mod/node-api/backend/mocks/withdrawal_credentials.mock.go
index 5189b3b6b8..6abab4521a 100644
--- a/mod/node-api/backend/mocks/withdrawal_credentials.mock.go
+++ b/mod/node-api/backend/mocks/withdrawal_credentials.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-core/pkg/services/registry/mocks/basic.mock.go b/mod/node-core/pkg/services/registry/mocks/basic.mock.go
index 5636cc2499..c72558a571 100644
--- a/mod/node-core/pkg/services/registry/mocks/basic.mock.go
+++ b/mod/node-core/pkg/services/registry/mocks/basic.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-core/pkg/services/registry/mocks/dispatcher.mock.go b/mod/node-core/pkg/services/registry/mocks/dispatcher.mock.go
index 8c02d26466..13003c3117 100644
--- a/mod/node-core/pkg/services/registry/mocks/dispatcher.mock.go
+++ b/mod/node-core/pkg/services/registry/mocks/dispatcher.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-core/pkg/services/registry/mocks/registry_option.mock.go b/mod/node-core/pkg/services/registry/mocks/registry_option.mock.go
index cf55bbcda8..d0239c9f3d 100644
--- a/mod/node-core/pkg/services/registry/mocks/registry_option.mock.go
+++ b/mod/node-core/pkg/services/registry/mocks/registry_option.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go b/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go
index 4abffe8962..fad1b08842 100644
--- a/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go
+++ b/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/state-transition/pkg/core/mocks/execution_engine.mock.go b/mod/state-transition/pkg/core/mocks/execution_engine.mock.go
index c0ddbae4ab..8bf5537e0c 100644
--- a/mod/state-transition/pkg/core/mocks/execution_engine.mock.go
+++ b/mod/state-transition/pkg/core/mocks/execution_engine.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/storage/pkg/interfaces/mocks/db.mock.go b/mod/storage/pkg/interfaces/mocks/db.mock.go
index f9cdef39a7..956c2182d4 100644
--- a/mod/storage/pkg/interfaces/mocks/db.mock.go
+++ b/mod/storage/pkg/interfaces/mocks/db.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/storage/pkg/pruner/mocks/beacon_block.mock.go b/mod/storage/pkg/pruner/mocks/beacon_block.mock.go
index ba68c5bf2d..3f6fa20bc2 100644
--- a/mod/storage/pkg/pruner/mocks/beacon_block.mock.go
+++ b/mod/storage/pkg/pruner/mocks/beacon_block.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/storage/pkg/pruner/mocks/block_event.mock.go b/mod/storage/pkg/pruner/mocks/block_event.mock.go
index 5d2d1891ca..0297db3ce3 100644
--- a/mod/storage/pkg/pruner/mocks/block_event.mock.go
+++ b/mod/storage/pkg/pruner/mocks/block_event.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/storage/pkg/pruner/mocks/prunable.mock.go b/mod/storage/pkg/pruner/mocks/prunable.mock.go
index 0b84e1e0b4..894d56ac32 100644
--- a/mod/storage/pkg/pruner/mocks/prunable.mock.go
+++ b/mod/storage/pkg/pruner/mocks/prunable.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/storage/pkg/pruner/mocks/pruner.mock.go b/mod/storage/pkg/pruner/mocks/pruner.mock.go
index 77e354f31e..6d5b0672c4 100644
--- a/mod/storage/pkg/pruner/mocks/pruner.mock.go
+++ b/mod/storage/pkg/pruner/mocks/pruner.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.48.0. DO NOT EDIT.
+// Code generated by mockery v2.49.0. DO NOT EDIT.
 
 package mocks