diff --git a/docker-compose.yaml b/docker-compose.yaml
index f595b66a..aaab0e53 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -168,6 +168,8 @@ services:
       - "config:/config"
       - "tokenbridge-data:/tokenbridge-data"
     command: --conf.file /config/sequencer_config.json --node.feed.output.enable --node.feed.output.port 9642  --http.api net,web3,eth,txpool,debug --node.seq-coordinator.my-url  ws://sequencer:8548 --graphql.enable --graphql.vhosts * --graphql.corsdomain *
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     depends_on:
       - geth
 
@@ -245,6 +247,8 @@ services:
       - "l1keystore:/home/user/l1keystore"
       - "config:/config"
     command: --conf.file /config/poster_config.json
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     depends_on:
       - geth
       - redis
@@ -293,6 +297,8 @@ services:
       - "l1keystore:/home/user/l1keystore"
       - "config:/config"
     command: --conf.file /config/validator_config.json --http.port 8547 --http.api net,web3,arb,debug --ws.port 8548
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     depends_on:
       - sequencer
       - validation_node
@@ -322,6 +328,8 @@ services:
     volumes:
       - "config:/config"
     command: --conf.file /config/validation_node_config.json
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   scripts:
     build: scripts/
diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile
index f6406dad..80454512 100644
--- a/rollupcreator/Dockerfile
+++ b/rollupcreator/Dockerfile
@@ -1,13 +1,14 @@
 FROM node:18-bullseye-slim
-ARG NITRO_CONTRACTS_BRANCH=main
+ARG NITRO_CONTRACTS_BRANCH=celestia-v3.1.0-test
 RUN apt-get update && \
     apt-get install -y git docker.io python3 build-essential curl jq
-WORKDIR /workspace  
-RUN git clone --no-checkout https://github.com/OffchainLabs/nitro-contracts.git ./
+WORKDIR /workspace
+RUN git clone --recurse-submodules --no-checkout https://github.com/celestiaorg/nitro-contracts.git ./
 RUN git checkout ${NITRO_CONTRACTS_BRANCH}
 RUN curl -L https://foundry.paradigm.xyz | bash
 ENV PATH="${PATH}:/root/.foundry/bin"
 RUN foundryup
+RUN forge update lib/forge-std
 RUN touch scripts/config.ts
 RUN yarn install
 RUN yarn build:all
diff --git a/scripts/config.ts b/scripts/config.ts
index 15bc6f7b..866d867a 100644
--- a/scripts/config.ts
+++ b/scripts/config.ts
@@ -191,7 +191,7 @@ function writeConfigs(argv: any) {
                 "dangerous": {
                     "without-block-validator": false
                 },
-                "parent-chain-wallet" : {
+                "parent-chain-wallet": {
                     "account": namedAddress("validator"),
                     "password": consts.l1passphrase,
                     "pathname": consts.l1keystore,
@@ -225,7 +225,7 @@ function writeConfigs(argv: any) {
                 "redis-url": argv.redisUrl,
                 "max-delay": "30s",
                 "l1-block-bound": "ignore",
-                "parent-chain-wallet" : {
+                "parent-chain-wallet": {
                     "account": namedAddress("sequencer"),
                     "password": consts.l1passphrase,
                     "pathname": consts.l1keystore,
@@ -253,7 +253,12 @@ function writeConfigs(argv: any) {
                 // TODO Fix das config to not need this redundant config
                 "parent-chain-node-url": argv.l1url,
                 "sequencer-inbox-address": "not_set"
-            }
+            },
+            "celestia-cfg": {
+                "enable": true,
+                "url": "http://host.docker.internal:9875"
+            },
+            "da-preference": ["celestia", "anytrust"]
         },
         "execution": {
             "sequencer": {
@@ -519,9 +524,9 @@ export const writeConfigCommand = {
     describe: "writes config files",
     builder: {
         simple: {
-          boolean: true,
-          describe: "simple config (sequencer is also poster, validator)",
-          default: false,
+            boolean: true,
+            describe: "simple config (sequencer is also poster, validator)",
+            default: false,
         },
         anytrust: {
             boolean: true,
@@ -539,7 +544,7 @@ export const writeConfigCommand = {
             default: ""
         },
 
-      },
+    },
     handler: (argv: any) => {
         writeConfigs(argv)
     }
@@ -615,8 +620,8 @@ export const writeL2DASKeysetConfigCommand = {
             describe: "DAS committee member B BLS pub key",
             default: ""
         },
-      },
+    },
     handler: (argv: any) => {
-       writeL2DASKeysetConfig(argv)
+        writeL2DASKeysetConfig(argv)
     }
 }
diff --git a/test-node.bash b/test-node.bash
index 9c7204cf..bb6ecb43 100755
--- a/test-node.bash
+++ b/test-node.bash
@@ -5,8 +5,9 @@ set -eu
 NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.2.1-d81324d-dev
 BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.1.0-0e716c8
 
-# This commit matches v2.1.0 release of nitro-contracts, with additional support to set arb owner through upgrade executor
-DEFAULT_NITRO_CONTRACTS_VERSION="99c07a7db2fcce75b751c5a2bd4936e898cda065"
+# 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="8e5836b8c39657d27a6c7ef69e658720b34b6fb8"
 DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.2"
 
 # Set default versions if not overriden by provided env vars
diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile
index dac06fbb..8f3ae386 100644
--- a/tokenbridge/Dockerfile
+++ b/tokenbridge/Dockerfile
@@ -2,7 +2,7 @@ FROM node:18-bullseye-slim
 ARG TOKEN_BRIDGE_BRANCH=main
 RUN apt-get update && \
     apt-get install -y git docker.io python3 build-essential
-WORKDIR /workspace  
+WORKDIR /workspace
 RUN git clone --no-checkout https://github.com/OffchainLabs/token-bridge-contracts.git ./
 RUN git checkout ${TOKEN_BRIDGE_BRANCH}
 RUN yarn install