diff --git a/Makefile b/Makefile
index f28bc8d5c..cb3d976e1 100644
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,7 @@ build/lib/depends build/lib/conflicts: build/dpkg-deps/*
 $(FIRMWARE_ROMS): build/lib/firmware.json download-firmware.sh $(PLATFORM_FILE)
 	./download-firmware.sh $(PLATFORM)
 
-system-images/compat/docker-images/$(ARCH).tar: $(COMPAT_SRC) core/Cargo.lock
+system-images/compat/docker-images/$(ARCH).tar: $(COMPAT_SRC)
 	cd system-images/compat && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar
 
 system-images/utils/docker-images/$(ARCH).tar: $(UTILS_SRC)
diff --git a/system-images/compat/Dockerfile b/system-images/compat/Dockerfile
index d48ac3402..c01248b04 100644
--- a/system-images/compat/Dockerfile
+++ b/system-images/compat/Dockerfile
@@ -1,8 +1 @@
-FROM alpine:latest
-
-ARG ARCH
-
-RUN apk update && apk add duplicity curl
-ADD ./target/$ARCH-unknown-linux-musl/release/compat /usr/local/bin/compat
-
-ENTRYPOINT ["compat"]
+FROM start9/compat
\ No newline at end of file
diff --git a/system-images/compat/Makefile b/system-images/compat/Makefile
index 86d881193..b6cd1bfec 100644
--- a/system-images/compat/Makefile
+++ b/system-images/compat/Makefile
@@ -11,10 +11,10 @@ clean:
 docker-images:
 	mkdir docker-images
 
-docker-images/aarch64.tar: Dockerfile target/aarch64-unknown-linux-musl/release/compat docker-images
+docker-images/aarch64.tar: Dockerfile docker-images
 	docker buildx build --build-arg ARCH=aarch64 --tag start9/x_system/compat --platform=linux/arm64 -o type=docker,dest=docker-images/aarch64.tar .
 
-docker-images/x86_64.tar: Dockerfile target/x86_64-unknown-linux-musl/release/compat docker-images
+docker-images/x86_64.tar: Dockerfile docker-images
 	docker buildx build --build-arg ARCH=x86_64 --tag start9/x_system/compat --platform=linux/amd64 -o type=docker,dest=docker-images/x86_64.tar .
 
 target/aarch64-unknown-linux-musl/release/compat: $(COMPAT_SRC) ../../core/Cargo.lock