diff --git a/.config/hakari.toml b/.config/hakari.toml
index bd742b33cd..9d18b42092 100644
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -20,6 +20,7 @@ platforms = [
 [traversal-excludes]
 workspace-members = [
     "remote_server",
+    "eval",
 ]
 third-party = [
     { name = "reqwest", version = "0.11.27" },
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ddb5173e7..12aba44f55 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -325,7 +325,7 @@ jobs:
           cache-provider: "buildjet"
 
       - name: Install Clang & Mold
-        run: ./script/remote-server && ./script/install-mold 2.34.0
+        run: ./script/headless && ./script/install-mold 2.34.0
 
       - name: Configure CI
         run: |
diff --git a/.github/workflows/run_agent_eval_daily.yml b/.github/workflows/run_agent_eval_daily.yml
index 6dec0d1a7a..95d0cfb433 100644
--- a/.github/workflows/run_agent_eval_daily.yml
+++ b/.github/workflows/run_agent_eval_daily.yml
@@ -21,13 +21,8 @@ jobs:
         with:
           clean: false
 
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y mold pkg-config \
-            libx11-dev libxcb1-dev libxcb-shape0-dev libxcb-xfixes0-dev \
-            libx11-xcb-dev libxkbcommon-dev libxkbcommon-x11-dev \
-            libasound2-dev
+      - name: Install Dependencies
+        run: ./script/headless && ./script/install-mold 2.34.0
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
diff --git a/Cargo.lock b/Cargo.lock
index 2ad69ff7e1..7f8ed33d3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4913,7 +4913,6 @@ dependencies = [
  "unindent",
  "util",
  "uuid",
- "workspace-hack",
 ]
 
 [[package]]
diff --git a/Dockerfile-cross b/Dockerfile-cross
index 488309641c..11f943f273 100644
--- a/Dockerfile-cross
+++ b/Dockerfile-cross
@@ -11,7 +11,7 @@ ENV CARGO_TERM_COLOR=always
 
 COPY script/install-mold script/
 RUN ./script/install-mold "2.34.0"
-COPY script/remote-server script/
-RUN ./script/remote-server
+COPY script/headless script/
+RUN ./script/headless
 
 COPY . .
diff --git a/crates/eval/Cargo.toml b/crates/eval/Cargo.toml
index d8c97f9a11..cb857324f2 100644
--- a/crates/eval/Cargo.toml
+++ b/crates/eval/Cargo.toml
@@ -43,7 +43,6 @@ toml.workspace = true
 unindent.workspace = true
 util.workspace = true
 uuid = { version = "1.6", features = ["v4"] }
-workspace-hack.workspace = true
 
 [[bin]]
 name = "eval"
diff --git a/script/remote-server b/script/headless
similarity index 100%
rename from script/remote-server
rename to script/headless