diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
index 692ed3057c..329919ee5d 100755
--- a/.github/scripts/build.sh
+++ b/.github/scripts/build.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 set -e -o pipefail
-echo 'travis_fold:start:build'
 echo Building Chez Scheme...
-./configure -m=$TARGET_MACHINE
+./configure -m=$MACH
 make
-case $TARGET_MACHINE in
+case $MACH in
   *a6nt)
     curl -Ls https://github.com/burgerrg/win-iconv/releases/download/v0.0.9/iconv-x64.dll > $TARGET_MACHINE/bin/$TARGET_MACHINE/iconv.dll
     ;;
@@ -12,4 +11,3 @@ case $TARGET_MACHINE in
     curl -Ls https://github.com/burgerrg/win-iconv/releases/download/v0.0.9/iconv-x86.dll > $TARGET_MACHINE/bin/$TARGET_MACHINE/iconv.dll
     ;;
 esac
-echo 'travis_fold:end:build'
diff --git a/.github/scripts/dobootfile.sh b/.github/scripts/dobootfile.sh
deleted file mode 100755
index 03ceea230e..0000000000
--- a/.github/scripts/dobootfile.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash -v
-
-cd ..
-
-case $TARGET_MACHINE in
-  *i3le|ti3le) INST=i386;;
-  *a6le|ta6le) INST=x86_64;;
-  *)
-esac
-curl -L -o installer.sh http://www.cs.utah.edu/plt/snapshots/current/installers/min-racket-current-${INST}-linux-precise.sh
-sh installer.sh --in-place --dest $HOME/racket/
-
-$HOME/racket/bin/racket -v
-$HOME/racket/bin/raco pkg install -i --auto -D cs-bootstrap
-
-export MACH=$TARGET_MACHINE
-cd ChezScheme
-$HOME/racket/bin/racket -l cs-bootstrap
-
diff --git a/.github/scripts/test.sh b/.github/scripts/test.sh
index 64161aef68..60eca5947c 100755
--- a/.github/scripts/test.sh
+++ b/.github/scripts/test.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 runmats() {
-  echo travis_fold:start:mats
   echo make allxhelp "$@"
-  make -C ${TARGET_MACHINE}/mats allxhelp "$@" 2>&1 | tee -a Make.out | grep '^matting '
-  echo travis_fold:end:mats
+  make -C ${MACH}/mats allxhelp "$@" 2>&1 | tee -a Make.out | grep '^matting '
 }
 
 # Split these out so that we get output every 10 minutes on Windows builds.
@@ -12,9 +10,9 @@ runmats o=3
 runmats o=3 cp0=t
 runmats o=3 cp0=t eval=interpret
 
-if [ -f ${TARGET_MACHINE}/mats/summary ]; then
-  cat ${TARGET_MACHINE}/mats/summary
-  diff -q .github/scripts/summary ${TARGET_MACHINE}/mats/summary
+if [ -f ${MACH}/mats/summary ]; then
+  cat ${MACH}/mats/summary
+  diff -q .github/scripts/summary ${MACH}/mats/summary
   exit $?
 else
   exit 1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20d553586f..742c8e0840 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,12 +10,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mach: ['ta6le'] 
+        mach: ['i3le', 'ti3le', 'a6le', 'ta6le'] 
 
     env:
-      TARGET_MACHINE: ${{ matrix.mach }}
+      MACH: ${{ matrix.mach }}
 
     steps:
+      - uses: Bogdanp/setup-racket@v0.8
+        with:
+          distribution: 'minimal'  # minimal is enough
+          variant: 'CS'            # lets dog-food CS
+          version: 'current'
+          packages: 'cs-bootstrap'
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
@@ -33,7 +39,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libncurses5-dev uuid-dev libssl-dev
       - name: Build bootfiles
-        run: .github/scripts/dobootfile.sh
+        run: racket -l cs-bootstrap
       - name: Build Chez
         run: .github/scripts/build.sh
       - name: Test Chez