diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 15f8459f..b8b3e5b5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: mxschmitt/action-tmate@v3
+#    - uses: mxschmitt/action-tmate@v3
     - 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
diff --git a/etc/makefiles/arduino-cli-prop.mk b/etc/makefiles/arduino-cli-prop.mk
index 607c57cc..9347c3ed 100644
--- a/etc/makefiles/arduino-cli-prop.mk
+++ b/etc/makefiles/arduino-cli-prop.mk
@@ -1,6 +1,8 @@
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 mkfile_dir := $(dir $(mkfile_path))
 
+include $(mkfile_dir)/kaleidoscope-env.mk
+
 # Make a variable lazily evaluated at first call
 # From https://blog.jgc.org/2016/07/lazy-gnu-make-variables.html
 make-lazy = $(eval $1 = $$(eval $1 := $(value $(1)))$$($1))
diff --git a/etc/makefiles/arduino-cli.mk b/etc/makefiles/arduino-cli.mk
index 41c882c5..507ee1c4 100644
--- a/etc/makefiles/arduino-cli.mk
+++ b/etc/makefiles/arduino-cli.mk
@@ -1,32 +1,7 @@
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 mkfile_dir := $(dir $(mkfile_path))
-include $(mkfile_dir)/arduino-cli-prop.mk
-
-export KALEIDOSCOPE_DIR ?= $(abspath $(mkfile_dir)/../..)
-export KALEIDOSCOPE_BIN_DIR ?= $(KALEIDOSCOPE_DIR)/bin
-
-# Arduino CLI config
-
-export ARDUINO_CONTENT ?= $(KALEIDOSCOPE_DIR)/.arduino
-export ARDUINO_DIRECTORIES_DATA ?= $(ARDUINO_CONTENT)/data
-export ARDUINO_DIRECTORIES_DOWNLOADS ?= $(ARDUINO_CONTENT)/downloads
-export ARDUINO_DIRECTORIES_USER ?= $(ARDUINO_CONTENT)/user
-export ARDUINO_CLI_CONFIG ?= $(ARDUINO_DIRECTORIES_DATA)/arduino-cli.yaml
-export ARDUINO_BOARD_MANAGER_ADDITIONAL_URLS ?= https://raw.githubusercontent.com/keyboardio/boardsmanager/master/package_keyboardio_index.json
 
-system_arduino_cli=$(shell command -v arduino-cli || true)
-
-ifeq ($(system_arduino_cli),) 
-export ARDUINO_CLI ?= $(KALEIDOSCOPE_BIN_DIR)/arduino-cli
-else
-export ARDUINO_CLI ?= $(system_arduino_cli)
-endif
-
-ifneq ($(VERBOSE),)
-export ARDUINO_VERBOSE ?= --verbose
-else
-export ARDUINO_VERBOSE ?= 
-endif
+include $(mkfile_dir)/arduino-cli-prop.mk
 
 
 .PHONY: configure-arduino-cli install-arduino-core-kaleidoscope install-arduino-core-avr