diff --git a/Dockerfile b/Dockerfile
index eda927f77af..9d4d81ca906 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,6 +22,7 @@ COPY packages/shared/package.json packages/shared/
 COPY packages/db/package.json packages/db/
 COPY packages/adapter-utils/package.json packages/adapter-utils/
 COPY packages/google-sheets-mcp-server/package.json packages/google-sheets-mcp-server/
+COPY packages/grok-acp/package.json packages/grok-acp/
 COPY packages/kv-demo-mcp-server/package.json packages/kv-demo-mcp-server/
 COPY packages/mcp-server/package.json packages/mcp-server/
 COPY packages/paperclip-eval-kernel/package.json packages/paperclip-eval-kernel/
diff --git a/server/src/__tests__/adapter-routes.test.ts b/server/src/__tests__/adapter-routes.test.ts
index 6f5e857046a..c27161dfd88 100644
--- a/server/src/__tests__/adapter-routes.test.ts
+++ b/server/src/__tests__/adapter-routes.test.ts
@@ -375,8 +375,15 @@ describe("adapter routes", () => {
       }),
     ]));
     const acpxAgent = res.body.fields.find((field: { key?: string }) => field.key === "acpxAgent");
-    expect(acpxAgent).toBeUndefined();
-    expect(JSON.stringify(res.body)).toContain("ACPX Claude");
+    expect(acpxAgent).toMatchObject({
+      type: "select",
+      default: "claude",
+      meta: { visibleWhen: { key: "provider", value: "acpx" } },
+      options: [
+        { value: "claude", label: "Claude" },
+        { value: "grok", label: "Grok Build" },
+      ],
+    });
     expect(JSON.stringify(res.body)).not.toContain("Codex via ACPX");
   });
 
diff --git a/server/src/adapters/registry.ts b/server/src/adapters/registry.ts
index 369f840526e..236fd06410f 100644
--- a/server/src/adapters/registry.ts
+++ b/server/src/adapters/registry.ts
@@ -523,9 +523,9 @@ const paperclipRunnerAdapter: ServerAdapterModule = {
           { value: "opencode", label: `OpenCode ${QUALIFIED_OPENCODE_RUNNER_VERSION}` },
           { value: "claude_managed", label: "Claude Managed" },
           { value: "aws_agentcore", label: "AWS AgentCore" },
-          { value: "acpx", label: "ACPX Claude" },
+          { value: "acpx", label: "ACPX (Claude / Grok Build)" },
         ],
-        hint: "Select a local provider, company-qualified managed provider, or ACPX Claude.",
+        hint: "Select a local provider, company-qualified managed provider, or Claude or Grok Build through ACPX.",
       },
       {
         key: "acpxAgent", label: "ACP agent", type: "select" as const, default: "claude",