diff --git a/app/data/container-build/cerc-optimism-op-batcher/Dockerfile b/app/data/container-build/cerc-optimism-op-batcher/Dockerfile
new file mode 100644
index 00000000..011ffd98
--- /dev/null
+++ b/app/data/container-build/cerc-optimism-op-batcher/Dockerfile
@@ -0,0 +1,30 @@
+FROM golang:1.19.0-alpine3.15 as builder
+
+ARG VERSION=v0.0.0
+
+RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
+
+# build op-batcher with the shared go.mod & go.sum files
+COPY ./op-batcher /app/op-batcher
+COPY ./op-bindings /app/op-bindings
+COPY ./op-node /app/op-node
+COPY ./op-service /app/op-service
+COPY ./op-signer /app/op-signer
+COPY ./go.mod /app/go.mod
+COPY ./go.sum /app/go.sum
+
+COPY ./.git /app/.git
+
+WORKDIR /app/op-batcher
+
+RUN go mod download
+
+ARG TARGETOS TARGETARCH
+
+RUN make op-batcher VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
+
+FROM alpine:3.15
+
+COPY --from=builder /app/op-batcher/bin/op-batcher /usr/local/bin
+
+ENTRYPOINT ["op-batcher"]
diff --git a/app/data/container-build/cerc-optimism-op-batcher/build.sh b/app/data/container-build/cerc-optimism-op-batcher/build.sh
new file mode 100755
index 00000000..5bc3a238
--- /dev/null
+++ b/app/data/container-build/cerc-optimism-op-batcher/build.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build cerc/optimism-op-batcher
+# TODO: use upstream Dockerfile once its buildx-specific content has been removed
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+docker build -t cerc/optimism-op-batcher:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/optimism
diff --git a/app/data/container-build/cerc-optimism-op-node/Dockerfile b/app/data/container-build/cerc-optimism-op-node/Dockerfile
new file mode 100644
index 00000000..2ef39960
--- /dev/null
+++ b/app/data/container-build/cerc-optimism-op-node/Dockerfile
@@ -0,0 +1,28 @@
+FROM golang:1.19.0-alpine3.15 as builder
+
+ARG VERSION=v0.0.0
+
+RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
+
+# build op-node with the shared go.mod & go.sum files
+COPY ./op-node /app/op-node
+COPY ./op-chain-ops /app/op-chain-ops
+COPY ./op-service /app/op-service
+COPY ./op-bindings /app/op-bindings
+COPY ./go.mod /app/go.mod
+COPY ./go.sum /app/go.sum
+COPY ./.git /app/.git
+
+WORKDIR /app/op-node
+
+RUN go mod download
+
+ARG TARGETOS TARGETARCH
+
+RUN make op-node VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
+
+FROM alpine:3.15
+
+COPY --from=builder /app/op-node/bin/op-node /usr/local/bin
+
+CMD ["op-node"]
diff --git a/app/data/container-build/cerc-optimism-op-node/build.sh b/app/data/container-build/cerc-optimism-op-node/build.sh
new file mode 100755
index 00000000..0ec7e656
--- /dev/null
+++ b/app/data/container-build/cerc-optimism-op-node/build.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build cerc/optimism-op-node
+# TODO: use upstream Dockerfile once its buildx-specific content has been removed
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+docker build -t cerc/optimism-op-node:local -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/optimism
diff --git a/app/data/container-image-list.txt b/app/data/container-image-list.txt
index 85357b76..3ff67ad8 100644
--- a/app/data/container-image-list.txt
+++ b/app/data/container-image-list.txt
@@ -31,4 +31,5 @@ cerc/builder-gerbil
 cerc/act-runner
 cerc/act-runner-task-executor
 cerc/optimism-l2geth
-cerc/optimism-batcher
+cerc/optimism-op-batcher
+cerc/optimism-op-node
diff --git a/app/data/stacks/fixturenet-optimism/stack.yml b/app/data/stacks/fixturenet-optimism/stack.yml
index 2bee2882..620f2b97 100644
--- a/app/data/stacks/fixturenet-optimism/stack.yml
+++ b/app/data/stacks/fixturenet-optimism/stack.yml
@@ -13,7 +13,9 @@ containers:
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/optimism-l2geth
-  - cerc/optimism-batcher
+  - cerc/optimism-op-batcher
+  - cerc/optimism-op-node
+  - cerc/optimism-contracts
   - cerc/foundry
 pods:
   - fixturenet-eth