diff --git a/Jenkinsfile b/Jenkinsfile
index 444b2ea..642fa7a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,236 +9,215 @@ pipeline {
             steps {
                 sh 'make'
                 sh 'make install'
-                sh 'make COMPILE_R7RS=sagittarius test-r6rs'
-                sh 'make COMPILE_R7RS=sagittarius test-r7rs'
+                sh 'make test-r6rs'
+                sh 'make test-r7rs'
             }
         }
         stage("Test chez r6rs") {
-            agent { docker { image 'schemers/chezscheme'; args '--user=root --build-arg COMPILE_R7RS=chezscheme' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=chezsceme' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=chezscheme test-r6rs'
+                    sh 'make test-r6rs'
                 }
             }
         }
         stage("Test chibi r7rs") {
-            agent { docker { image 'schemers/chibi'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=chibi' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=chibi test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test cyclone r7rs") {
-            agent { docker { image 'schemers/cyclone'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=cyclone' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=cyclone test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test foment r7rs") {
-            agent { docker { image 'schemers/foment'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=foment' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=foment test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test gauche r7rs") {
-            agent { docker { image 'schemers/gauche'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=gauche' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=gauche test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test guile r6rs") {
-            agent { docker { image 'schemers/guile'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=guile' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=guile test-r6rs'
+                    sh 'make test-r6rs'
                 }
             }
         }
         stage("Test guile r7rs") {
-            agent { docker { image 'schemers/guile'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=guile' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=guile test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test ikarus r6rs") {
-            agent { docker { image 'schemers/ikarus'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=ikarus' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=ikarus test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test ironscheme r6rs") {
-            agent { docker { image 'schemers/ironscheme'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=ironscheme' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=ironscheme test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test kawa r7rs") {
-            agent { docker { image 'schemers/kawa'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=kawa' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=kawa test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test larceny r6rs") {
-            agent { docker { image 'schemers/larceny'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=larceny' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=larceny test-r6rs'
+                    sh 'make test-r6rs'
                 }
             }
         }
         stage("Test larceny r7rs") {
-            agent { docker { image 'schemers/larceny'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=larceny' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=larceny test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test loko r6rs") {
-            agent { docker { image 'schemers/loko'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=loko' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=loko test-r6rs'
+                    sh 'make test-r6rs'
                 }
             }
         }
         stage("Test loko r7rs") {
-            agent { docker { image 'schemers/loko'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=loko' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=loko test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test mit-scheme r7rs") {
-            agent { docker { image 'schemers/mit-scheme'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=mit-scheme' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=mit-scheme test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test mosh r6rs") {
-            agent { docker { image 'schemers/mosh'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=mosh' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=mosh test-r6rs'
+                    sh 'make test-r6rs'
                 }
             }
         }
         stage("Test mosh r7rs") {
-            agent { docker { image 'schemers/mosh'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=mosh' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=mosh test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test sagittarius r6rs") {
-            agent { docker { image 'schemers/sagittarius'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=sagittarius' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                     sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=sagittarius test-r6rs'
+                    sh 'make test-r6rs'
                 }
             }
         }
         stage("Test sagittarius r7rs") {
-            agent { docker { image 'schemers/sagittarius'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=sagittarius' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=sagittarius test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test skint r7rs") {
-            agent { docker { image 'schemers/skint'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=skint' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=skint test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test tr7 r7rs") {
-            agent { docker { image 'schemers/tr7'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=tr7' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=tr7 test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }
         stage("Test ypsilon r6rs") {
-            agent { docker { image 'schemers/ypsilon'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=ypsilon' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=ypsilon test-r6rs'
+                    sh 'make test-r6rs'
                 }
             }
         }
         stage("Test ypsilon r7rs") {
-            agent { docker { image 'schemers/ypsilon'; args '--user=root' } }
+            agent { dockerfile { filename 'Dockerfile'; args '--user=root --build-arg COMPILE_R7RS=ypsilon' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'apt-get update && apt-get install -y make libuv1'
                     sh 'make && make install'
-                    sh 'make COMPILE_R7RS=ypsilon test-r7rs'
+                    sh 'make test-r7rs'
                 }
             }
         }