diff --git a/Jenkinsfile b/Jenkinsfile
index 2e09f45..5f36019 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,10 +38,12 @@ pipeline {
                     steps {
                         script {
                             env.SRFIS.split().each { SRFI ->
-                                env.R6RS_SCHEMES.split().each { SCHEME ->
-                                    stage("${SCHEME} ${SRFI}") {
-                                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                            sh "make SCHEME=${SCHEME} SRFI=${SRFI} RNRS=r6rs test-docker"
+                            stage("${SRFI}") {
+                                    env.R6RS_SCHEMES.split().each { SCHEME ->
+                                        stage("${SCHEME} ${SRFI}") {
+                                            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                                sh "make SCHEME=${SCHEME} SRFI=${SRFI} RNRS=r6rs test-docker"
+                                            }
                                         }
                                     }
                                 }
@@ -53,10 +55,12 @@ pipeline {
                     steps {
                         script {
                             env.SRFIS.split().each { SRFI ->
-                                env.R7RS_SCHEMES.split().each { SCHEME ->
-                                    stage("${SCHEME} ${SRFI}") {
-                                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                            sh "make SCHEME=${SCHEME} SRFI=${SRFI} RNRS=r7rs test-docker"
+                                stage("${SRFI}") {
+                                    env.R7RS_SCHEMES.split().each { SCHEME ->
+                                        stage("${SCHEME} ${SRFI}") {
+                                            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                                sh "make SCHEME=${SCHEME} SRFI=${SRFI} RNRS=r7rs test-docker"
+                                            }
                                         }
                                     }
                                 }
diff --git a/Makefile b/Makefile
index fb07354..0f5d063 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ SCHEME=chibi
 RNRS=r7rs
 SRFI=170
 AUTHOR=Retropikzel
+DOCKER_TAG=latest
 
 SRFI_FILE=srfi/${SRFI}.sld
 VERSION=$(shell cat srfi/${SRFI}/VERSION)
@@ -19,7 +20,19 @@ SFX=sps
 AKKU_PACKAGES="akku-r7rs"
 endif
 
+ifeq "${SCHEME}" "capyscheme"
 DOCKER_TAG=head
+endif
+ifeq "${SCHEME}" "chibi"
+DOCKER_TAG=head
+endif
+ifeq "${SCHEME}" "chicken"
+DOCKER_TAG=head
+endif
+ifeq "${SCHEME}" "gauche"
+DOCKER_TAG=head
+endif
+
 
 all: package