diff --git a/Jenkinsfile b/Jenkinsfile
index 628a062..ce0f707 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,6 +33,7 @@ pipeline {
                                     image "${build.image}"
                                 }
                             }
+                            /*
                             build.stages.each { stage ->
                                 stage("${stage.name}") {
                                     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
@@ -40,6 +41,7 @@ pipeline {
                                     }
                                 }
                             }
+                            */
                         }
                     }
                 }
diff --git a/builds.yaml b/builds.yaml
index 01b6aac..9bb571d 100644
--- a/builds.yaml
+++ b/builds.yaml
@@ -10,6 +10,17 @@ builds:
           make -j8 -C chibi-scheme install
           snow-chibi install retropikzel.compile-r7rs
       - name: tap
-        cmd: compile-r7rs -o tap retropikzel/tap/test.scm && ./tap
-
+        cmd: COMPILE_R7RS=chibi compile-r7rs -o tap retropikzel/tap/test.scm && ./tap
+  - name: Sagittarius
+    image: schemers/sagittarius:head
+    stages:
+      - name: Init
+        cmd: |
+          apt-get update && apt-get install -y git ca-certificates gcc make libffi-dev
+          git clone https://github.com/ashinn/chibi-scheme.git --depth=1
+          make -j8 -C chibi-scheme
+          make -j8 -C chibi-scheme install
+          snow-chibi install retropikzel.compile-r7rs
+      - name: tap
+        cmd: COMPILE_R7RS=sagittarius compile-r7rs -o tap retropikzel/tap/test.scm && ./tap