diff --git a/dockerfiles/Dockerfile.snow-chibi-install-test b/dockerfiles/Dockerfile.snow-chibi-install-test
index 391591e..9fdfd77 100644
--- a/dockerfiles/Dockerfile.snow-chibi-install-test
+++ b/dockerfiles/Dockerfile.snow-chibi-install-test
@@ -1,11 +1,14 @@
 ARG SCHEME=chibi
-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 cd compile-r7rs && make && make install
+FROM schemers/chibi:head AS build
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    git \
+    make \
+    build-essential
 RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
-RUN cd chibi-scheme && make && make PREFIX=/usr/local-other install
+RUN cd chibi-scheme && make -j 32
+RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
+RUN cd compile-r7rs --branch=retropikzel-dependency-fixes && make
 
 ARG SCHEME=chibi
 FROM schemers/${SCHEME}:head
@@ -13,20 +16,13 @@ RUN apt-get update && apt-get install -y \
     build-essential \
     git \
     make \
-    libffi8 \
-    libgc1 \
-    libssl3 \
-    libuv1 \
-    build-essential \
-    libffi-dev \
-    libmbedtls-dev \
-    markdown \
-    pandoc \
-    weasyprint
+    libffi-dev
+RUN mkdir ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
+COPY --from=build /chibi-scheme /chibi-scheme
+RUN cd /chibi-scheme && make -j 8 install
+COPY --from=build /compile-r7rs /compile-r7rs
+RUN cd /compile-r7rs && make install
 COPY --from=build /usr/local-other /usr/local-other
-ENV PATH=/usr/local-other/bin:${PATH}
-COPY --from=build /usr/local/bin/compile-r7rs /usr/local/bin/compile-r7rs
 ARG SCHEME=chibi
 ENV COMPILE_R7RS=${SCHEME}
-RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
 ENV GUILE_AUTO_COMPILE=0