diff --git a/Cargo.server.toml b/Cargo.server.toml
deleted file mode 100644
index dfe5e47..0000000
--- a/Cargo.server.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[workspace]
-members = ["rustsystem-server", "rustsystem-core"]
-resolver = "3"
-
-[workspace.dependencies]
-axum = { version = "0.8.4", features = ["macros"] }
-serde = { version = "1.0.219", features = ["derive"] }
-
-[workspace.package]
-authors = [ "Felix Hellborg <felix.hellborg.la@gmail.com>", "Åke Amcoff <ake@amcoff.net>" ]
diff --git a/Cargo.trustauth.toml b/Cargo.trustauth.toml
deleted file mode 100644
index e463ead..0000000
--- a/Cargo.trustauth.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[workspace]
-members = ["rustsystem-core", "rustsystem-trustauth"]
-resolver = "3"
-
-[workspace.dependencies]
-axum = { version = "0.8.4", features = ["macros"] }
-serde = { version = "1.0.219", features = ["derive"] }
-
-[workspace.package]
-authors = [ "Felix Hellborg <felix.hellborg.la@gmail.com>", "Åke Amcoff <ake@amcoff.net>" ]
diff --git a/Dockerfile.server b/Dockerfile.server
index 8b6504b..b8e9810 100644
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -23,10 +23,15 @@ RUN ls
 
 FROM rust:1.91-bullseye AS backend-builder
 WORKDIR /app
-COPY Cargo.server.toml ./Cargo.toml
-COPY Cargo.lock ./
+COPY Cargo.toml Cargo.lock ./
 COPY rustsystem-server/ ./rustsystem-server/
 COPY rustsystem-core/ ./rustsystem-core/
+# Stub out trustauth: cargo resolves it as a dev-dependency but never compiles it in --release
+COPY rustsystem-trustauth/Cargo.toml ./rustsystem-trustauth/
+RUN mkdir -p rustsystem-trustauth/src && touch rustsystem-trustauth/src/lib.rs
+# decrypt-tally is a workspace member but not needed here
+COPY decrypt-tally/Cargo.toml ./decrypt-tally/
+RUN mkdir -p decrypt-tally/src && touch decrypt-tally/src/main.rs
 ARG API_ENDPOINT_SERVER
 ARG API_ENDPOINT_SERVER_TO_TRUSTAUTH
 ARG SALT_HEX
diff --git a/Dockerfile.trustauth b/Dockerfile.trustauth
index b4a5417..84d1017 100644
--- a/Dockerfile.trustauth
+++ b/Dockerfile.trustauth
@@ -4,10 +4,14 @@ ARG API_ENDPOINT_TRUSTAUTH=https://rosta.trustauth.fsektionen.se
 
 FROM rust:1.91-bullseye AS builder
 WORKDIR /app
-COPY Cargo.trustauth.toml ./Cargo.toml
-COPY Cargo.lock ./
+COPY Cargo.toml Cargo.lock ./
 COPY rustsystem-trustauth/ ./rustsystem-trustauth/
 COPY rustsystem-core/ ./rustsystem-core/
+# Stub out workspace members not needed for this binary
+COPY rustsystem-server/Cargo.toml ./rustsystem-server/
+RUN mkdir -p rustsystem-server/src && touch rustsystem-server/src/lib.rs rustsystem-server/src/main.rs
+COPY decrypt-tally/Cargo.toml ./decrypt-tally/
+RUN mkdir -p decrypt-tally/src && touch decrypt-tally/src/main.rs
 ARG API_ENDPOINT_SERVER
 ARG API_ENDPOINT_TRUSTAUTH_TO_SERVER
 ARG API_ENDPOINT_TRUSTAUTH