diff --git a/.github/test_e2e_cdk_erigon_args_base.json b/.github/test_e2e_cdk_erigon_args_base.json
index 25dced5d3..fee321dab 100644
--- a/.github/test_e2e_cdk_erigon_args_base.json
+++ b/.github/test_e2e_cdk_erigon_args_base.json
@@ -2,7 +2,7 @@
   "deployment_stages": {
     "deploy_l2_contracts": true,
     "deploy_op_succinct": false,
-    "deploy_cdk_bridge_infra": false
+    "deploy_zkevm_bridge_service": false
   },
   "args": {
     "consensus_contract_type": "ecdsa-multisig",
@@ -10,7 +10,7 @@
     "agg_sender_multisig_threshold": 1,
     "agg_sender_validator_total_number": 0,
     "binary_name": "aggkit",
-    "log_level": "debug",
+    "log_level": "info",
     "aggkit_components": "aggsender",
     "aggkit_image": "aggkit:local",
     "agglayer_prover_primary_prover": "mock-prover",
diff --git a/.github/test_e2e_op_args_base.json b/.github/test_e2e_op_args_base.json
index 8f9ea61d9..586685bb6 100644
--- a/.github/test_e2e_op_args_base.json
+++ b/.github/test_e2e_op_args_base.json
@@ -1,7 +1,7 @@
 {
   "deployment_stages": {
     "deploy_op_succinct": false,
-    "deploy_cdk_bridge_infra": false
+    "deploy_zkevm_bridge_service": true
   },
   "args": {
     "aggkit_image": "aggkit:local",
@@ -9,7 +9,7 @@
     "use_agg_sender_validator": true,
     "agg_sender_multisig_threshold": 2,
     "agg_sender_validator_total_number": 3,
-    "log_level": "debug",
+    "log_level": "info",
     "additional_services": [],
     "binary_name": "aggkit",
     "aggkit_components": "aggsender,aggoracle",
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index e35de64cc..9c1675f66 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -18,7 +18,7 @@ concurrency:
 
 env:
   AGGKIT_REPORT_CHANNEL: "C092K6Z0EUT"
-  KURTOSIS_CDK_COMMIT: "507e4e8e6581ab5ecbb44444f9b7f1d05e3dcd1c"
+  KURTOSIS_CDK_COMMIT: "a19cb8a3038112bd459a938e2972d43dbac325ed"
 
 permissions:
   packages: write
@@ -173,11 +173,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@55457421ba75b421cc611022db81bbeefd3e1f60
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f # main
+      agglayer-e2e-ref: 55457421ba75b421cc611022db81bbeefd3e1f60
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-pessimistic }}
       test-name: "test-single-l2-network-op-pessimistic"
@@ -201,11 +201,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@55457421ba75b421cc611022db81bbeefd3e1f60
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f # main
+      agglayer-e2e-ref: 55457421ba75b421cc611022db81bbeefd3e1f60
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-succinct }}
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
@@ -229,12 +229,12 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@55457421ba75b421cc611022db81bbeefd3e1f60
     if: always() && github.event_name == 'schedule' && github.ref == 'refs/heads/develop'
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f # main
+      agglayer-e2e-ref: 55457421ba75b421cc611022db81bbeefd3e1f60
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-succinct-aggoracle-committee }}
       test-name: "test-single-l2-network-op-succinct-aggoracle-committee"
@@ -258,11 +258,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@55457421ba75b421cc611022db81bbeefd3e1f60
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f # main
+      agglayer-e2e-ref: 55457421ba75b421cc611022db81bbeefd3e1f60
       kurtosis-cdk-enclave-name: op
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       kurtosis-cdk-args-1: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-1 }}
@@ -284,11 +284,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@55457421ba75b421cc611022db81bbeefd3e1f60
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: 76b1ff29e2ab38697aa2fb8d51fd8563bca2bb5f # main
+      agglayer-e2e-ref: 55457421ba75b421cc611022db81bbeefd3e1f60
       kurtosis-cdk-enclave-name: aggkit
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       kurtosis-cdk-args-1: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-3 }}
diff --git a/bridgesync/processor.go b/bridgesync/processor.go
index fe1cb8412..8c795fc97 100644
--- a/bridgesync/processor.go
+++ b/bridgesync/processor.go
@@ -1405,12 +1405,12 @@ func (p *processor) restoreBackwardLETBridges(tx dbtypes.Txer, backwardLETs []*B
 	`
 
 	for _, backwardLET := range backwardLETs {
-		prev, err := aggkitcommon.SafeUint64(backwardLET.PreviousDepositCount)
+		prev, err := aggkitcommon.SafeUint64(new(big.Int).Sub(backwardLET.PreviousDepositCount, big.NewInt(1)))
 		if err != nil {
 			return fmt.Errorf("invalid previous deposit count: %w", err)
 		}
 
-		next, err := aggkitcommon.SafeUint64(backwardLET.NewDepositCount)
+		next, err := aggkitcommon.SafeUint64(new(big.Int).Sub(backwardLET.NewDepositCount, big.NewInt(1)))
 		if err != nil {
 			return fmt.Errorf("invalid new deposit count: %w", err)
 		}
@@ -1590,7 +1590,8 @@ func (p *processor) ProcessBlock(ctx context.Context, block sync.Block) error {
 				return err
 			}
 
-			newDepositCount, leafIndex, err := normalizeDepositCount(event.BackwardLET.NewDepositCount)
+			adjustedCount := new(big.Int).Sub(event.BackwardLET.NewDepositCount, big.NewInt(1))
+			newDepositCount, leafIndex, err := normalizeDepositCount(adjustedCount)
 			if err != nil {
 				return err
 			}
@@ -1754,7 +1755,7 @@ func (p *processor) handleForwardLETEvent(tx dbtypes.Txer, event *ForwardLET, bl
 		return 0, fmt.Errorf("failed to decode new leaves in forward LET: %w", err)
 	}
 
-	newDepositCount := uint32(event.PreviousDepositCount.Uint64()) + 1
+	newDepositCount := uint32(event.PreviousDepositCount.Uint64())
 	newBlockPos := event.BlockPos
 	if blockPos != nil {
 		newBlockPos = *blockPos
diff --git a/bridgesync/processor_test.go b/bridgesync/processor_test.go
index 7223b5ac3..8adeb7eaf 100644
--- a/bridgesync/processor_test.go
+++ b/bridgesync/processor_test.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"math"
 	"math/big"
 	"os"
 	"path"
@@ -487,8 +486,8 @@ var (
 			Event{BackwardLET: &BackwardLET{
 				BlockNum:             5,
 				BlockPos:             4,
-				PreviousDepositCount: big.NewInt(3),
-				NewDepositCount:      big.NewInt(2),
+				PreviousDepositCount: big.NewInt(4),
+				NewDepositCount:      big.NewInt(3),
 				PreviousRoot:         common.HexToHash("0x15cd4b94cacc2cf50d055e1adb5fbfe5cd95485e121a5c411d73e263f2a66685"),
 				NewRoot:              common.HexToHash("0xa03113d9ce128863f29479689c82d0b37ebc9432c569c3a57f22d6c008256c5b"),
 			}},
@@ -5447,8 +5446,8 @@ func TestProcessor_BackwardLET(t *testing.T) {
 						Event{BackwardLET: &BackwardLET{
 							BlockNum:             uint64(len(blocks) + 1),
 							BlockPos:             0,
-							PreviousDepositCount: big.NewInt(3),
-							NewDepositCount:      big.NewInt(2),
+							PreviousDepositCount: big.NewInt(4),
+							NewDepositCount:      big.NewInt(3),
 							PreviousRoot:         common.HexToHash("0x9ba667158a062be548e5c1b2e8a9a2ad03b693e562535b0723880627c6664b02"),
 							NewRoot:              common.HexToHash("0xa9d31ebbb97c7cd7c7103bee8af7d0b4c83771939baba0b415b0f94c4c39fd84"),
 						}},
@@ -5471,8 +5470,8 @@ func TestProcessor_BackwardLET(t *testing.T) {
 						Event{BackwardLET: &BackwardLET{
 							BlockNum:             uint64(len(blocks) + 1),
 							BlockPos:             0,
-							PreviousDepositCount: big.NewInt(5),
-							NewDepositCount:      big.NewInt(0),
+							PreviousDepositCount: big.NewInt(6),
+							NewDepositCount:      big.NewInt(1),
 							PreviousRoot:         common.HexToHash("0x9ba667158a062be548e5c1b2e8a9a2ad03b693e562535b0723880627c6664b02"),
 							NewRoot:              common.HexToHash("0x283c52c3d10a22d01f95f5bcab5e823675c9855bd40b1e82f32b0437b3b6a446"),
 						}},
@@ -5495,8 +5494,8 @@ func TestProcessor_BackwardLET(t *testing.T) {
 						Event{BackwardLET: &BackwardLET{
 							BlockNum:             uint64(len(blocks) + 1),
 							BlockPos:             0,
-							PreviousDepositCount: big.NewInt(5),
-							NewDepositCount:      big.NewInt(4),
+							PreviousDepositCount: big.NewInt(6),
+							NewDepositCount:      big.NewInt(5),
 							PreviousRoot:         common.HexToHash("0x9ba667158a062be548e5c1b2e8a9a2ad03b693e562535b0723880627c6664b02"),
 							NewRoot:              common.HexToHash("0x44e1bf8449ecec2b8b1d123fab00d33c9acb308e590605adf5f6e2de4d1c1133"),
 						}},
@@ -5520,8 +5519,8 @@ func TestProcessor_BackwardLET(t *testing.T) {
 						Event{BackwardLET: &BackwardLET{
 							BlockNum:             uint64(len(blocks) + 1),
 							BlockPos:             0,
-							PreviousDepositCount: big.NewInt(5),
-							NewDepositCount:      big.NewInt(2),
+							PreviousDepositCount: big.NewInt(6),
+							NewDepositCount:      big.NewInt(3),
 							PreviousRoot:         common.HexToHash("0x9ba667158a062be548e5c1b2e8a9a2ad03b693e562535b0723880627c6664b02"),
 							NewRoot:              common.HexToHash("0xa9d31ebbb97c7cd7c7103bee8af7d0b4c83771939baba0b415b0f94c4c39fd84"),
 						}},
@@ -5536,44 +5535,6 @@ func TestProcessor_BackwardLET(t *testing.T) {
 			skipBlocks:            []uint64{2, 3}, // all the bridges from these blocks were backwarded
 			archivedDepositCounts: []uint32{3, 4, 5},
 		},
-		{
-			name: "overlapping backward let events",
-			setupBlocks: func() []sync.Block {
-				blocks := buildBlocksWithSequentialBridges(3, 2, 0, 0)
-				blocks = append(blocks, sync.Block{
-					Num:  uint64(len(blocks) + 1),
-					Hash: common.HexToHash(fmt.Sprintf("0x%x", len(blocks)+1)),
-					Events: []any{
-						Event{BackwardLET: &BackwardLET{
-							BlockNum:             uint64(len(blocks) + 1),
-							BlockPos:             0,
-							PreviousDepositCount: big.NewInt(5),
-							NewDepositCount:      big.NewInt(3),
-							PreviousRoot:         common.HexToHash("0x9ba667158a062be548e5c1b2e8a9a2ad03b693e562535b0723880627c6664b02"),
-							NewRoot:              common.HexToHash("0x7533c9ef58edd0bea7959a20c33ed47e5548d35f4ff140c5c915740fe6800fb8"),
-						}},
-					},
-				})
-				blocks = append(blocks, sync.Block{
-					Num:  uint64(len(blocks) + 2),
-					Hash: common.HexToHash(fmt.Sprintf("0x%x", len(blocks)+2)),
-					Events: []any{
-						Event{BackwardLET: &BackwardLET{
-							BlockNum:             uint64(len(blocks) + 2),
-							BlockPos:             0,
-							PreviousDepositCount: big.NewInt(4),
-							NewDepositCount:      big.NewInt(3),
-							PreviousRoot:         common.HexToHash("0x7533c9ef58edd0bea7959a20c33ed47e5548d35f4ff140c5c915740fe6800fb8"),
-							NewRoot:              common.HexToHash("0x7533c9ef58edd0bea7959a20c33ed47e5548d35f4ff140c5c915740fe6800fb8"),
-						}},
-					},
-				})
-
-				return blocks
-			},
-			targetDepositCount:    3,
-			archivedDepositCounts: []uint32{4, 5},
-		},
 		{
 			name: "backward let on empty bridge table",
 			setupBlocks: func() []sync.Block {
@@ -5585,52 +5546,14 @@ func TestProcessor_BackwardLET(t *testing.T) {
 							Event{BackwardLET: &BackwardLET{
 								BlockNum:             1,
 								BlockPos:             0,
-								PreviousDepositCount: big.NewInt(6),
-								NewDepositCount:      big.NewInt(3),
+								PreviousDepositCount: big.NewInt(7),
+								NewDepositCount:      big.NewInt(4),
 							}},
 						},
 					}}
 			},
 			targetDepositCount: 0,
 		},
-		{
-			name: "backward let invalid new deposit count (outside of uint64 range)",
-			setupBlocks: func() []sync.Block {
-				return []sync.Block{
-					{
-						Num:  1,
-						Hash: common.HexToHash("0x1"),
-						Events: []any{
-							Event{BackwardLET: &BackwardLET{
-								BlockNum:             1,
-								BlockPos:             0,
-								PreviousDepositCount: big.NewInt(0),
-								NewDepositCount:      big.NewInt(-3),
-							}},
-						},
-					}}
-			},
-			processBlockErrMsg: "invalid deposit count: value=-3 does not fit in uint64",
-		},
-		{
-			name: "backward let invalid new deposit count (outside of uint32 range)",
-			setupBlocks: func() []sync.Block {
-				return []sync.Block{
-					{
-						Num:  1,
-						Hash: common.HexToHash("0x1"),
-						Events: []any{
-							Event{BackwardLET: &BackwardLET{
-								BlockNum:             1,
-								BlockPos:             0,
-								PreviousDepositCount: big.NewInt(0),
-								NewDepositCount:      new(big.Int).SetUint64(uint64(math.MaxUint32) + 1),
-							}},
-						},
-					}}
-			},
-			processBlockErrMsg: "invalid deposit count: value=4294967296 exceeds uint32 max",
-		},
 		{
 			name: "backward let after a couple of bridges + reorg backward let",
 			setupBlocks: func() []sync.Block {
@@ -5642,8 +5565,8 @@ func TestProcessor_BackwardLET(t *testing.T) {
 						Event{BackwardLET: &BackwardLET{
 							BlockNum:             4,
 							BlockPos:             0,
-							PreviousDepositCount: big.NewInt(5),
-							NewDepositCount:      big.NewInt(2),
+							PreviousDepositCount: big.NewInt(6),
+							NewDepositCount:      big.NewInt(3),
 							PreviousRoot:         common.HexToHash("0x9ba667158a062be548e5c1b2e8a9a2ad03b693e562535b0723880627c6664b02"),
 							NewRoot:              common.HexToHash("0xa9d31ebbb97c7cd7c7103bee8af7d0b4c83771939baba0b415b0f94c4c39fd84"),
 						}},
@@ -5668,8 +5591,8 @@ func TestProcessor_BackwardLET(t *testing.T) {
 						Event{BackwardLET: &BackwardLET{
 							BlockNum:             uint64(len(blocks) + 1),
 							BlockPos:             0,
-							PreviousDepositCount: big.NewInt(5),
-							NewDepositCount:      big.NewInt(2),
+							PreviousDepositCount: big.NewInt(6),
+							NewDepositCount:      big.NewInt(3),
 							PreviousRoot:         common.HexToHash("0x9ba667158a062be548e5c1b2e8a9a2ad03b693e562535b0723880627c6664b02"),
 							NewRoot:              common.HexToHash("0xa9d31ebbb97c7cd7c7103bee8af7d0b4c83771939baba0b415b0f94c4c39fd84"),
 						}},
@@ -5888,7 +5811,7 @@ func TestHandleForwardLETEvent(t *testing.T) {
 			BlockPos:             5,
 			BlockTimestamp:       1234567890,
 			TxnHash:              common.HexToHash("0xabc123"),
-			PreviousDepositCount: big.NewInt(int64(initialDepositCount)),
+			PreviousDepositCount: big.NewInt(int64(initialDepositCount + 1)),
 			PreviousRoot:         initialRoot,
 			NewDepositCount:      big.NewInt(int64(initialDepositCount + 1)),
 			NewLeaves:            encodedLeaves,
@@ -5993,7 +5916,7 @@ func TestHandleForwardLETEvent(t *testing.T) {
 			BlockPos:             10,
 			BlockTimestamp:       1234567900,
 			TxnHash:              common.HexToHash("0xdef456"),
-			PreviousDepositCount: big.NewInt(int64(initialDepositCount)),
+			PreviousDepositCount: big.NewInt(int64(initialDepositCount + 1)),
 			PreviousRoot:         initialRoot,
 			NewDepositCount:      big.NewInt(int64(initialDepositCount + uint32(len(leaves)))),
 			NewLeaves:            encodedLeaves,
@@ -6092,7 +6015,7 @@ func TestHandleForwardLETEvent(t *testing.T) {
 			BlockPos:             20,
 			BlockTimestamp:       1234567950,
 			TxnHash:              common.HexToHash("0xforward789"),
-			PreviousDepositCount: big.NewInt(int64(initialDepositCount)),
+			PreviousDepositCount: big.NewInt(int64(initialDepositCount + 1)),
 			PreviousRoot:         initialRoot,
 			NewDepositCount:      big.NewInt(int64(initialDepositCount + 1)),
 			NewLeaves:            encodedLeaves,
@@ -6201,7 +6124,7 @@ func TestHandleForwardLETEvent(t *testing.T) {
 			BlockPos:             30,
 			BlockTimestamp:       1234567999,
 			TxnHash:              common.HexToHash("0xforward999"),
-			PreviousDepositCount: big.NewInt(int64(initialDepositCount)),
+			PreviousDepositCount: big.NewInt(int64(initialDepositCount + 1)),
 			PreviousRoot:         initialRoot,
 			NewDepositCount:      big.NewInt(int64(initialDepositCount + 1)),
 			NewLeaves:            encodedLeaves,
@@ -6262,7 +6185,7 @@ func TestHandleForwardLETEvent(t *testing.T) {
 			BlockPos:             5,
 			BlockTimestamp:       1234567890,
 			TxnHash:              common.HexToHash("0xabc123"),
-			PreviousDepositCount: big.NewInt(int64(initialDepositCount)),
+			PreviousDepositCount: big.NewInt(int64(initialDepositCount + 1)),
 			PreviousRoot:         common.HexToHash("0xWRONG"), // Wrong root
 			NewDepositCount:      big.NewInt(int64(initialDepositCount + 1)),
 			NewRoot:              common.HexToHash("0x999"),
@@ -6319,7 +6242,7 @@ func TestHandleForwardLETEvent(t *testing.T) {
 			BlockPos:             5,
 			BlockTimestamp:       1234567890,
 			TxnHash:              common.HexToHash("0xabc123"),
-			PreviousDepositCount: big.NewInt(int64(initialDepositCount)),
+			PreviousDepositCount: big.NewInt(int64(initialDepositCount + 1)),
 			PreviousRoot:         initialRoot,
 			NewDepositCount:      big.NewInt(int64(initialDepositCount + 1)),
 			NewRoot:              common.HexToHash("0xWRONG"), // Wrong new root
@@ -6352,7 +6275,7 @@ func TestHandleForwardLETEvent(t *testing.T) {
 			BlockPos:             5,
 			BlockTimestamp:       1234567890,
 			TxnHash:              common.HexToHash("0xabc123"),
-			PreviousDepositCount: big.NewInt(int64(initialDepositCount)),
+			PreviousDepositCount: big.NewInt(int64(initialDepositCount + 1)),
 			PreviousRoot:         initialRoot,
 			NewDepositCount:      big.NewInt(int64(initialDepositCount + 1)),
 			NewRoot:              common.Hash{},
@@ -6407,7 +6330,7 @@ func TestHandleForwardLETEvent(t *testing.T) {
 			BlockPos:             5,
 			BlockTimestamp:       1234567890,
 			TxnHash:              common.HexToHash("0xabc123"),
-			PreviousDepositCount: big.NewInt(int64(initialDepositCount)),
+			PreviousDepositCount: big.NewInt(int64(initialDepositCount + 1)),
 			PreviousRoot:         initialRoot,
 			NewDepositCount:      big.NewInt(int64(initialDepositCount + 1)),
 			NewLeaves:            encodedLeaves,
diff --git a/scripts/local_config_helper b/scripts/local_config_helper
index 858605273..7038455fe 100644
--- a/scripts/local_config_helper
+++ b/scripts/local_config_helper
@@ -236,14 +236,46 @@ function create_dest_folder() {
 }
 ###############################################################################
 function download_kurtosis_artifacts() {
-    kurtosis files download $KURTOSIS_ENCLAVE aggkit-sequencer-keystore $DEST
+    # Construct artifact name from service name (e.g., aggkit-001 -> aggkit-config-001)
+    # Allow override via environment variable, otherwise construct from AGGKIT_SERVICE
+    local AGGKIT_CONFIG_ARTIFACT
+    if [ -n "${KURTOSIS_ARTIFACT_AGGKIT_CONFIG:-}" ]; then
+        AGGKIT_CONFIG_ARTIFACT="$KURTOSIS_ARTIFACT_AGGKIT_CONFIG"
+    else
+        # Extract service number from AGGKIT_SERVICE (e.g., aggkit-001 -> 001)
+        local SERVICE_NUMBER=$(echo "$AGGKIT_SERVICE" | sed 's/.*-//')
+        AGGKIT_CONFIG_ARTIFACT="aggkit-config-${SERVICE_NUMBER}"
+    fi
+
+    kurtosis files download "$KURTOSIS_ENCLAVE" "aggkit-sequencer-keystore" "$DEST"
     ok_or_fatal "Error downloading kurtosis artifact aggkit-sequencer-keystore to $DEST"
     export zkevm_l2_sequencer_keystore_file_path=$DEST/sequencer.keystore
 
-    kurtosis files download $KURTOSIS_ENCLAVE aggkit-config-artifact $DEST
-    ok_or_fatal "Error downloading kurtosis artifact aggkit-config-artifact to $DEST"
+    if ! kurtosis files download "$KURTOSIS_ENCLAVE" "$AGGKIT_CONFIG_ARTIFACT" "$DEST" 2>/dev/null; then
+        log_error "Failed to download kurtosis artifact '$AGGKIT_CONFIG_ARTIFACT' from enclave '$KURTOSIS_ENCLAVE'"
+        log_error "This artifact is expected to be created by the Kurtosis CDK setup."
+        log_error ""
+        log_error "Current configuration:"
+        log_error "  AGGKIT_SERVICE: $AGGKIT_SERVICE"
+        log_error "  Constructed artifact name: $AGGKIT_CONFIG_ARTIFACT"
+        log_error ""
+        log_error "Possible solutions:"
+        log_error "1. Ensure the Kurtosis environment was started correctly"
+        log_error "2. Check that the Kurtosis CDK version matches the expected commit"
+        log_error "3. Verify the enclave name is correct (current: $KURTOSIS_ENCLAVE)"
+        log_error "4. Try restarting the Kurtosis environment:"
+        log_error "   kurtosis clean --all"
+        log_error "   kurtosis run --enclave $KURTOSIS_ENCLAVE --args-file params.yml --image-download always ."
+        log_error ""
+        log_error "You can override the artifact name by setting:"
+        log_error "   export KURTOSIS_ARTIFACT_AGGKIT_CONFIG=<artifact-name>"
+        log_error ""
+        log_error "You can check available artifacts with:"
+        log_error "   kurtosis enclave inspect $KURTOSIS_ENCLAVE | grep aggkit"
+        log_fatal "Error downloading kurtosis artifact $AGGKIT_CONFIG_ARTIFACT to $DEST"
+    fi
 
-    kurtosis files download $KURTOSIS_ENCLAVE aggoracle-keystore $DEST
+    kurtosis files download "$KURTOSIS_ENCLAVE" "aggoracle-keystore" "$DEST"
     ok_or_fatal "Error downloading kurtosis artifact aggoracle to $DEST"
     export zkevm_aggoracle_privatekey_path=$DEST/aggoracle.keystore
 }
@@ -257,7 +289,7 @@ function common_export_values_of_aggkit_config() {
     export_key_from_toml_file_or_fatal pol_token_address $AGGKIT_CONFIG_FILE L1Config polTokenAddress
     export_key_from_toml_file_or_fatal zkevm_rollup_manager_address $AGGKIT_CONFIG_FILE L1Config polygonRollupManagerAddress
     export_key_from_toml_file_or_fatal zkevm_global_exit_root_address $AGGKIT_CONFIG_FILE L1Config polygonZkEVMGlobalExitRootAddress
-    export_key_from_toml_file_or_fatal zkevm_rollup_chain_id $AGGKIT_CONFIG_FILE AggOracle.EVMSender.EthTxManager.Etherman L1ChainID
+    export_key_from_toml_file_or_fatal l2_chain_id $AGGKIT_CONFIG_FILE AggOracle.EVMSender.EthTxManager.Etherman L1ChainID
     export_key_from_toml_file_or_fatal zkevm_bridge_address $AGGKIT_CONFIG_FILE L1Config BridgeAddr
     export_key_from_toml_file_or_fatal zkevm_bridge_l2_address $AGGKIT_CONFIG_FILE L2Config BridgeAddr
 }
diff --git a/test/run-local-e2e.sh b/test/run-local-e2e.sh
index c6ddceebb..a8ac71135 100755
--- a/test/run-local-e2e.sh
+++ b/test/run-local-e2e.sh
@@ -68,7 +68,7 @@ while [[ $# -gt 0 ]]; do
             echo "  $0 single-l2-network-op-succinct /path/to/kurtosis -                # Use Kurtosis, skip E2E"
             exit 0
             ;;
-        -*)
+        -?*)
             echo "Unknown option: $1"
             echo "Use -h or --help for usage information"
             exit 1
@@ -168,10 +168,10 @@ single-l2-network-op-succinct-aggoracle-committee)
     ENCLAVE_NAME="op"
     ;;
 single-l2-network-op-pessimistic)
-    ENCLAVE_NAME="aggkit"
+    ENCLAVE_NAME="op"
     ;;
 multi-l2-networks-2-chains-op-pessimistic)
-    ENCLAVE_NAME="aggkit"
+    ENCLAVE_NAME="op"
     ;;
 multi-l2-networks-3-chains-cdk-erigon-pessimistic)
     ENCLAVE_NAME="aggkit"
@@ -394,7 +394,6 @@ if [ "$E2E_REPO_PATH" != "-" ]; then
     case "$TEST_TYPE" in
     single-l2-network-op-succinct)
         bats ./tests/aggkit/bridge-e2e.bats || exit 1
-        bats ./tests/aggkit/e2e-pp.bats || exit 1
         bats ./tests/aggkit/bridge-sovereign-chain-e2e.bats || exit 1
         bats ./tests/aggkit/bridge-e2e-nightly.bats || exit 1
         bats ./tests/aggkit/internal-claims.bats || exit 1
@@ -407,7 +406,6 @@ if [ "$E2E_REPO_PATH" != "-" ]; then
         ;;
     single-l2-network-op-pessimistic)
         bats ./tests/aggkit/bridge-e2e.bats || exit 1
-        bats ./tests/aggkit/e2e-pp.bats || exit 1
         bats ./tests/aggkit/bridge-sovereign-chain-e2e.bats || exit 1
         bats ./tests/op/optimistic-mode.bats || exit 1
         bats ./tests/aggkit/bridge-e2e-nightly.bats || exit 1