diff --git a/.github/workflows/syncoor-devnet-2.yaml b/.github/workflows/syncoor-devnet-2.yaml
index def9e1d..347234f 100644
--- a/.github/workflows/syncoor-devnet-2.yaml
+++ b/.github/workflows/syncoor-devnet-2.yaml
@@ -23,12 +23,27 @@ on:
       el-image:
         description: 'Execution layer client images as JSON (e.g., {"geth": "ethereum/client-go:latest", "besu": "hyperledger/besu:latest"})'
         required: false
-        default: '{"geth": "ethpandaops/geth:performance", "besu": "ethpandaops/besu:performance", "nethermind": "ethpandaops/nethermind:performance", "erigon": "ethpandaops/erigon:performance", "reth": "ethpandaops/reth:main"}'
+        default: >-
+          {
+            "geth": "ethpandaops/geth:performance",
+            "besu": "ethpandaops/besu:performance",
+            "nethermind": "nethermindeth/nethermind:performance",
+            "erigon": "ethpandaops/erigon:performance",
+            "reth": "ethpandaops/reth:performance"
+          }
         type: string
       cl-image:
         description: 'Consensus layer client images as JSON (e.g., {"lighthouse": "sigp/lighthouse:latest", "teku": "consensys/teku:latest"})'
         required: false
-        default: '{"lighthouse": "ethpandaops/lighthouse:unstable", "teku": "ethpandaops/teku:master", "prysm": "ethpandaops/prysm-beacon-chain:develop", "nimbus": "ethpandaops/nimbus-eth2:unstable", "lodestar": "ethpandaops/lodestar:latest", "grandine": "ethpandaops/grandine:latest"}'
+        default: >-
+          {
+            "lighthouse": "ethpandaops/lighthouse:unstable",
+            "teku": "ethpandaops/teku:master",
+            "prysm": "ethpandaops/prysm-beacon-chain:develop",
+            "nimbus": "ethpandaops/nimbus-eth2:unstable",
+            "lodestar": "ethpandaops/lodestar:latest",
+            "grandine": "ethpandaops/grandine:latest"
+          }
         type: string
       log-level-cl:
         description: 'Log level for consensus layer clients (debug, info, warn, error)'
@@ -134,12 +149,7 @@ jobs:
         cl-client: ${{ matrix.cl-client }}
         el-image: ${{ steps.parse-images.outputs.el-image }}
         cl-image: ${{ steps.parse-images.outputs.cl-image }}
-        ethereum-package: >-
-          ${{
-            matrix.el-client == 'erigon' && 'github.com/ethpandaops/ethereum-package@static-nodes-workaround' ||
-            matrix.el-client == 'reth' && 'github.com/ethpandaops/ethereum-package@static-nodes-workaround' ||
-            'github.com/ethpandaops/ethereum-package@main'
-          }}
+        ethereum-package: github.com/ethpandaops/ethereum-package@main
         el-env-vars: >-
           ${{
             (matrix.el-client == 'erigon') && '[
@@ -150,30 +160,21 @@ jobs:
         el-extra-args: >-
           ${{
             (matrix.el-client == 'besu') && '[
-              "--required-block=23115201=0x88b0d56cc14c5232cdf6238c7252ca953e505f2a44ee60374f2bafb18bf067bf"
+              "--network-id=12159"
             ]' ||
             (matrix.el-client == 'erigon') && '[
               "--prune.mode=full",
-              "--nodiscover"
+              "--networkid=12159"
             ]' ||
             (matrix.el-client == 'geth') && '[
-              "--eth.requiredblocks=23115201=0x88b0d56cc14c5232cdf6238c7252ca953e505f2a44ee60374f2bafb18bf067bf"
+              "--networkid=12159"
             ]' ||
             (matrix.el-client == 'nethermind') && '[
-              "--Init.DiscoveryEnabled=true",
-              "--Sync.PivotHash=0x77811bb477a5d40cc40b694fa7e6a3482772f2d045a91f725fe40b9215ef51b2",
-              "--Sync.PivotNumber=23142646",
-              "--Sync.PivotTotalDifficulty=58750003716598352816469",
-              "--Sync.FastSync=true",
-              "--Sync.SnapSync=true",
-              "--Network.Bootnodes=enode://3ba5f46aa1a9d863de4ce5ff67ec46704c43b2a1d5100e272dbfec5e56b350113018d3e67c400f09db60d4ec55df025bd209802c67826717a33a48acbe13b305@157.180.14.226:30303",
-              "--Network.StaticPeers=enode://3ba5f46aa1a9d863de4ce5ff67ec46704c43b2a1d5100e272dbfec5e56b350113018d3e67c400f09db60d4ec55df025bd209802c67826717a33a48acbe13b305@157.180.14.226:30303",
-              "--Init.StaticNodesPath=/data/static-nodes.json",
-              "--Init.TrustedNodesPath=/data/trusted-nodes.json"
+              "--Init.NetworkId=12159"
             ]' ||
             (matrix.el-client == 'reth') && '[
-              "--trusted-only",
-              "--required-block-hashes=0x88b0d56cc14c5232cdf6238c7252ca953e505f2a44ee60374f2bafb18bf067bf"
+              "--full",
+              "--network-id=12159"
             ]' ||
             ''
           }}