diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54866603..2e3e35f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,17 +4,18 @@ on: [push, pull_request]
 
 env: 
   BOARD_HARDWARE_PATH: ../hardware
-  ARDUINO_PATH: ./arduino-1.8.13
-  ARDUINO_DOWNLOAD_URL: https://downloads.arduino.cc/arduino-1.8.13-linux64.tar.xz
-
+  ARDUINO_DIRECTORIES_USER: ${GITHUB_WORKSPACE}/.arduino/user
+  KALEIDOSCOPE_ETC_DIR: ${GITHUB_WORKSPACE}/etc
+  BOARD_HARDWARE_PATH: ${ARDUINO_DIRECTORIES_USER}/hardware
 jobs:
   smoke-sketches:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - run: git clone --quiet --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio ../hardware/keyboardio
-    - run: rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope
-    - run: ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope
+
+## We delete the Bundle's version of Kaleidoscope, and symlink ourselves in.
+## This makes sure we're using the current version of the library.
+    - run: git clone --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio $ARDUINO_DIRECTORIES_USER/hardware/keyboardio
     # - run: make adjust-git-timestamps
     - run: make install-arduino-cli
     - run: make configure-arduino-cli
@@ -24,9 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - run: git clone --quiet --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio ../hardware/keyboardio
-    - run: rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope
-    - run: ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope
+    - run: git clone --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio $ARDUINO_DIRECTORIES_USER/hardware/keyboardio
     # - run: make adjust-git-timestamps
     - run: make install-arduino-cli
     - run: make configure-arduino-cli
@@ -36,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - run: git clone --quiet --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio ../hardware/keyboardio
+    - run: git clone --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio $ARDUINO_DIRECTORIES_USER/hardware/keyboardio
     - run: rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope
     - run: ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope
     # - run: make adjust-git-timestamps
@@ -45,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - run: git clone --quiet --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio ../hardware/keyboardio
+    - run: git clone --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio $ARDUINO_DIRECTORIES_USER/hardware/keyboardio
     - run: rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope
     - run: ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope
     - run: make shellcheck
@@ -53,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - run: git clone --quiet --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio ../hardware/keyboardio
+    - run: git clone --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio $ARDUINO_DIRECTORIES_USER/hardware/keyboardio
     - run: rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope
     - run: ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope
     # - run: make adjust-git-timestamps
@@ -62,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - run: git clone --quiet --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio ../hardware/keyboardio
+    - run: git clone --depth 1 --recurse-submodules=build-tools --recurse-submodules=toolchain --recurse-submodules=avr/libraries/ --jobs 16 --shallow-submodules git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio $ARDUINO_DIRECTORIES_USER/hardware/keyboardio
     - run: rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope
     - run: ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope
     - run: make find-filename-conflicts