diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins
index adee187..9b6681c 100644
--- a/Dockerfile.jenkins
+++ b/Dockerfile.jenkins
@@ -11,8 +11,8 @@ RUN apt-get update && apt-get install -y \
 RUN chicken-install r7rs
 RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
 RUN cd chibi-scheme && make -j 16 && make -j 16 install
-RUN snow-chibi install --always-yes --impls=chicken "(foreign c)"
-RUN snow-chibi install --always-yes --impls=chicken "(srfi 170)"
+RUN snow-chibi install --always-yes --impls=chibi,chicken "(foreign c)"
+RUN snow-chibi install --always-yes --impls=chibi,chicken "(srfi 170)"
 WORKDIR /builddir
 COPY Makefile .
 COPY compile-r7rs.scm .
diff --git a/Jenkinsfile b/Jenkinsfile
index 9e5a8b4..1273c80 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
         stage('Test R6RS implementations') {
             steps {
                 script {
-                    def r6rs_implementations = sh(script: 'docker run retropikzel1/compile-7rs bash -c "compile-r7rs.scm --list-r6rs-schemes"', returnStdout: true).split()
+                    def r6rs_implementations = sh(script: 'chibi-scheme compile-r7rs.scm --list-r6rs-schemes', returnStdout: true).split()
                     parallel r6rs_implementations.collectEntries { SCHEME ->
                         [(SCHEME): {
                                 stage("${SCHEME} R6RS") {
@@ -36,7 +36,7 @@ pipeline {
         stage('Test R7RS implementations') {
             steps {
                 script {
-                    def r7rs_implementations = sh(script: 'docker run retropikzel1/compile-7rs bash -c "compile-r7rs.scm --list-r7rs-schemes"', returnStdout: true).split()
+                    def r7rs_implementations = sh(script: 'chibi-scheme compile-r7rs.scm --list-r7rs-schemes', returnStdout: true).split()
                     parallel r7rs_implementations.collectEntries { SCHEME ->
                         [(SCHEME): {
                                 stage("${SCHEME} R7RS") {