diff --git a/dockerfiles/Dockerfile.snow-chibi-install-test b/dockerfiles/Dockerfile.snow-chibi-install-test
index 0246fc1..b48576b 100644
--- a/dockerfiles/Dockerfile.snow-chibi-install-test
+++ b/dockerfiles/Dockerfile.snow-chibi-install-test
@@ -1,10 +1,10 @@
 ARG COMPILE_R7RS=chibi
-FROM debian:bookworm AS build
+FROM schemers/sagittarius AS build
 RUN apt-get update && apt-get install -y wget build-essential make cmake libgc-dev zlib1g-dev libffi-dev libssl-dev git
 RUN git clone https://github.com/Retropikzel/chibi-scheme.git --branch=snow-chibi-foreign-depends
 RUN cd chibi-scheme && make PREFIX=/usr/local-other && make PREFIX=/usr/local-other install
-RUN wget https://github.com/ktakashi/sagittarius-scheme/releases/download/v0.9.13/sagittarius-0.9.13.tar.gz && tar -xf version_0.9.13.tar.gz
-RUN cd sagittarius-scheme-version_0.9.12 && ./dist.sh gen && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local-other .. && make && make install
+RUN wget https://github.com/ktakashi/sagittarius-scheme/releases/download/v0.9.13/sagittarius-0.9.13.tar.gz && tar -xf sagittarius-0.9.13.tar.gz
+RUN cd sagittarius-0.9.13 && ./dist.sh gen && cmake -DCMAKE_INSTALL_PREFIX=/usr/local-other && make && make install
 
 FROM schemers/${COMPILE_R7RS}
 RUN apt-get update && apt-get install -y \
diff --git a/dockerfiles/Dockerfile.test b/dockerfiles/Dockerfile.test
index 9dd1789..59521a8 100644
--- a/dockerfiles/Dockerfile.test
+++ b/dockerfiles/Dockerfile.test
@@ -1,8 +1,8 @@
 ARG COMPILE_R7RS=chibi
 FROM schemers/sagittarius AS build
 RUN apt-get update && apt-get install -y wget build-essential make cmake libgc-dev zlib1g-dev libffi-dev libssl-dev
-RUN wget https://github.com/ktakashi/sagittarius-scheme/releases/download/v0.9.13/sagittarius-0.9.13.tar.gz && tar -xf version_0.9.13.tar.gz
-RUN cd sagittarius-scheme-version_0.9.12 && ./dist.sh gen && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local-other .. && make && make install
+RUN wget https://github.com/ktakashi/sagittarius-scheme/releases/download/v0.9.13/sagittarius-0.9.13.tar.gz && tar -xf sagittarius-0.9.13.tar.gz
+RUN cd sagittarius-0.9.13 && ./dist.sh gen && cmake -DCMAKE_INSTALL_PREFIX=/usr/local-other && make && make install
 
 FROM schemers/${COMPILE_R7RS}
 RUN apt-get update && apt-get install -y \