diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4ad9d7b0..b956f9dc 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -55,12 +55,10 @@ jobs:
             --enclave ${{ env.ENCLAVE_NAME }} \
             --rpc-url $(kurtosis port print ${{ env.ENCLAVE_NAME }} cdk-erigon-node-001 rpc)
 
-      - name: Dump enclave logs
-        if: failure()
+      - name: Dump enclave
         run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
 
-      - name: Upload logs
-        if: failure()
+      - name: Upload enclave dump
         uses: actions/upload-artifact@v4
         with:
           name: dump_run_without_args_${{ github.run_id }}
@@ -148,20 +146,17 @@ jobs:
             echo "Skipping batch verification as there is no zkevm permissionless RPC in the environment"
           fi
 
-      - name: Dump enclave logs
-        if: failure()
+      - name: Dump enclave
         run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
 
       - name: Generate archive name
-        if: failure()
         run: |
           file_name=$(basename "${{ matrix.file_name }}" ".yml")
           archive_name="dump_run_with_args_${file_name}_${{ github.run_id }}"
           echo "ARCHIVE_NAME=${archive_name}" >> "$GITHUB_ENV"
           echo "Generated archive name: ${archive_name}"
 
-      - name: Upload logs
-        if: failure()
+      - name: Upload enclave dump
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARCHIVE_NAME }}
@@ -259,12 +254,10 @@ jobs:
             echo "Prometheus is not deployed."
           fi
 
-      - name: Dump enclave logs
-        if: failure()
+      - name: Dump enclave
         run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
 
-      - name: Upload logs
-        if: failure()
+      - name: Upload enclave dump
         uses: actions/upload-artifact@v4
         with:
           name: dump_additional_services_${{ github.run_id }}
@@ -328,12 +321,10 @@ jobs:
             --enclave ${{ env.ENCLAVE_NAME }} \
             --rpc-url "$(kurtosis port print ${{ env.ENCLAVE_NAME }} cdk-erigon-node-002 rpc)"
 
-      - name: Dump enclave logs
-        if: failure()
+      - name: Dump enclave
         run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
 
-      - name: Upload logs
-        if: failure()
+      - name: Upload enclave dump
         uses: actions/upload-artifact@v4
         with:
           name: dump_attach_ckds_${{ github.run_id }}
@@ -377,12 +368,10 @@ jobs:
             --enclave ${{ env.ENCLAVE_NAME }} \
             --rpc-url "$(kurtosis port print ${{ env.ENCLAVE_NAME }} cdk-erigon-node-001 rpc)"
 
-      - name: Dump enclave logs
-        if: failure()
+      - name: Dump enclave
         run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
 
-      - name: Upload logs
-        if: failure()
+      - name: Upload enclave dump
         uses: actions/upload-artifact@v4
         with:
           name: dump_attach_ckds_${{ github.run_id }}
diff --git a/templates/trusted-node/cdk-node-config.toml b/templates/trusted-node/cdk-node-config.toml
index 8107f007..246cb08e 100644
--- a/templates/trusted-node/cdk-node-config.toml
+++ b/templates/trusted-node/cdk-node-config.toml
@@ -4,7 +4,7 @@ ForkUpgradeNewForkId = 0
 [Common]
 IsValidiumMode = {{.is_cdk_validium}}
 
-{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
+{{if ge .zkevm_rollup_fork_id 12}}
 ContractVersions = "banana"
 {{else}}
 ContractVersions = "elderberry"
@@ -28,7 +28,7 @@ SequencesTxFileName = "/data/sequencesender.json"
 GasOffset = 80000
 WaitPeriodPurgeTxFile = "15m"
 MaxPendingTx = 1
-{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
+{{if ge .zkevm_rollup_fork_id 12}}
 MaxBatchesForL1 = 300
 BlockFinality="FinalizedBlock"
 {{end}}
@@ -38,7 +38,7 @@ GetBatchWaitInterval = "10s"
                 FrequencyToMonitorTxs = "1s"
                 WaitTxToBeMined = "2m"
                 ConsolidationL1ConfirmationBlocks = 5
-                {{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
+                {{if ge .zkevm_rollup_fork_id 12}}
                 FinalizedStatusL1NumberOfBlocks = 10
                 WaitReceiptMaxTime = "250ms"
                 WaitReceiptCheckInterval = "8s"
@@ -108,7 +108,7 @@ GetBatchWaitInterval = "10s"
                 FrequencyToMonitorTxs = "1s"
                 WaitTxToBeMined = "2m"
 
-                {{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
+                {{if ge .zkevm_rollup_fork_id 12}}
                 WaitReceiptMaxTime = "250ms"
                 WaitReceiptCheckInterval = "1s"
                 {{else}}
@@ -157,7 +157,7 @@ WaitForNewBlocksPeriod = "1s"
 InitialBlock = "{{.zkevm_rollup_manager_block_number}}"
 
 [NetworkConfig.L1]
-{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
+{{if ge .zkevm_rollup_fork_id 12}}
 L1ChainID = "{{.l1_chain_id}}"
 {{else}}
 ChainID = "{{.l1_chain_id}}"