diff --git a/.dockerignore b/.dockerignore
index 0941d4626..21ce6789e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,7 @@
 .pytest_cache
 .ruff_cache
 .venv
+target
 .worktrees
 benchmark/datasets
 benchmark/tb_runs
diff --git a/benchmark/switchyard-rust-server.Dockerfile b/Dockerfile
similarity index 75%
rename from benchmark/switchyard-rust-server.Dockerfile
rename to Dockerfile
index 8c52b5523..eb6815eea 100644
--- a/benchmark/switchyard-rust-server.Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,14 @@
 # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+# Keep RUST_VERSION in sync with rust-toolchain.toml.
 ARG RUST_VERSION=1.96.1
 FROM rust:${RUST_VERSION}-bookworm AS builder
 
 WORKDIR /opt/switchyard
-COPY Cargo.toml Cargo.lock ./
+COPY Cargo.toml Cargo.lock rust-toolchain.toml ./
+# .cargo/config.toml carries the workspace rustflags (target-cpu, force-frame-pointers).
+COPY .cargo ./.cargo
 COPY crates ./crates
 
 RUN cargo build --locked --release -p switchyard-server
diff --git a/benchmark/README.md b/benchmark/README.md
index 86feef084..dfaa36a52 100644
--- a/benchmark/README.md
+++ b/benchmark/README.md
@@ -291,7 +291,7 @@ and while the Rust server is still reachable; otherwise the manifest records the
 ## Docker Image Notes
 
 Baseline runs build `switchyard-baseline:local` from
-`benchmark/switchyard-rust-server.Dockerfile`.
+the repository-root `Dockerfile`.
 The default is to rebuild before each run so the container matches the current checkout.
 
 To reuse an already built image:
diff --git a/benchmark/run-baseline.sh b/benchmark/run-baseline.sh
index bcadfc043..b11b6adcf 100755
--- a/benchmark/run-baseline.sh
+++ b/benchmark/run-baseline.sh
@@ -47,7 +47,7 @@ BOOK_MODE="closed"
 PROXY_STRIP_ARTIFACT="/etc/proxy-public/strip.jsonl"
 VERIFIER_PROXY_TEMPLATE='${SWITCHYARD_VERIFIER_HTTP_PROXY}'
 SWITCHYARD_DOCKER_IMAGE="${SWITCHYARD_DOCKER_IMAGE:-switchyard-baseline:local}"
-SWITCHYARD_DOCKERFILE="${SWITCHYARD_DOCKERFILE:-benchmark/switchyard-rust-server.Dockerfile}"
+SWITCHYARD_DOCKERFILE="${SWITCHYARD_DOCKERFILE:-Dockerfile}"
 SWITCHYARD_DOCKER_SERVICE_NAME="${SWITCHYARD_DOCKER_SERVICE_NAME:-switchyard}"
 SWITCHYARD_DOCKER_BUILD="${SWITCHYARD_DOCKER_BUILD:-1}"
 SWITCHYARD_DOCKER_NETWORK="${SWITCHYARD_DOCKER_NETWORK:-}"