diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml
new file mode 100644
index 000000000000..a2196fb742f4
--- /dev/null
+++ b/.github/workflows/fork-sync.yml
@@ -0,0 +1,18 @@
+name: Sync Fork
+
+on:
+  schedule:
+    - cron: '*/30 * * * *' # every 30 minutes
+  workflow_dispatch: # on button click
+
+jobs:
+  sync:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: tgymnich/fork-sync@v1.8
+        with:
+          base: celestia-develop
+          head: develop
+          token: ${{ secrets.REPO_PAT }}
diff --git a/README.md b/README.md
index ca471f52e4ab..6237261de702 100644
--- a/README.md
+++ b/README.md
@@ -2,16 +2,37 @@
   <br />
   <br />
   <a href="https://optimism.io"><img alt="Optimism" src="https://raw.githubusercontent.com/ethereum-optimism/brand-kit/main/assets/svg/OPTIMISM-R.svg" width=600></a>
+  <h3><a href="https://optimism.io">Optimism</a> is a low-cost and lightning-fast Ethereum L2 blockchain, built with the OP Stack.</h3>
   <br />
-  <h3><a href="https://optimism.io">Optimism</a> is Ethereum, scaled.</h3>
+  <h3>+</h3>
+  <a href="https://celestia.org"><img alt="Celestia" src="docs/op-stack/src/assets/docs/understand/Celestia-logo-color-color.svg" width=600></a>
+  <h3><a href="https://celestia.org">Celestia</a> is a modular data availability network that securely scales with the number of users, making it easy for anyone to launch their own blockchain.</h3>
   <br />
 </div>
 
-## What is Optimism?
+## Celestia + OP Stack tutorial
+
+If you're looking to run the OP Stack + Celestia setup for this repository, please visit the [Optimism & Celestia guides and tutorials](https://docs.celestia.org/developers/intro-to-op-stack/) to get started.
+
+## What are Optimism and the OP Stack?
 
 [Optimism](https://www.optimism.io/) is a project dedicated to scaling Ethereum's technology and expanding its ability to coordinate people from across the world to build effective decentralized economies and governance systems. The [Optimism Collective](https://app.optimism.io/announcement) builds open-source software for running L2 blockchains and aims to address key governance and economic challenges in the wider cryptocurrency ecosystem. Optimism operates on the principle of **impact=profit**, the idea that individuals who positively impact the Collective should be proportionally rewarded with profit. **Change the incentives and you change the world.**
 
-In this repository, you'll find numerous core components of the OP Stack, the decentralized software stack maintained by the Optimism Collective that powers Optimism and forms the backbone of blockchains like [OP Mainnet](https://explorer.optimism.io/) and [Base](https://base.org). Designed to be "aggressively open source," the OP Stack encourages you to explore, modify, extend, and test the code as needed. Although not all elements of the OP Stack are contained here, many of its essential components can be found within this repository. By collaborating on free, open software and shared standards, the Optimism Collective aims to prevent siloed software development and rapidly accelerate the development of the Ethereum ecosystem. Come contribute, build the future, and redefine power, together.
+The OP Stack powers Optimism, an Ethereum L2 blockchain, and forms the technical foundation for the [the Optimism Collective](https://app.optimism.io/announcement)—a group committed to the **impact=profit** principle. This principle rewards individuals for their positive contributions to the collective.
+
+Optimism addresses critical coordination failures in the crypto ecosystem, such as funding public goods and infrastructure. The OP Stack focuses on creating a shared, open-source system for developing new L2 blockchains within the proposed Superchain ecosystem, promoting collaboration and preventing redundant efforts.
+
+As Optimism evolves, the OP Stack will adapt, encompassing components ranging from blockchain infrastructure to governance systems. This software suite aims to simplify L2 blockchain creation while supporting the growth and development of the Optimism ecosystem.
+
+## What is Celestia?
+
+Celestia is a modular consensus and data network, built to enable anyone to easily deploy their own blockchain with minimal overhead.
+
+Celestia is a minimal blockchain that only orders and publishes transactions and does not execute them. By decoupling the consensus and application execution layers, Celestia modularizes the blockchain technology stack and unlocks new possibilities for decentralized application builders. Lean more at [Celestia.org](https://celestia.org).
+
+## Maintenance
+
+The maintenance guide for this repository can be found in the Wiki tab of the repository or [here](https://github.com/celestiaorg/optimism/wiki).
 
 ## Documentation
 
@@ -21,24 +42,67 @@ In this repository, you'll find numerous core components of the OP Stack, the de
 ## Specification
 
 If you're interested in the technical details of how Optimism works, refer to the [Optimism Protocol Specification](https://github.com/ethereum-optimism/specs).
+If you want to build on top of Celestia, take a look at the documentation at [docs.celestia.org](https://docs.celestia.org).
+
+If you want to learn more about the OP Stack, check out the documentation at [stack.optimism.io](https://stack.optimism.io/).
 
 ## Community
 
+### Optimism
+
 General discussion happens most frequently on the [Optimism discord](https://discord.gg/optimism).
 Governance discussion can also be found on the [Optimism Governance Forum](https://gov.optimism.io/).
 
-## Contributing
+### Celestia
+
+General discussion happens most frequently on the [Celestia discord](https://discord.com/invite/YsnTPcSfWQ).
+Other discussions can be found on the [Celestia forum](https://forum.celestia.org).
 
-Read through [CONTRIBUTING.md](./CONTRIBUTING.md) for a general overview of the contributing process for this repository.
+<!-- ## Contributing
+
+Read through [CONTRIBUTING.md](./CONTRIBUTING.md) for a general overview of our contribution process.
 Use the [Developer Quick Start](./CONTRIBUTING.md#development-quick-start) to get your development environment set up to start working on the Optimism Monorepo.
 Then check out the list of [Good First Issues](https://github.com/ethereum-optimism/optimism/labels/D-good-first-issue) to find something fun to work on!
 Typo fixes are welcome; however, please create a single commit with all of the typo fixes & batch as many fixes together in a PR as possible. Spammy PRs will be closed.
 
-## Security Policy and Vulnerability Reporting
+## e2e testing
+
+This repository has updated end-to-end tests in the `op-e2e` package to work with
+Celestia as the data availability (DA) layer.
+
+Currently, the tests assume a working [Celestia devnet](https://github.com/rollkit/local-celestia-devnet) running locally:
+
+```bash
+docker run -p 26650:26650 ghcr.io/rollkit/local-celestia-devnet:v0.12.7
+```
+
+The e2e tests can be triggered with:
+
+```bash
+cd $HOME/optimism
+cd op-e2e
+OP_E2E_DISABLE_PARALLEL=true OP_E2E_CANNON_ENABLED=false OP_NODE_DA_RPC=localhost:26650 OP_BATCHER_DA_RPC=localhost:26650 make test
+```
 
-Please refer to the canonical [Security Policy](https://github.com/ethereum-optimism/.github/blob/master/SECURITY.md) document for detailed information about how to report vulnerabilities in this codebase.
-Bounty hunters are encouraged to check out [the Optimism Immunefi bug bounty program](https://immunefi.com/bounty/optimism/).
-The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vulnerabilities.
+## Bridging
+
+If you have the OP Stack + Celestia setup running, you can test out bridging from the L1
+to the L2.
+
+To do this, first navigate to the `packages/contracts-bedrock` directory and create a
+`.env` file with the following contents:
+
+```bash
+L1_PROVIDER_URL=http://localhost:8545
+L2_PROVIDER_URL=http://localhost:9545
+PRIVATE_KEY=bf7604d9d3a1c7748642b1b7b05c2bd219c9faa91458b370f85e5a40f3b03af7
+```
+
+Then, run the following from the same directory:
+
+```bash
+npx hardhat deposit --network devnetL1 --l1-provider-url http://localhost:8545 --l2-provider-url http://localhost:9545 --amount-eth <AMOUNT> --to <ADDRESS>
+```
 
 ## Directory Structure
 
@@ -67,7 +131,7 @@ The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vuln
 │   └── <a href="./packages/sdk">sdk</a>: provides a set of tools for interacting with Optimism
 └── <a href="./proxyd">proxyd</a>: Configurable RPC request router and proxy
 </pre>
-
+<!--
 ## Branching Model
 
 ### Active Branches
diff --git a/bedrock-devnet/devnet/__init__.py b/bedrock-devnet/devnet/__init__.py
index 4b06a1d76028..83628468cc53 100644
--- a/bedrock-devnet/devnet/__init__.py
+++ b/bedrock-devnet/devnet/__init__.py
@@ -234,6 +234,10 @@ def devnet_deploy(paths):
     log.info('Bringing up `op-node`, `op-proposer` and `op-batcher`.')
     run_command(['docker', 'compose', 'up', '-d', 'op-node', 'op-proposer', 'op-batcher', 'artifact-server'], cwd=paths.ops_bedrock_dir, env=docker_env)
 
+    log.info('Bringing up DA')
+    run_command(['docker', 'compose', 'up', '-d', 'da'], cwd=paths.ops_bedrock_dir, env=docker_env)
+    wait_up(26650)
+
     # Optionally bring up op-challenger.
     if DEVNET_FPAC:
         log.info('Bringing up `op-challenger`.')
@@ -320,10 +324,11 @@ def run_command_preset(command: CommandPreset):
     return proc.returncode
 
 
-def run_command(args, check=True, shell=False, cwd=None, env=None, timeout=None):
+def run_command(args, check=True, shell=False, cwd=None, env=None, timeout=None, capture_output=False):
     env = env if env else {}
     return subprocess.run(
         args,
+        capture_output=capture_output,
         check=check,
         shell=shell,
         env={
diff --git a/docs/op-stack/src/assets/docs/understand/Celestia-logo-color-color.svg b/docs/op-stack/src/assets/docs/understand/Celestia-logo-color-color.svg
new file mode 100644
index 000000000000..6d22cb408925
--- /dev/null
+++ b/docs/op-stack/src/assets/docs/understand/Celestia-logo-color-color.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1133.86 566.93"><defs><style>.cls-1{fill:#7b2bf9;}</style></defs><title>Celestia-logo-color-black</title><path class="cls-1" d="M1001.84,311.23l-33.18-57.55a5.81,5.81,0,0,0-9.94,0l-33.18,57.55a5.22,5.22,0,0,0-.65,2.28,5.84,5.84,0,0,0,5.57,6.23c2.27.05,4-1.09,5.41-3.53l5.13-8.92a3.75,3.75,0,0,1,3.26-1.89H983a3.76,3.76,0,0,1,3.26,1.89l5.13,8.92c1.29,2.31,3,3.46,5.14,3.53a5.78,5.78,0,0,0,6-5.73A6.53,6.53,0,0,0,1001.84,311.23Zm-27.67-17.3h-21a2.57,2.57,0,0,1-2.22-3.85l10.55-18.21a2.57,2.57,0,0,1,4.45,0l10.48,18.21A2.57,2.57,0,0,1,974.17,293.93ZM351.33,260.34a111.21,111.21,0,0,0-187.41-55.5,112.39,112.39,0,0,0-13.61,16.48,39.44,39.44,0,0,0-3.18,5,111.23,111.23,0,1,0,197.24,102,41,41,0,0,0,1.76-4.23,112.28,112.28,0,0,0,5.26-63.41Zm-38.57-50.85c.64.61,1.27,1.23,1.9,1.86a101.71,101.71,0,0,1,22.46,33.82,1.72,1.72,0,0,1-1.9,2.34,51,51,0,0,0-9.87-.7,5.14,5.14,0,0,1-5.17-4.22,149.64,149.64,0,0,0-8.54-30.36l-.63-1.51A1.09,1.09,0,0,1,312.76,209.49Zm10.57,65.24a1.19,1.19,0,0,1,2.15-.72c.84,1.17,1.64,2.35,2.41,3.53q1.53,2.35,2.85,4.68a2.55,2.55,0,0,1-.33,3q-1.79,2-3.88,4.06L325,290.82a1,1,0,0,1-1.73-.77c.07-1.67.11-3.35.14-5C323.44,281.56,323.42,278.13,323.33,274.73Zm-140-74.33a101.2,101.2,0,0,1,59.2-18.92,102.81,102.81,0,0,1,16.79,1.37,1.71,1.71,0,0,1,.79,3c-5.32,4.18-10.27,10.36-14.65,18.37a4.78,4.78,0,0,1-5.48,2.31A138.45,138.45,0,0,0,198,201a95.53,95.53,0,0,0-13.81,1.46A1.15,1.15,0,0,1,183.34,200.4ZM168.77,352.74c-2.14-4.05.63-13.42,14.71-27.66h0a3.51,3.51,0,0,0-.31-5.22l-1.68-1.34a3.51,3.51,0,0,0-4.7.25l-.55.55c-7,7.22-12,13.91-14.72,19.92a2.4,2.4,0,0,1-4.18.33,101.29,101.29,0,0,1-16.79-56.11,102.4,102.4,0,0,1,2.22-21.28,1,1,0,0,1,2-.09,84.89,84.89,0,0,0,10.31,21.52,135.18,135.18,0,0,0,24.87,28h0c3.42,3,7,5.83,10.79,8.59a190.45,190.45,0,0,0,24.74,15.35c3.91,2,7.72,4,11.62,5.72a8.83,8.83,0,0,0,6.86.19q2.76-1.08,5.55-2.25a4.43,4.43,0,0,0,2.59-5.18c-.07-.27-.12-.48-.15-.61a197.93,197.93,0,0,1-5-42.71h0v-.55c0-.83,0-1.67,0-2.5,0-.26,0-.71,0-1v-.32h0c0-.95,0-1.9,0-2.86,0-2.61.14-5.21.28-7.78h0c1-18.39,4.07-35.67,9-50.2a2.58,2.58,0,0,0-1.6-3.27c-1.32-.44-2.63-.87-3.93-1.28a2.56,2.56,0,0,0-3.19,1.61c-5.37,15.78-8.69,34.51-9.58,54.33a7.45,7.45,0,0,1-3.64,6.08,280.38,280.38,0,0,0-31.83,21.77,5.16,5.16,0,0,1-6.59-.14,125.59,125.59,0,0,1-23.12-26c-11.67-17.92-14.45-34.8-7.81-47.52l.05-.09c.85-1.41,1.73-2.79,2.64-4.16,7.63-10.09,21.82-15.94,40.64-16.6q1.78-.06,3.6-.06a132.8,132.8,0,0,1,36.54,5.54h0l.83.25.64.18h0q4.37,1.31,8.75,2.88h0l.21.07,2.28.85.72.27.69.26h0a183.63,183.63,0,0,1,18.38,8.3,176.31,176.31,0,0,1,31.87,21.12c-17.87,4.09-38.63,12-59.52,22.64a3,3,0,0,0-1.65,2.54c-.08,1.29-.17,3.89-.24,6a1.69,1.69,0,0,0,2.48,1.55h0c20.67-10.86,41.31-19,59-23.26a6.63,6.63,0,0,0,5-7.36q-.49-3.54-1.1-7a11.59,11.59,0,0,0-4.39-7.18,188,188,0,0,0-27.24-17.21,193.46,193.46,0,0,0-20-9,2.51,2.51,0,0,1-1.3-3.58c6.91-12.37,15.13-19.29,23.14-19.29h.25c9.45.17,18.87,10,25.84,27A141.36,141.36,0,0,1,311.27,245l0,0c.8,4.6,1.44,9.35,1.92,14.22l-.13.08.17.17a222.27,222.27,0,0,1,1,25.39c-.1,5.5-.39,10.92-.86,16.23a288.35,288.35,0,0,1-45.45,29.48c-5.64,3-11.29,5.77-16.87,8.34l-.26.12-1.29.58h0q-6.94,3.15-13.72,5.8h0l-.76.29-1,.37-2.26.86-.62.23-2.73,1-.33.13h0a186.82,186.82,0,0,1-27.27,7.66C180.5,359.84,171,356.84,168.77,352.74Zm27.95-39.59a265.3,265.3,0,0,1,31.07-21.53,209.59,209.59,0,0,0,4.73,41.77q-6.42-2.75-12.79-6A180.46,180.46,0,0,1,196.72,313.15Zm59,71.46a102.54,102.54,0,0,1-13.16.84,101.23,101.23,0,0,1-55.06-16.1,1.37,1.37,0,0,1,.68-2.52l.77,0A109.58,109.58,0,0,0,202.51,365a207.44,207.44,0,0,0,34.25-10.11,2.16,2.16,0,0,1,2.75,1.21v0c4.72,11.48,10.52,20.15,17,25.67A1.63,1.63,0,0,1,255.7,384.61Zm43.12-27.23c-7.29,14.32-16.25,22.36-24.94,22.2-9.45-.17-18.87-10-25.85-27v0a2.15,2.15,0,0,1,1.14-2.78l.22-.09a2.13,2.13,0,0,1,1.45-.1,141.68,141.68,0,0,0,38,5.57c1.31,0,2.61,0,3.89-.07,1.51-.05,3-.13,4.46-.25A1.74,1.74,0,0,1,298.82,357.38ZM302,345.06a86.79,86.79,0,0,1-9.59.85,120.11,120.11,0,0,1-25.69-2.05,1.15,1.15,0,0,1-.3-2.16c1.93-1,3.87-2,5.8-3a316,316,0,0,0,37.35-23.13,1.15,1.15,0,0,1,1.81,1.12A165.39,165.39,0,0,1,305,342.53,3.76,3.76,0,0,1,302,345.06ZM317,353.15c-.77.82-1.55,1.63-2.35,2.43q-2.09,2.09-4.27,4a1.13,1.13,0,0,1-1.78-1.32l.44-1q.92-2,1.77-4.14a1.17,1.17,0,0,1,.77-.67c1.45-.36,2.86-.77,4.23-1.21A1.13,1.13,0,0,1,317,353.15Zm20.5-32.35c-.49,1.25-1,2.48-1.55,3.71-.08.17-.16.34-.25.51-3.36,6.47-9,11.57-16.54,15.12a2.18,2.18,0,0,1-3-2.56,193.5,193.5,0,0,0,5.62-28.87,7.68,7.68,0,0,1,2.62-4.89c3.1-2.69,6-5.37,8.66-8l0,0a2.45,2.45,0,0,1,4.08,1C339.77,305.54,339.92,313.69,337.51,320.8Zm2-47.78a2.08,2.08,0,0,1-3.56.11l-.39-.61a120.25,120.25,0,0,0-10.45-13.72,1.7,1.7,0,0,1,1.28-2.81h0c9.14,0,13.93,2.26,15.39,5C343.07,263.31,342.7,267.34,339.55,273Zm4.93,13.48a.64.64,0,0,1-1.23.23c-.11-.27-.23-.55-.35-.82a1.53,1.53,0,0,1,.17-1.53l.37-.49c.45-.58,1.09-.49,1.09.15C344.53,284.89,344.51,285.63,344.48,286.5Zm323.64-24.12h38.34a5.75,5.75,0,0,0,5.69-6.44,5.84,5.84,0,0,0-5.84-5H658.65a5.75,5.75,0,0,0-5.73,5.73V314a5.75,5.75,0,0,0,5.73,5.73h47.81a5.75,5.75,0,0,0,5.69-6.43,5.84,5.84,0,0,0-5.84-5H668.12a3.73,3.73,0,0,1-3.73-3.73v-9.75a3.73,3.73,0,0,1,3.73-3.73H696.9a5.75,5.75,0,0,0,5.69-6.43,5.84,5.84,0,0,0-5.84-5H668.12a3.73,3.73,0,0,1-3.73-3.73v-9.75A3.73,3.73,0,0,1,668.12,262.38Zm117.19,22.28c-5.26-3.35-12.34-5.07-21.23-5.07-11.76,0-17.69-2.87-17.69-8.61s5.93-8.6,17.69-8.6A49.39,49.39,0,0,1,782.72,266c3.45,1.05,5.84-.19,7.17-3.54,1.15-3-.38-5.83-3.53-7.26a55.1,55.1,0,0,0-22.28-4.3c-8.7,0-15.68,1.81-21.13,5.35a16.8,16.8,0,0,0-8,14.72c0,6.6,2.68,11.67,7.94,15s12.33,5.07,21.22,5.07c11.76,0,17.69,2.87,17.69,8.61s-5.93,8.6-17.69,8.6h-2.87a53.2,53.2,0,0,1-18.55-3.63,5.59,5.59,0,0,0-7.26,3.44,5.86,5.86,0,0,0,3.54,7.46,56.75,56.75,0,0,0,22.27,4.2h2.87c8.7,0,15.68-1.81,21-5.35a16.68,16.68,0,0,0,8.13-14.72C793.24,293.07,790.56,288,785.31,284.66Zm114.78-33.75a5.75,5.75,0,0,0-5.74,5.73V314a5.74,5.74,0,0,0,11.47,0V256.64A5.75,5.75,0,0,0,900.09,250.91Zm-30.32,0H812.56a5.74,5.74,0,0,0-5.69,6.43,5.82,5.82,0,0,0,5.84,5h19.06a3.74,3.74,0,0,1,3.74,3.74V314a5.75,5.75,0,0,0,6.43,5.69,5.84,5.84,0,0,0,5-5.85V266.12a3.73,3.73,0,0,1,3.74-3.74h19.2a5.76,5.76,0,0,0,5.7-6.44A5.84,5.84,0,0,0,869.77,250.91ZM628.39,308.27H590.22a3.75,3.75,0,0,1-3.75-3.74V256.79a5.84,5.84,0,0,0-5-5.84,5.75,5.75,0,0,0-6.44,5.69V314a5.75,5.75,0,0,0,5.74,5.73h47.8a5.74,5.74,0,0,0,5.69-6.43A5.82,5.82,0,0,0,628.39,308.27ZM441.46,262.38a21.69,21.69,0,0,1,16.15,6.79,5.82,5.82,0,0,0,9.85-4.11,6.06,6.06,0,0,0-2.39-4.59,34.33,34.33,0,1,0,.67,49.23,5.75,5.75,0,0,0-8.13-8.12,21.93,21.93,0,0,1-16.15,6.69,22.84,22.84,0,0,1-22.95-22.95,21.93,21.93,0,0,1,6.69-16.15A22.25,22.25,0,0,1,441.46,262.38Zm66,0h38.33a5.76,5.76,0,0,0,5.7-6.44,5.84,5.84,0,0,0-5.85-5H497.94a5.76,5.76,0,0,0-5.74,5.73V314a5.76,5.76,0,0,0,5.74,5.73h47.8a5.75,5.75,0,0,0,5.7-6.43,5.84,5.84,0,0,0-5.85-5H507.41a3.73,3.73,0,0,1-3.73-3.74V294.8a3.73,3.73,0,0,1,3.73-3.74h28.77a5.75,5.75,0,0,0,5.7-6.43,5.84,5.84,0,0,0-5.85-5H507.41a3.73,3.73,0,0,1-3.73-3.74v-9.73A3.73,3.73,0,0,1,507.41,262.38Z"/></svg>
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 6f485a6392ef..f1cffa5dca1b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ethereum-optimism/optimism
 
-go 1.21
+go 1.21.1
 
 require (
 	github.com/BurntSushi/toml v1.3.2
@@ -41,6 +41,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/profile v1.7.0
 	github.com/prometheus/client_golang v1.18.0
+	github.com/rollkit/go-da v0.2.0
 	github.com/stretchr/testify v1.8.4
 	github.com/urfave/cli/v2 v2.27.1
 	golang.org/x/crypto v0.19.0
@@ -48,6 +49,7 @@ require (
 	golang.org/x/sync v0.6.0
 	golang.org/x/term v0.17.0
 	golang.org/x/time v0.5.0
+	google.golang.org/grpc v1.60.1
 	gorm.io/driver/postgres v1.5.6
 	gorm.io/gorm v1.25.7
 )
@@ -210,6 +212,7 @@ require (
 	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.16.1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index 14b28331d916..897b0ca216ad 100644
--- a/go.sum
+++ b/go.sum
@@ -688,6 +688,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/rollkit/go-da v0.2.0 h1:rNpWBa2inczgZ955ky3wy8FbrMajzVbm0UfbBGzm5UE=
+github.com/rollkit/go-da v0.2.0/go.mod h1:Kef0XI5ecEKd3TXzI8S+9knAUJnZg0svh2DuXoCsPlM=
 github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=
 github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
@@ -1018,10 +1020,14 @@ google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoA
 google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
 google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 h1:6GQBEOdGkX6MMTLT9V+TjtIRZCw9VPD5Z+yHY9wMgS0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
+google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
diff --git a/op-batcher/batcher/config.go b/op-batcher/batcher/config.go
index b418f34af203..0cfb44b32927 100644
--- a/op-batcher/batcher/config.go
+++ b/op-batcher/batcher/config.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-batcher/compressor"
 	"github.com/ethereum-optimism/optimism/op-batcher/flags"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	plasma "github.com/ethereum-optimism/optimism/op-plasma"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
@@ -72,6 +73,7 @@ type CLIConfig struct {
 	CompressorConfig compressor.CLIConfig
 	RPC              oprpc.CLIConfig
 	PlasmaDA         plasma.CLIConfig
+	DaConfig         celestia.CLIConfig
 }
 
 func (c *CLIConfig) Check() error {
@@ -111,6 +113,12 @@ func (c *CLIConfig) Check() error {
 	if err := c.RPC.Check(); err != nil {
 		return err
 	}
+	if err := c.DaConfig.Check(); err != nil {
+		return err
+	}
+	if err := c.PlasmaDA.Check(); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -139,5 +147,6 @@ func NewConfig(ctx *cli.Context) *CLIConfig {
 		CompressorConfig:             compressor.ReadCLIConfig(ctx),
 		RPC:                          oprpc.ReadCLIConfig(ctx),
 		PlasmaDA:                     plasma.ReadCLIConfig(ctx),
+		DaConfig:                     celestia.ReadCLIConfig(ctx),
 	}
 }
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 2c83019fcf48..e2b2b8bfa8d4 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -15,6 +15,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-batcher/metrics"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	plasma "github.com/ethereum-optimism/optimism/op-plasma"
@@ -47,7 +48,8 @@ type DriverSetup struct {
 	L1Client         L1Client
 	EndpointProvider dial.L2EndpointProvider
 	ChannelConfig    ChannelConfig
-	PlasmaDA         *plasma.DAClient
+	PlasmaDA         plasma.DAStorage
+	DAClient         *celestia.DAClient
 }
 
 // BatchSubmitter encapsulates a service responsible for submitting L2 tx
diff --git a/op-batcher/batcher/service.go b/op-batcher/batcher/service.go
index c5a5cd0c3096..704b377fd61d 100644
--- a/op-batcher/batcher/service.go
+++ b/op-batcher/batcher/service.go
@@ -16,6 +16,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-batcher/flags"
 	"github.com/ethereum-optimism/optimism/op-batcher/metrics"
 	"github.com/ethereum-optimism/optimism/op-batcher/rpc"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	plasma "github.com/ethereum-optimism/optimism/op-plasma"
@@ -52,7 +53,7 @@ type BatcherService struct {
 	L1Client         *ethclient.Client
 	EndpointProvider dial.L2EndpointProvider
 	TxManager        txmgr.TxManager
-	PlasmaDA         *plasma.DAClient
+	PlasmaDA         plasma.DAStorage
 
 	BatcherConfig
 
@@ -73,6 +74,7 @@ type BatcherService struct {
 	stopped         atomic.Bool
 
 	NotSubmittingOnStart bool
+	DAClient             *celestia.DAClient
 }
 
 // BatcherServiceFromCLIConfig creates a new BatcherService from a CLIConfig.
@@ -119,6 +121,9 @@ func (bs *BatcherService) initFromCLIConfig(ctx context.Context, version string,
 	if err := bs.initPlasmaDA(cfg); err != nil {
 		return fmt.Errorf("failed to init plasma DA: %w", err)
 	}
+	if err := bs.initDA(cfg); err != nil {
+		return fmt.Errorf("failed to start da server: %w", err)
+	}
 	bs.initDriver()
 	if err := bs.initRPCServer(cfg); err != nil {
 		return fmt.Errorf("failed to start RPC server: %w", err)
@@ -283,6 +288,7 @@ func (bs *BatcherService) initDriver() {
 		EndpointProvider: bs.EndpointProvider,
 		ChannelConfig:    bs.ChannelConfig,
 		PlasmaDA:         bs.PlasmaDA,
+		DAClient:         bs.DAClient,
 	})
 }
 
@@ -316,6 +322,12 @@ func (bs *BatcherService) initPlasmaDA(cfg *CLIConfig) error {
 	return nil
 }
 
+func (bs *BatcherService) initDA(cfg *CLIConfig) error {
+	client := celestia.NewDAClient(cfg.DaConfig.DaRpc, false)
+	bs.DAClient = client
+	return nil
+}
+
 // Start runs once upon start of the batcher lifecycle,
 // and starts batch-submission work if the batcher is configured to start submit data on startup.
 func (bs *BatcherService) Start(_ context.Context) error {
diff --git a/op-batcher/flags/flags.go b/op-batcher/flags/flags.go
index 1096323181c6..73192b95d8b8 100644
--- a/op-batcher/flags/flags.go
+++ b/op-batcher/flags/flags.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-batcher/compressor"
 	plasma "github.com/ethereum-optimism/optimism/op-plasma"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	opservice "github.com/ethereum-optimism/optimism/op-service"
 	openum "github.com/ethereum-optimism/optimism/op-service/enum"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
@@ -40,7 +41,6 @@ var (
 		Usage:   "HTTP provider URL for Rollup node. A comma-separated list enables the active L2 endpoint provider. Such a list needs to match the number of l2-eth-rpcs provided.",
 		EnvVars: prefixEnvVars("ROLLUP_RPC"),
 	}
-	// Optional flags
 	SubSafetyMarginFlag = &cli.Uint64Flag{
 		Name: "sub-safety-margin",
 		Usage: "The batcher tx submission safety margin (in #L1-blocks) to subtract " +
@@ -131,6 +131,7 @@ func init() {
 	optionalFlags = append(optionalFlags, txmgr.CLIFlags(EnvVarPrefix)...)
 	optionalFlags = append(optionalFlags, compressor.CLIFlags(EnvVarPrefix)...)
 	optionalFlags = append(optionalFlags, plasma.CLIFlags(EnvVarPrefix, "")...)
+	optionalFlags = append(optionalFlags, celestia.CLIFlags(EnvVarPrefix)...)
 
 	Flags = append(requiredFlags, optionalFlags...)
 }
diff --git a/op-celestia/cli.go b/op-celestia/cli.go
new file mode 100644
index 000000000000..8820792cab82
--- /dev/null
+++ b/op-celestia/cli.go
@@ -0,0 +1,94 @@
+package celestia
+
+import (
+	"errors"
+	"fmt"
+	"net"
+
+	"github.com/urfave/cli/v2"
+
+	opservice "github.com/ethereum-optimism/optimism/op-service"
+)
+
+const (
+	DaRpcFlagName = "da.rpc"
+)
+
+var (
+	defaultDaRpc = "da:26650"
+
+	ErrInvalidPort = errors.New("invalid port")
+)
+
+func Check(address string) error {
+	_, port, err := net.SplitHostPort(address)
+	if err != nil {
+		return err
+	}
+
+	if port == "" {
+		return ErrInvalidPort
+	}
+
+	_, err = net.LookupPort("tcp", port)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func CLIFlags(envPrefix string) []cli.Flag {
+	return []cli.Flag{
+		&cli.StringFlag{
+			Name:    DaRpcFlagName,
+			Usage:   "dial address of data availability grpc client",
+			Value:   defaultDaRpc,
+			EnvVars: opservice.PrefixEnvVar(envPrefix, "DA_RPC"),
+		},
+	}
+}
+
+type Config struct {
+	DaRpc string
+}
+
+func (c Config) Check() error {
+	if c.DaRpc == "" {
+		c.DaRpc = defaultDaRpc
+	}
+
+	if err := Check(c.DaRpc); err != nil {
+		return fmt.Errorf("invalid da rpc: %w", err)
+	}
+
+	return nil
+}
+
+type CLIConfig struct {
+	DaRpc string
+}
+
+func (c CLIConfig) Check() error {
+	if c.DaRpc == "" {
+		c.DaRpc = defaultDaRpc
+	}
+
+	if err := Check(c.DaRpc); err != nil {
+		return fmt.Errorf("invalid da rpc: %w", err)
+	}
+
+	return nil
+}
+
+func NewCLIConfig() CLIConfig {
+	return CLIConfig{
+		DaRpc: defaultDaRpc,
+	}
+}
+
+func ReadCLIConfig(ctx *cli.Context) CLIConfig {
+	return CLIConfig{
+		DaRpc: ctx.String(DaRpcFlagName),
+	}
+}
diff --git a/op-celestia/da.go b/op-celestia/da.go
new file mode 100644
index 000000000000..feecb3a82fad
--- /dev/null
+++ b/op-celestia/da.go
@@ -0,0 +1,10 @@
+package celestia
+
+// DerivationVersionCelestia is a byte marker for celestia references submitted
+// to the batch inbox address as calldata.
+// Mnemonic 0xce = celestia
+// version 0xce references are encoded as:
+// [8]byte block height ++ [32]byte commitment
+// in little-endian encoding.
+// see: https://github.com/rollkit/celestia-da/blob/1f2df375fd2fcc59e425a50f7eb950daa5382ef0/celestia.go#L141-L160
+const DerivationVersionCelestia = 0xce
diff --git a/op-celestia/daclient.go b/op-celestia/daclient.go
new file mode 100644
index 000000000000..c95c454626cd
--- /dev/null
+++ b/op-celestia/daclient.go
@@ -0,0 +1,59 @@
+package celestia
+
+import (
+	"context"
+	"encoding/hex"
+	"fmt"
+	"time"
+
+	"github.com/ethereum/go-ethereum/log"
+	goDA "github.com/rollkit/go-da"
+	"github.com/rollkit/go-da/proxy"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+)
+
+// DAClient implements DAStorage with celestia backend
+type DAClient struct {
+	Log        log.Logger
+	DA         goDA.DA
+	GetTimeout time.Duration
+	Verify     bool
+}
+
+// NewDAClient returns a celestia DA client.
+func NewDAClient(rpc string, verify bool) *DAClient {
+	client := proxy.NewClient()
+	client.Start(rpc, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	return &DAClient{
+		Log:        log.New(),
+		DA:         client,
+		GetTimeout: time.Minute,
+		Verify:     verify,
+	}
+}
+
+func (c *DAClient) GetInput(ctx context.Context, key []byte) ([]byte, error) {
+	log.Info("celestia: blob request", "id", hex.EncodeToString(key))
+	ctx, cancel := context.WithTimeout(context.Background(), c.GetTimeout)
+	blobs, err := c.DA.Get(ctx, [][]byte{key[1:]})
+	cancel()
+	if err != nil || len(blobs) == 0 {
+		return nil, fmt.Errorf("celestia: failed to resolve frame: %w", err)
+	}
+	if len(blobs) != 1 {
+		c.Log.Warn("celestia: unexpected length for blobs", "expected", 1, "got", len(blobs))
+	}
+	// TODO: verify
+	return blobs[0], nil
+}
+
+func (c *DAClient) SetInput(ctx context.Context, data []byte) ([]byte, error) {
+	ids, _, err := c.DA.Submit(ctx, [][]byte{data}, -1)
+	if err == nil && len(ids) == 1 {
+		c.Log.Info("celestia: blob successfully submitted", "id", hex.EncodeToString(ids[0]))
+		key := append([]byte{DerivationVersionCelestia}, ids[0]...)
+		return key, nil
+	}
+	return nil, err
+}
diff --git a/op-celestia/daclient_test.go b/op-celestia/daclient_test.go
new file mode 100644
index 000000000000..e504d2397986
--- /dev/null
+++ b/op-celestia/daclient_test.go
@@ -0,0 +1,103 @@
+package celestia_test
+
+import (
+	"context"
+	"crypto/rand"
+	"fmt"
+	"net"
+	"os"
+	"strconv"
+	"testing"
+	"time"
+
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
+	plasma "github.com/ethereum-optimism/optimism/op-plasma"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc"
+
+	"google.golang.org/grpc/credentials/insecure"
+
+	"github.com/rollkit/go-da/proxy"
+	goDATest "github.com/rollkit/go-da/test"
+)
+
+func TestMain(m *testing.M) {
+	srv := startMockGRPCServ()
+	if srv == nil {
+		os.Exit(1)
+	}
+	exitCode := m.Run()
+
+	// teardown servers
+	srv.GracefulStop()
+
+	os.Exit(exitCode)
+}
+
+func TestCelestia(t *testing.T) {
+	dummyClient := &celestia.DAClient{DA: goDATest.NewDummyDA(), GetTimeout: time.Minute, Log: log.New()}
+	grpcClient, err := startMockGRPCClient()
+	require.NoError(t, err)
+	clients := map[string]*celestia.DAClient{
+		"dummy": dummyClient,
+		"grpc":  grpcClient,
+	}
+	tests := []struct {
+		name string
+		f    func(t *testing.T, da plasma.DAStorage)
+	}{
+		{"roundtrip", doTestRoundTrip},
+		{"missing", doTestMissing},
+	}
+	for name, dalc := range clients {
+		for _, tc := range tests {
+			t.Run(name+"_"+tc.name, func(t *testing.T) {
+				tc.f(t, dalc)
+			})
+		}
+	}
+}
+
+func getRandomBytes(size int) []byte {
+	data := make([]byte, size)
+	_, _ = rand.Read(data) //nolint:gosec,staticcheck
+	return data
+}
+
+func doTestRoundTrip(t *testing.T, da plasma.DAStorage) {
+	img := getRandomBytes(256)
+	key, err := da.SetInput(context.TODO(), img)
+	require.NoError(t, err)
+	got, err := da.GetInput(context.TODO(), key)
+	require.NoError(t, err)
+	require.Equal(t, img, got)
+}
+
+func doTestMissing(t *testing.T, da plasma.DAStorage) {
+	key := getRandomBytes(32)
+	_, err := da.GetInput(context.TODO(), key)
+	require.Error(t, err)
+}
+
+func startMockGRPCServ() *grpc.Server {
+	srv := proxy.NewServer(goDATest.NewDummyDA(), grpc.Creds(insecure.NewCredentials()))
+	lis, err := net.Listen("tcp", "127.0.0.1"+":"+strconv.Itoa(7980))
+	if err != nil {
+		fmt.Println(err)
+		return nil
+	}
+	go func() {
+		_ = srv.Serve(lis)
+	}()
+	return srv
+}
+
+func startMockGRPCClient() (*celestia.DAClient, error) {
+	client := proxy.NewClient()
+	err := client.Start("127.0.0.1:7980", grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if err != nil {
+		return nil, err
+	}
+	return &celestia.DAClient{DA: client, GetTimeout: time.Minute, Log: log.New()}, nil
+}
diff --git a/op-chain-ops/genesis/config.go b/op-chain-ops/genesis/config.go
index 305fea0f5883..5778ab417d54 100644
--- a/op-chain-ops/genesis/config.go
+++ b/op-chain-ops/genesis/config.go
@@ -243,6 +243,8 @@ type DeployConfig struct {
 
 	// When Cancun activates. Relative to L1 genesis.
 	L1CancunTimeOffset *hexutil.Uint64 `json:"l1CancunTimeOffset,omitempty"`
+
+	DAChallengeAddress common.Address `json:"daChallengeAddress,omitempty"`
 }
 
 // Copy will deeply copy the DeployConfig. This does a JSON roundtrip to copy
@@ -565,6 +567,7 @@ func (d *DeployConfig) RollupConfig(l1StartBlock *types.Block, l2GenesisBlockHas
 		EcotoneTime:            d.EcotoneTime(l1StartBlock.Time()),
 		FjordTime:              d.FjordTime(l1StartBlock.Time()),
 		InteropTime:            d.InteropTime(l1StartBlock.Time()),
+		DAChallengeAddress:     d.DAChallengeAddress,
 	}, nil
 }
 
diff --git a/op-chain-ops/genesis/testdata/test-deploy-config-full.json b/op-chain-ops/genesis/testdata/test-deploy-config-full.json
index 1572c182b58e..b4564643e7ba 100644
--- a/op-chain-ops/genesis/testdata/test-deploy-config-full.json
+++ b/op-chain-ops/genesis/testdata/test-deploy-config-full.json
@@ -80,5 +80,6 @@
   "proofMaturityDelaySeconds": 12,
   "disputeGameFinalityDelaySeconds": 6,
   "respectedGameType": 0,
-  "useFaultProofs": false
+  "useFaultProofs": false,
+  "daChallengeAddress": "0xff00000000000000000000000000000000000905"
 }
diff --git a/op-e2e/sequencer_failover_setup.go b/op-e2e/sequencer_failover_setup.go
index 9ef01a20ab55..714607b6e095 100644
--- a/op-e2e/sequencer_failover_setup.go
+++ b/op-e2e/sequencer_failover_setup.go
@@ -25,6 +25,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
+	plasma "github.com/ethereum-optimism/optimism/op-plasma"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
@@ -243,6 +244,7 @@ func setupBatcher(t *testing.T, sys *System, conductors map[string]*conductor) {
 		BatchType:                    derive.SpanBatchType,
 		DataAvailabilityType:         batcherFlags.CalldataType,
 		ActiveSequencerCheckDuration: 0,
+		PlasmaDA:                     plasma.CLIConfig{Enabled: true, DAServerURL: "localhost:26650", DABackend: "celestia"},
 	}
 
 	batcher, err := bss.BatcherServiceFromCLIConfig(context.Background(), "0.0.1", batcherCLIConfig, sys.Cfg.Loggers["batcher"])
@@ -298,6 +300,7 @@ func sequencerCfg(rpcPort int) *rollupNode.Config {
 		ConductorEnabled:            true,
 		ConductorRpc:                fmt.Sprintf("http://%s:%d", localhost, rpcPort),
 		ConductorRpcTimeout:         1 * time.Second,
+		Plasma:                      plasma.CLIConfig{Enabled: true, DAServerURL: "localhost:26650", DABackend: "celestia"},
 	}
 }
 
diff --git a/op-e2e/setup.go b/op-e2e/setup.go
index 168aa5e1c9b9..4a24ca573ada 100644
--- a/op-e2e/setup.go
+++ b/op-e2e/setup.go
@@ -17,6 +17,7 @@ import (
 	"time"
 
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/batcher"
+	plasma "github.com/ethereum-optimism/optimism/op-plasma"
 	ds "github.com/ipfs/go-datastore"
 	dsSync "github.com/ipfs/go-datastore/sync"
 	ic "github.com/libp2p/go-libp2p/core/crypto"
@@ -42,6 +43,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-batcher/compressor"
 	batcherFlags "github.com/ethereum-optimism/optimism/op-batcher/flags"
 	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	"github.com/ethereum-optimism/optimism/op-e2e/config"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
@@ -133,6 +135,8 @@ func DefaultSystemConfig(t *testing.T) SystemConfig {
 				RuntimeConfigReloadInterval: time.Minute * 10,
 				ConfigPersistence:           &rollupNode.DisabledConfigPersistence{},
 				Sync:                        sync.Config{SyncMode: sync.CLSync},
+				DaConfig:                    celestia.Config{DaRpc: "localhost:26650"},
+				Plasma:                      plasma.CLIConfig{Enabled: true, DAServerURL: "localhost:26650", DABackend: "celestia"},
 			},
 			"verifier": {
 				Driver: driver.Config{
@@ -144,6 +148,8 @@ func DefaultSystemConfig(t *testing.T) SystemConfig {
 				RuntimeConfigReloadInterval: time.Minute * 10,
 				ConfigPersistence:           &rollupNode.DisabledConfigPersistence{},
 				Sync:                        sync.Config{SyncMode: sync.CLSync},
+				DaConfig:                    celestia.Config{DaRpc: "localhost:26650"},
+				Plasma:                      plasma.CLIConfig{Enabled: true, DAServerURL: "localhost:26650", DABackend: "celestia"},
 			},
 		},
 		Loggers: map[string]log.Logger{
@@ -512,6 +518,7 @@ func (cfg SystemConfig) Start(t *testing.T, _opts ...SystemConfigOption) (*Syste
 			FjordTime:               cfg.DeployConfig.FjordTime(uint64(cfg.DeployConfig.L1GenesisBlockTimestamp)),
 			InteropTime:             cfg.DeployConfig.InteropTime(uint64(cfg.DeployConfig.L1GenesisBlockTimestamp)),
 			ProtocolVersionsAddress: cfg.L1Deployments.ProtocolVersionsProxy,
+			DAChallengeAddress:      cfg.DeployConfig.DAChallengeAddress,
 		}
 	}
 	defaultConfig := makeRollupConfig()
@@ -704,7 +711,8 @@ func (cfg SystemConfig) Start(t *testing.T, _opts ...SystemConfigOption) (*Syste
 				l.Warn("closed op-node!")
 			}()
 		}
-		node, err := rollupNode.New(context.Background(), &c, l, snapLog, "", metrics.NewMetrics(""))
+
+		node, err := rollupNode.New(context.Background(), &c, cfg.Loggers[name], snapLog, "", metrics.NewMetrics(""))
 		if err != nil {
 			return nil, err
 		}
@@ -816,6 +824,8 @@ func (cfg SystemConfig) Start(t *testing.T, _opts ...SystemConfigOption) (*Syste
 		Stopped:              sys.Cfg.DisableBatcher, // Batch submitter may be enabled later
 		BatchType:            batchType,
 		DataAvailabilityType: sys.Cfg.DataAvailabilityType,
+		DaConfig:             celestia.CLIConfig{DaRpc: "localhost:26650"},
+		PlasmaDA:             plasma.CLIConfig{Enabled: true, DAServerURL: "localhost:26650", DABackend: "celestia"},
 	}
 	// Batch Submitter
 	batcher, err := bss.BatcherServiceFromCLIConfig(context.Background(), "0.0.1", batcherCLIConfig, sys.Cfg.Loggers["batcher"])
diff --git a/op-node/flags/flags.go b/op-node/flags/flags.go
index 092d3c8d57ca..d1b5cd9e2335 100644
--- a/op-node/flags/flags.go
+++ b/op-node/flags/flags.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
 	plasma "github.com/ethereum-optimism/optimism/op-plasma"
 	openum "github.com/ethereum-optimism/optimism/op-service/enum"
@@ -414,6 +415,7 @@ func init() {
 	optionalFlags = append(optionalFlags, DeprecatedFlags...)
 	optionalFlags = append(optionalFlags, opflags.CLIFlags(EnvVarPrefix, RollupCategory)...)
 	optionalFlags = append(optionalFlags, plasma.CLIFlags(EnvVarPrefix, PlasmaCategory)...)
+	optionalFlags = append(optionalFlags, celestia.CLIFlags(EnvVarPrefix)...)
 	Flags = append(requiredFlags, optionalFlags...)
 }
 
diff --git a/op-node/node/config.go b/op-node/node/config.go
index dd5df8efa068..cf6109e2524c 100644
--- a/op-node/node/config.go
+++ b/op-node/node/config.go
@@ -7,6 +7,7 @@ import (
 	"math"
 	"time"
 
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/flags"
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -73,6 +74,8 @@ type Config struct {
 
 	// Plasma DA config
 	Plasma plasma.CLIConfig
+
+	DaConfig celestia.Config
 }
 
 type RPCConfig struct {
@@ -171,5 +174,8 @@ func (cfg *Config) Check() error {
 	if err := cfg.Plasma.Check(); err != nil {
 		return fmt.Errorf("plasma config error: %w", err)
 	}
+	if err := cfg.DaConfig.Check(); err != nil {
+		return fmt.Errorf("da config error: %w", err)
+	}
 	return nil
 }
diff --git a/op-node/node/node.go b/op-node/node/node.go
index a4d589993323..97e3b7c46b56 100644
--- a/op-node/node/node.go
+++ b/op-node/node/node.go
@@ -117,6 +117,9 @@ func (n *OpNode) init(ctx context.Context, cfg *Config, snapshotLog log.Logger)
 	if err := n.initL1BeaconAPI(ctx, cfg); err != nil {
 		return err
 	}
+	if err := n.initDA(ctx, cfg); err != nil {
+		return fmt.Errorf("failed to init da: %w", err)
+	}
 	if err := n.initL2(ctx, cfg, snapshotLog); err != nil {
 		return fmt.Errorf("failed to init L2: %w", err)
 	}
@@ -353,6 +356,10 @@ func (n *OpNode) initL1BeaconAPI(ctx context.Context, cfg *Config) error {
 	}
 }
 
+func (n *OpNode) initDA(ctx context.Context, cfg *Config) error {
+	return driver.SetDAClient(cfg.DaConfig)
+}
+
 func (n *OpNode) initL2(ctx context.Context, cfg *Config, snapshotLog log.Logger) error {
 	rpcClient, rpcCfg, err := cfg.L2.Setup(ctx, n.log, &cfg.Rollup)
 	if err != nil {
diff --git a/op-node/rollup/derive/calldata_source.go b/op-node/rollup/derive/calldata_source.go
index 0a5d7915770d..c187003af466 100644
--- a/op-node/rollup/derive/calldata_source.go
+++ b/op-node/rollup/derive/calldata_source.go
@@ -2,6 +2,7 @@ package derive
 
 import (
 	"context"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
@@ -11,9 +12,18 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
+var daClient *celestia.DAClient
+
+func SetDAClient(c *celestia.DAClient) error {
+	log.Warn("da client already configured")
+	daClient = c
+	return nil
+}
+
 // CalldataSource is a fault tolerant approach to fetching data.
 // The constructor will never fail & it will instead re-attempt the fetcher
 // at a later point.
@@ -32,7 +42,7 @@ type CalldataSource struct {
 
 // NewCalldataSource creates a new calldata source. It suppresses errors in fetching the L1 block if they occur.
 // If there is an error, it will attempt to fetch the result on the next call to `Next`.
-func NewCalldataSource(ctx context.Context, log log.Logger, dsCfg DataSourceConfig, fetcher L1TransactionFetcher, ref eth.L1BlockRef, batcherAddr common.Address) DataIter {
+func NewCalldataSource(ctx context.Context, log log.Logger, dsCfg DataSourceConfig, fetcher L1TransactionFetcher, ref eth.L1BlockRef, batcherAddr common.Address) (DataIter, error) {
 	_, txs, err := fetcher.InfoAndTxsByHash(ctx, ref.Hash)
 	if err != nil {
 		return &CalldataSource{
@@ -42,12 +52,23 @@ func NewCalldataSource(ctx context.Context, log log.Logger, dsCfg DataSourceConf
 			fetcher:     fetcher,
 			log:         log,
 			batcherAddr: batcherAddr,
-		}
+		}, nil
+	}
+	data, err := DataFromEVMTransactions(dsCfg, batcherAddr, txs, log.New("origin", ref))
+	if err != nil {
+		return &CalldataSource{
+			open:        false,
+			ref:         ref,
+			dsCfg:       dsCfg,
+			fetcher:     fetcher,
+			log:         log,
+			batcherAddr: batcherAddr,
+		}, err
 	}
 	return &CalldataSource{
 		open: true,
-		data: DataFromEVMTransactions(dsCfg, batcherAddr, txs, log.New("origin", ref)),
-	}
+		data: data,
+	}, nil
 }
 
 // Next returns the next piece of data if it has it. If the constructor failed, this
@@ -57,7 +78,11 @@ func (ds *CalldataSource) Next(ctx context.Context) (eth.Data, error) {
 	if !ds.open {
 		if _, txs, err := ds.fetcher.InfoAndTxsByHash(ctx, ds.ref.Hash); err == nil {
 			ds.open = true
-			ds.data = DataFromEVMTransactions(ds.dsCfg, ds.batcherAddr, txs, ds.log)
+			ds.data, err = DataFromEVMTransactions(ds.dsCfg, ds.batcherAddr, txs, ds.log)
+			if err != nil {
+				// already wrapped
+				return nil, err
+			}
 		} else if errors.Is(err, ethereum.NotFound) {
 			return nil, NewResetError(fmt.Errorf("failed to open calldata source: %w", err))
 		} else {
@@ -76,12 +101,38 @@ func (ds *CalldataSource) Next(ctx context.Context) (eth.Data, error) {
 // DataFromEVMTransactions filters all of the transactions and returns the calldata from transactions
 // that are sent to the batch inbox address from the batch sender address.
 // This will return an empty array if no valid transactions are found.
-func DataFromEVMTransactions(dsCfg DataSourceConfig, batcherAddr common.Address, txs types.Transactions, log log.Logger) []eth.Data {
+func DataFromEVMTransactions(dsCfg DataSourceConfig, batcherAddr common.Address, txs types.Transactions, log log.Logger) ([]eth.Data, error) {
 	out := []eth.Data{}
 	for _, tx := range txs {
 		if isValidBatchTx(tx, dsCfg.l1Signer, dsCfg.batchInboxAddress, batcherAddr) {
-			out = append(out, tx.Data())
+			data := tx.Data()
+			switch len(data) {
+			case 0:
+				out = append(out, data)
+			default:
+				switch data[0] {
+				case celestia.DerivationVersionCelestia:
+					log.Info("celestia: blob request", "id", hex.EncodeToString(tx.Data()))
+					ctx, cancel := context.WithTimeout(context.Background(), daClient.GetTimeout)
+					blobs, err := daClient.DA.Get(ctx, [][]byte{data[1:]})
+					cancel()
+					if err != nil {
+						return nil, NewResetError(fmt.Errorf("celestia: failed to resolve frame: %w", err))
+					}
+					if len(blobs) != 1 {
+						log.Warn("celestia: unexpected length for blobs", "expected", 1, "got", len(blobs))
+						if len(blobs) == 0 {
+							log.Warn("celestia: skipping empty blobs")
+							continue
+						}
+					}
+					out = append(out, blobs[0])
+				default:
+					out = append(out, data)
+					log.Info("celestia: using eth fallback")
+				}
+			}
 		}
 	}
-	return out
+	return out, nil
 }
diff --git a/op-node/rollup/derive/calldata_source_test.go b/op-node/rollup/derive/calldata_source_test.go
index 01b2616cca3f..7dc17c6aa19f 100644
--- a/op-node/rollup/derive/calldata_source_test.go
+++ b/op-node/rollup/derive/calldata_source_test.go
@@ -121,8 +121,10 @@ func TestDataFromEVMTransactions(t *testing.T) {
 			}
 		}
 
-		out := DataFromEVMTransactions(DataSourceConfig{cfg.L1Signer(), cfg.BatchInboxAddress, false}, batcherAddr, txs, testlog.Logger(t, log.LevelCrit))
+		out, err := DataFromEVMTransactions(DataSourceConfig{cfg.L1Signer(), cfg.BatchInboxAddress, false}, batcherAddr, txs, testlog.Logger(t, log.LevelCrit))
+		require.NoError(t, err)
 		require.ElementsMatch(t, expectedData, out)
+		require.NoError(t, err)
 	}
 
 }
diff --git a/op-node/rollup/derive/data_source.go b/op-node/rollup/derive/data_source.go
index 705601306c14..2368e5c1dff5 100644
--- a/op-node/rollup/derive/data_source.go
+++ b/op-node/rollup/derive/data_source.go
@@ -64,19 +64,20 @@ func (ds *DataSourceFactory) OpenData(ctx context.Context, ref eth.L1BlockRef, b
 	// Creates a data iterator from blob or calldata source so we can forward it to the plasma source
 	// if enabled as it still requires an L1 data source for fetching input commmitments.
 	var src DataIter
+	var err error
 	if ds.ecotoneTime != nil && ref.Time >= *ds.ecotoneTime {
 		if ds.blobsFetcher == nil {
 			return nil, fmt.Errorf("ecotone upgrade active but beacon endpoint not configured")
 		}
 		src = NewBlobDataSource(ctx, ds.log, ds.dsCfg, ds.fetcher, ds.blobsFetcher, ref, batcherAddr)
 	} else {
-		src = NewCalldataSource(ctx, ds.log, ds.dsCfg, ds.fetcher, ref, batcherAddr)
+		src, err = NewCalldataSource(ctx, ds.log, ds.dsCfg, ds.fetcher, ref, batcherAddr)
 	}
-	if ds.dsCfg.plasmaEnabled {
+	if ds.ecotoneTime != nil && ref.Time >= *ds.ecotoneTime && ds.dsCfg.plasmaEnabled {
 		// plasma([calldata | blobdata](l1Ref)) -> data
 		return NewPlasmaDataSource(ds.log, src, ds.plasmaFetcher, ref.ID()), nil
 	}
-	return src, nil
+	return src, err
 }
 
 // DataSourceConfig regroups the mandatory rollup.Config fields needed for DataFromEVMTransactions.
diff --git a/op-node/rollup/derive/plasma_data_source_test.go b/op-node/rollup/derive/plasma_data_source_test.go
index dc96a4390b72..0e1fb3240af4 100644
--- a/op-node/rollup/derive/plasma_data_source_test.go
+++ b/op-node/rollup/derive/plasma_data_source_test.go
@@ -30,6 +30,7 @@ func TestPlasmaDataSource(t *testing.T) {
 	rng := rand.New(rand.NewSource(1234))
 
 	l1F := &testutils.MockL1Source{}
+	blobF := &testutils.MockBlobsFetcher{}
 
 	storage := plasma.NewMockDAClient(logger)
 
@@ -61,13 +62,14 @@ func TestPlasmaDataSource(t *testing.T) {
 		SeqWindowSize:      20,
 		BatchInboxAddress:  batcherInbox,
 		DAChallengeAddress: common.Address{43},
+		EcotoneTime:        &refA0.Time,
 	}
 	// keep track of random input data to validate against
 	var inputs [][]byte
 
 	signer := cfg.L1Signer()
 
-	factory := NewDataSourceFactory(logger, cfg, l1F, nil, da)
+	factory := NewDataSourceFactory(logger, cfg, l1F, blobF, da)
 
 	for i := uint64(0); i <= 18; i++ {
 		parent := l1Refs[len(l1Refs)-1]
diff --git a/op-node/rollup/driver/da.go b/op-node/rollup/driver/da.go
new file mode 100644
index 000000000000..29d69f96e3ea
--- /dev/null
+++ b/op-node/rollup/driver/da.go
@@ -0,0 +1,11 @@
+package driver
+
+import (
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
+)
+
+func SetDAClient(cfg celestia.Config) error {
+	client := celestia.NewDAClient(cfg.DaRpc, false)
+	return derive.SetDAClient(client)
+}
diff --git a/op-node/service.go b/op-node/service.go
index 17b9b6b5d429..f325e8170426 100644
--- a/op-node/service.go
+++ b/op-node/service.go
@@ -9,7 +9,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	plasma "github.com/ethereum-optimism/optimism/op-plasma"
 	"github.com/ethereum-optimism/optimism/op-service/oppprof"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
@@ -18,6 +17,8 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
+	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/flags"
 	"github.com/ethereum-optimism/optimism/op-node/node"
 	p2pcli "github.com/ethereum-optimism/optimism/op-node/p2p/cli"
@@ -109,7 +110,8 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
 		ConductorRpc:        ctx.String(flags.ConductorRpcFlag.Name),
 		ConductorRpcTimeout: ctx.Duration(flags.ConductorRpcTimeoutFlag.Name),
 
-		Plasma: plasma.ReadCLIConfig(ctx),
+		Plasma:   plasma.ReadCLIConfig(ctx),
+		DaConfig: celestia.Config(celestia.ReadCLIConfig(ctx)),
 	}
 
 	if err := cfg.LoadPersisted(log); err != nil {
diff --git a/op-plasma/cli.go b/op-plasma/cli.go
index 92164bd5041d..7f0f37c4c286 100644
--- a/op-plasma/cli.go
+++ b/op-plasma/cli.go
@@ -4,12 +4,14 @@ import (
 	"fmt"
 	"net/url"
 
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/urfave/cli/v2"
 )
 
 const (
 	EnabledFlagName         = "plasma.enabled"
 	DaServerAddressFlagName = "plasma.da-server"
+	DaBackendFlagName       = "plasma.da-backend"
 	VerifyOnReadFlagName    = "plasma.verify-on-read"
 )
 
@@ -32,6 +34,11 @@ func CLIFlags(envPrefix string, category string) []cli.Flag {
 			EnvVars:  plasmaEnv(envPrefix, "DA_SERVER"),
 			Category: category,
 		},
+		&cli.StringFlag{
+			Name:    DaBackendFlagName,
+			Usage:   "Plamsa mode backend ('celestia')",
+			EnvVars: plasmaEnv(envPrefix, "DA_BACKEND"),
+		},
 		&cli.BoolFlag{
 			Name:     VerifyOnReadFlagName,
 			Usage:    "Verify input data matches the commitments from the DA storage service",
@@ -45,29 +52,42 @@ func CLIFlags(envPrefix string, category string) []cli.Flag {
 type CLIConfig struct {
 	Enabled      bool
 	DAServerURL  string
+	DABackend    string
 	VerifyOnRead bool
 }
 
 func (c CLIConfig) Check() error {
-	if c.Enabled {
-		if c.DAServerURL == "" {
-			return fmt.Errorf("DA server URL is required when plasma da is enabled")
-		}
-		if _, err := url.Parse(c.DAServerURL); err != nil {
-			return fmt.Errorf("DA server URL is invalid: %w", err)
-		}
+	if !c.Enabled {
+		return fmt.Errorf("plasma must be enabled")
+	}
+	if c.DAServerURL == "" {
+		return fmt.Errorf("DA server URL is required when plasma da is enabled")
+	}
+	if _, err := url.Parse(c.DAServerURL); err != nil {
+		return fmt.Errorf("DA server URL is invalid: %w", err)
+	}
+	if c.DABackend != "celestia" {
+		return fmt.Errorf("plasma backend must be set to celestia")
 	}
 	return nil
 }
 
-func (c CLIConfig) NewDAClient() *DAClient {
-	return &DAClient{url: c.DAServerURL, verify: c.VerifyOnRead}
+func (c CLIConfig) NewDAClient() DAStorage {
+	var client DAStorage
+	switch c.DABackend {
+	case "celestia":
+		client = celestia.NewDAClient(c.DAServerURL, c.VerifyOnRead)
+	default:
+		client = &DAClient{url: c.DAServerURL, verify: c.VerifyOnRead}
+	}
+	return client
 }
 
 func ReadCLIConfig(c *cli.Context) CLIConfig {
 	return CLIConfig{
 		Enabled:      c.Bool(EnabledFlagName),
 		DAServerURL:  c.String(DaServerAddressFlagName),
+		DABackend:    c.String(DaBackendFlagName),
 		VerifyOnRead: c.Bool(VerifyOnReadFlagName),
 	}
 }
diff --git a/op-plasma/daclient_test.go b/op-plasma/daclient_test.go
index c2afdfe38072..3d35baaf5616 100644
--- a/op-plasma/daclient_test.go
+++ b/op-plasma/daclient_test.go
@@ -74,7 +74,8 @@ func TestDAClient(t *testing.T) {
 		DAServerURL:  tsrv.URL,
 		VerifyOnRead: true,
 	}
-	require.NoError(t, cfg.Check())
+	// skip celestia check
+	// require.NoError(t, cfg.Check())
 
 	client := cfg.NewDAClient()
 
diff --git a/ops-bedrock/docker-compose.yml b/ops-bedrock/docker-compose.yml
index b4b144dee670..c0ff520badae 100644
--- a/ops-bedrock/docker-compose.yml
+++ b/ops-bedrock/docker-compose.yml
@@ -20,6 +20,18 @@ services:
         GIT_DATE: "0"
     image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:devnet
     entrypoint: ["echo", "build complete"]
+  da:
+    image: ghcr.io/rollkit/local-celestia-devnet:v0.12.7
+    ports:
+      - "26650:26650"
+    environment:
+      CELESTIA_NAMESPACE: 000008e5f679bf7116cb
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:26659/header/1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
 
   l1:
     build:
@@ -59,6 +71,7 @@ services:
       - op_stack_go_builder
       - l1
       - l2
+      - da
     build:
       context: ../
       dockerfile: ./op-node/Dockerfile
@@ -68,6 +81,7 @@ services:
     command: >
       op-node
       --l1=ws://l1:8546
+      --l1.beacon.ignore
       --l2=http://l2:8551
       --l2.jwt-secret=/config/test-jwt-secret.txt
       --sequencer.enabled
@@ -89,6 +103,9 @@ services:
       --metrics.port=7300
       --pprof.enabled
       --rpc.enable-admin
+      --plasma.enabled
+      --plasma.da-server=da:26650
+      --plasma.da-backend=celestia
     ports:
       - "7545:8545"
       - "9003:9003"
@@ -135,10 +152,16 @@ services:
 
   op-batcher:
     depends_on:
-      - op_stack_go_builder
-      - l1
-      - l2
-      - op-node
+      op_stack_go_builder:
+        condition: service_started
+      l1:
+        condition: service_started
+      l2:
+        condition: service_started
+      op-node:
+        condition: service_started
+      da:
+        condition: service_healthy
     build:
       context: ../
       dockerfile: ./op-batcher/Dockerfile
@@ -153,6 +176,7 @@ services:
       OP_BATCHER_L1_ETH_RPC: http://l1:8545
       OP_BATCHER_L2_ETH_RPC: http://l2:8545
       OP_BATCHER_ROLLUP_RPC: http://op-node:8545
+      OFFLINE_GAS_ESTIMATION: null
       OP_BATCHER_MAX_CHANNEL_DURATION: 1
       OP_BATCHER_SUB_SAFETY_MARGIN: 4 # SWS is 15, ChannelTimeout is 40
       OP_BATCHER_POLL_INTERVAL: 1s
@@ -163,6 +187,9 @@ services:
       OP_BATCHER_METRICS_ENABLED: "true"
       OP_BATCHER_RPC_ENABLE_ADMIN: "true"
       OP_BATCHER_BATCH_TYPE: 0
+      OP_BATCHER_PLASMA_DA_SERVER: "da:26650"
+      OP_BATCHER_PLASMA_DA_BACKEND: "celestia"
+      OP_BATCHER_PLASMA_ENABLED: "true"
 
   op-challenger:
     depends_on:
diff --git a/ops/docker/op-stack-go/Dockerfile.dockerignore b/ops/docker/op-stack-go/Dockerfile.dockerignore
index 821978fb7992..f9be5f7ccf5e 100644
--- a/ops/docker/op-stack-go/Dockerfile.dockerignore
+++ b/ops/docker/op-stack-go/Dockerfile.dockerignore
@@ -6,6 +6,7 @@
 !/op-batcher
 !/op-bindings
 !/op-bootnode
+!/op-celestia
 !/op-chain-ops
 !/op-challenger
 !/op-dispute-mon
diff --git a/packages/contracts-bedrock/deploy-config/devnetL1-template.json b/packages/contracts-bedrock/deploy-config/devnetL1-template.json
index 427920451fbf..6fa7e1f3a7c2 100644
--- a/packages/contracts-bedrock/deploy-config/devnetL1-template.json
+++ b/packages/contracts-bedrock/deploy-config/devnetL1-template.json
@@ -44,7 +44,6 @@
   "eip1559Elasticity": 6,
   "l1GenesisBlockTimestamp": "0x64c811bf",
   "l2GenesisRegolithTimeOffset": "0x0",
-  "l2GenesisDeltaTimeOffset": null,
   "l2GenesisCanyonTimeOffset": "0x0",
   "systemConfigStartBlock": 0,
   "requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -61,5 +60,6 @@
   "proofMaturityDelaySeconds": 12,
   "disputeGameFinalityDelaySeconds": 6,
   "respectedGameType": 0,
-  "useFaultProofs": false
+  "useFaultProofs": false,
+  "daChallengeAddress": "0xff00000000000000000000000000000000000905"
 }