diff --git a/Dockerfile.test b/Dockerfile.test
index f667a75..2a23a01 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,8 +1,8 @@
 ARG COMPILE_R7RS=chibi
-FROM debian:bookworm AS build
-RUN apt-get update && apt-get install -y build-essential wget make cmake libgc-dev zlib1g-dev libffi-dev libssl-dev
-RUN wget https://bitbucket.org/ktakashi/sagittarius-scheme/downloads/sagittarius-0.9.12.tar.gz && tar -xf sagittarius-0.9.12.tar.gz
-RUN cd sagittarius-0.9.12 && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local-other .. && make && make install
+FROM schemers/sagittarius AS build
+#RUN apt-get update && apt-get install -y build-essential git make cmake libgc-dev zlib1g-dev libffi-dev libssl-dev
+#RUN git clone https://bitbucket.org/ktakashi/sagittarius-scheme.git --branch=version_0.9.12 --depth=1
+#RUN cd sagittarius-scheme && ./dist.sh gen && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local-other .. && make && make install
 
 FROM schemers/${COMPILE_R7RS}
 RUN apt-get update && apt-get install -y \
@@ -16,9 +16,8 @@ RUN apt-get update && apt-get install -y \
     build-essential \
     libffi-dev \
     libmbedtls-dev
-COPY --from=build /usr/local-other/ /usr/local-other/
+COPY --from=build /usr/local /usr/local-other/
 ENV PATH=${PATH}:/usr/local-other/bin
-#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
+RUN git clone https://github.com/Retropikzel/compile-r7rs.git --depth=1
 RUN cd compile-r7rs && make && make install