diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2ea3c2e..4e7a81b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ on:
     push:
       branches:
         - master
+        - main
         - develop
   
 
@@ -34,4 +35,6 @@ jobs:
         restore-keys: ${{ runner.os }}-buildx-
           
     - name:  Startup Nitro testnode
-      run: ${{ github.workspace }}/.github/workflows/testnode.bash
+      env:
+        EIGENDA_SIGNER_PRIVATE_KEY: ${{ secrets.EIGENDA_SIGNER_PRIVATE_KEY }}
+      run: EIGENDA_SIGNER_PRIVATE_KEY=$EIGENDA_SIGNER_PRIVATE_KEY ${{ github.workspace }}/.github/workflows/testnode.bash
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 29c5653..cac38a2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -363,17 +363,17 @@ services:
 
   eigenda_proxy:
     container_name: eigenda-proxy
-    image: ghcr.io/layr-labs/eigenda-proxy:v1.4.1
+    image: ghcr.io/layr-labs/eigenda-proxy:v1.6.1
     environment:
       - EIGENDA_PROXY_ADDR=0.0.0.0
       - EIGENDA_PROXY_PORT=4242
-      - MEMSTORE_ENABLED=false
-      - MEMSTORE_EXPIRATION=45m
-      - EIGENDA_PROXY_SIGNER_PRIVATE_KEY_HEX=$PRIVATE_KEY
+      - EIGENDA_PROXY_MEMSTORE_ENABLED=false
+      - EIGENDA_PROXY_MEMSTORE_EXPIRATION=45m
+      - EIGENDA_PROXY_EIGENDA_SIGNER_PRIVATE_KEY_HEX=$EIGENDA_SIGNER_PRIVATE_KEY
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-holesky.eigenda.xyz:443
-      - EIGENDA_PROXY_SERVICE_MANAGER_ADDR=0xD4A7E1Bd8015057293f0D0A557088c286942e84b
-      - EIGENDA_PROXY_ETH_RPC=https://ethereum-holesky-rpc.publicnode.com
-      - EIGENDA_PROXY_ETH_CONFIRMATION_DEPTH=0
+      - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0xD4A7E1Bd8015057293f0D0A557088c286942e84b
+      - EIGENDA_PROXY_EIGENDA_ETH_RPC=https://ethereum-holesky-rpc.publicnode.com
+      - EIGENDA_PROXY_EIGENDA_CONFIRMATION_DEPTH=0
       - EIGENDA_PROXY_METRICS_ADDR=0.0.0.0
       - EIGENDA_PROXY_METRICS_ENABLED=true
       - EIGENDA_PROXY_METRICS_PORT=7300
diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile
index e33f2e1..2b78533 100644
--- a/rollupcreator/Dockerfile
+++ b/rollupcreator/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
 WORKDIR /workspace
 # Clone the repository and checkout the specified branch
 RUN git clone --no-checkout https://github.com/layr-labs/nitro-contracts.git ./
-RUN git checkout a2de1c3ef227bde09b0b6ebfe272c66f441345f9
+RUN git checkout 85aa27d11776bcbadf7f09aebdf71562bcb76e51
  
 # Install Foundry
 RUN curl -L https://foundry.paradigm.xyz | bash
diff --git a/scripts/config.ts b/scripts/config.ts
index 217f0d6..b765ba3 100644
--- a/scripts/config.ts
+++ b/scripts/config.ts
@@ -207,6 +207,7 @@ function writeConfigs(argv: any) {
                 "max-delay": "15m",
                 "wait-for-max-delay": false,
                 "max-eigenda-batch-size": 16_000_000, // 16MB
+                "enable-eigenda-failover": false,
                 "l1-block-bound": "ignore",
                 "parent-chain-wallet" : {
                     "account": namedAddress("sequencer"),
diff --git a/test-node.bash b/test-node.bash
index e78a4ff..f1fbd20 100755
--- a/test-node.bash
+++ b/test-node.bash
@@ -2,12 +2,12 @@
 
 set -e
 
-NITRO_NODE_VERSION=ghcr.io/layr-labs/nitro-eigenda:latest
+NITRO_NODE_VERSION=ghcr.io/layr-labs/nitro-eigenda:eigenda-v3.2.1-linux-amd64
 BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1
 
 # This commit matches the v1.2.1 contracts, with additional support for CacheManger deployment.
 # Once v1.2.2 is released, we can switch to that version.
-DEFAULT_NITRO_CONTRACTS_VERSION="4fb6492ba3892863b3b66cd1335b49152cf9d975"
+DEFAULT_NITRO_CONTRACTS_VERSION="85aa27d11776bcbadf7f09aebdf71562bcb76e51"
 DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.1"
 
 # Set default versions if not overriden by provided env vars