diff --git a/.drone.yml b/.drone.yml
index 7070f5a..0b18ec9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,7 +24,7 @@ steps:
         - staging
 
   - name: build-validator
-    image: clux/muslrust:1.91.0-stable
+    image: rust:1.92
     commands:
       - make build-validator
     when:
@@ -33,9 +33,8 @@ steps:
         - staging
 
   - name: build-combobulator
-    image: clux/muslrust:1.91.0-stable
+    image: rust:1.92
     commands:
-      - ln -s /usr/bin/g++ /usr/bin/x86_64-linux-musl-g++
       - make build-combobulator
     when:
       branch:
@@ -185,6 +184,6 @@ steps:
         - pull_request
 ---
 kind: signature
-hmac: 8889d60401f33b373828df44e5c4986056f34898c0ac85d146ba2f6170b2c825
+hmac: a654fea05ccf642bb3a41ce777808ff995c8bd7286f2403fae179ce0db025619
 
 ...
diff --git a/Makefile b/Makefile
index 71951d6..bd4c556 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,10 @@ build-backend:
 	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o build/server cmd/maps-service/service.go
 
 build-validator:
-	cargo build --release --target x86_64-unknown-linux-musl --bin maps-validation
+	cargo build --release --bin maps-validation
 
 build-combobulator:
-	cargo build --release --target x86_64-unknown-linux-musl --bin maps-combobulator
+	cargo build --release --bin maps-combobulator
 
 build-frontend:
 	rm -rf web/build
diff --git a/combobulator/Cargo.toml b/combobulator/Cargo.toml
index 4910d09..dbb822a 100644
--- a/combobulator/Cargo.toml
+++ b/combobulator/Cargo.toml
@@ -13,4 +13,3 @@ serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"
 tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "signal"] }
 tokio-stream = "0.1"
-openssl = { version = "0.10", features = ["vendored"] }
diff --git a/combobulator/Containerfile b/combobulator/Containerfile
index 6ea3d2c..5197880 100644
--- a/combobulator/Containerfile
+++ b/combobulator/Containerfile
@@ -1,3 +1,3 @@
-FROM alpine:3.21 AS runtime
-COPY /target/x86_64-unknown-linux-musl/release/maps-combobulator /
+FROM debian:bookworm-slim AS runtime
+COPY /target/release/maps-combobulator /
 ENTRYPOINT ["/maps-combobulator"]
diff --git a/validation/Containerfile b/validation/Containerfile
index fcebf00..6453797 100644
--- a/validation/Containerfile
+++ b/validation/Containerfile
@@ -1,3 +1,3 @@
-FROM alpine:3.21 AS runtime
-COPY /target/x86_64-unknown-linux-musl/release/maps-validation /
+FROM debian:bookworm-slim AS runtime
+COPY /target/release/maps-validation /
 ENTRYPOINT ["/maps-validation"]