diff --git a/dockerfiles/Dockerfile.snow-chibi-install-test b/dockerfiles/Dockerfile.snow-chibi-install-test
index 5e9fade..380d28d 100644
--- a/dockerfiles/Dockerfile.snow-chibi-install-test
+++ b/dockerfiles/Dockerfile.snow-chibi-install-test
@@ -1,7 +1,5 @@
 ARG SCHEME=chibi
-FROM debian:bookworm AS build
-RUN apt-get update && apt-get install -y chicken-bin build-essential
-RUN chicken-install r7rs
+FROM schemers/chicken AS build
 RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
 RUN cd compile-r7rs && make && make install
 
diff --git a/dockerfiles/Dockerfile.test b/dockerfiles/Dockerfile.test
index e393c8a..a985c45 100644
--- a/dockerfiles/Dockerfile.test
+++ b/dockerfiles/Dockerfile.test
@@ -1,7 +1,5 @@
 ARG SCHEME=chibi
-FROM debian:bookworm AS build
-RUN apt-get update && apt-get install -y chicken-bin build-install
-RUN chicken-install r7rs
+FROM schemers/chicken AS build
 RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
 RUN cd compile-r7rs && make && make install