diff --git a/dockerfiles/Dockerfile.snow-chibi-install-test b/dockerfiles/Dockerfile.snow-chibi-install-test
index 2021f1c..1af0066 100644
--- a/dockerfiles/Dockerfile.snow-chibi-install-test
+++ b/dockerfiles/Dockerfile.snow-chibi-install-test
@@ -1,8 +1,8 @@
 ARG SCHEME=chibi
-FROM schemers/chicken AS build
-RUN apt-get update && apt-get install -y git make
-#RUN git clone https://github.com/Retropikzel/compile-r7rs.git --depth=1
-RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
+FROM debian:bookworm AS build
+RUN apt-get update && apt-get install -y git make chicken-bin build-essential
+RUN chicken-install r7rs
+RUN git clone https://github.com/Retropikzel/compile-r7rs.git --depth=1
 RUN ls
 RUN cd compile-r7rs && make && make install
 
diff --git a/dockerfiles/Dockerfile.test b/dockerfiles/Dockerfile.test
index 2005a07..67e66a8 100644
--- a/dockerfiles/Dockerfile.test
+++ b/dockerfiles/Dockerfile.test
@@ -1,8 +1,9 @@
 ARG SCHEME=chibi
-FROM schemers/chicken:5 AS build
-RUN apt-get update && apt-get install -y git make
-#RUN git clone https://github.com/Retropikzel/compile-r7rs.git --depth=1
-RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
+FROM debian:bookworm AS build
+RUN apt-get update && apt-get install -y git make chicken-bin build-essential
+RUN chicken-install r7rs
+RUN git clone https://github.com/Retropikzel/compile-r7rs.git --depth=1
+RUN ls
 RUN cd compile-r7rs && make && make install
 
 ARG SCHEME=chibi